[qt5-qtwebengine-freeworld/f34] (14 commits) ...Try increasing SMP to -j6 for the next build.
by Kevin Kofler
Summary of changes:
00a590a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass (*)
e2c9cce... 5.15.6 (*)
587b67e... import awol patch (*)
810b2e6... patch use of deprecated harfbuzz apis (*)
5ed452a... 5.15.8 (*)
e895e10... Fix sources. (*)
876b35c... Fix qtwebengine-everywhere-5.15.5-use-python2.patch. (*)
88e36e4... Sync qtwebengine-everywhere-5.15.5-use-python2 from Fedora. (*)
fc032d4... Try enabling ARM builds. (*)
8bd81f6... Try x86_64 and aarch64 only, no armv7hl. (*)
01473c9... Remove bogus aarch64 no-jumbo-build hack. (*)
60cf505... Try harder to disable debuginfo on aarch64. (*)
c8f693c... Try -j2 instead of -j8 on aarch64. (*)
8ca0bb7... Try increasing SMP to -j6 for the next build. (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[qt5-qtwebengine-freeworld/f35] (11 commits) ...Try increasing SMP to -j6 for the next build.
by Kevin Kofler
Summary of changes:
810b2e6... patch use of deprecated harfbuzz apis (*)
5ed452a... 5.15.8 (*)
e895e10... Fix sources. (*)
876b35c... Fix qtwebengine-everywhere-5.15.5-use-python2.patch. (*)
88e36e4... Sync qtwebengine-everywhere-5.15.5-use-python2 from Fedora. (*)
fc032d4... Try enabling ARM builds. (*)
8bd81f6... Try x86_64 and aarch64 only, no armv7hl. (*)
01473c9... Remove bogus aarch64 no-jumbo-build hack. (*)
60cf505... Try harder to disable debuginfo on aarch64. (*)
c8f693c... Try -j2 instead of -j8 on aarch64. (*)
8ca0bb7... Try increasing SMP to -j6 for the next build. (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[qt5-qtwebengine-freeworld] Try increasing SMP to -j6 for the next build.
by Kevin Kofler
commit 8ca0bb77a9b10192318405a5cc41cd4027d3cb33
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue Jan 25 16:28:11 2022 +0100
Try increasing SMP to -j6 for the next build.
(in an attempt to reduce the build time from currently 14 hours to
something more reasonable). This matches what chromium-freeworld is
currently using. If it fails, I will try -j4, and if it still fails,
back to -j2.
qt5-qtwebengine-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 2fc8f65..2db7549 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -45,7 +45,7 @@
# reduce debug info even for the Qt parts to a minimum
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
# tune down SMP to reduce memory use further
-%global _smp_build_ncpus 2
+%global _smp_build_ncpus 6
%else
%global debug_config force_debug_info
# webcore_debug v8base_debug
2 years, 10 months
[qt5-qtwebengine-freeworld] Try -j2 instead of -j8 on aarch64.
by Kevin Kofler
commit c8f693c224a8d819c67aead9fdd2a9ef951035e4
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Mon Jan 24 22:47:14 2022 +0100
Try -j2 instead of -j8 on aarch64.
Also try -g1 for the Qt parts, the Chromium parts are already -g0.
qt5-qtwebengine-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 75428cf..2fc8f65 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -42,7 +42,10 @@
# the RPM Fusion ARM builder runs out of memory during linking with the full
# setting below, and even with just force_debug_info, so omit all debuginfo
%global debug_config %{nil}
-%global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
+# reduce debug info even for the Qt parts to a minimum
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+# tune down SMP to reduce memory use further
+%global _smp_build_ncpus 2
%else
%global debug_config force_debug_info
# webcore_debug v8base_debug
2 years, 10 months
[qt5-qtwebengine-freeworld] Try harder to disable debuginfo on aarch64.
by Kevin Kofler
commit 60cf505a5d059c6853bd543e200af02e76a892de
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Mon Jan 24 19:28:07 2022 +0100
Try harder to disable debuginfo on aarch64.
qt5-qtwebengine-freeworld.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 85a5fec..75428cf 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -42,6 +42,7 @@
# the RPM Fusion ARM builder runs out of memory during linking with the full
# setting below, and even with just force_debug_info, so omit all debuginfo
%global debug_config %{nil}
+%global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
%else
%global debug_config force_debug_info
# webcore_debug v8base_debug
2 years, 10 months
[qt5-qtwebengine-freeworld] Remove bogus aarch64 no-jumbo-build hack.
by Kevin Kofler
commit 01473c9ddbb3504ec4245c99707f020e19561baf
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Mon Jan 24 01:12:51 2022 +0100
Remove bogus aarch64 no-jumbo-build hack.
The sed no longer applies, the search string is nowhere to be found in
src/core/config/common.pri. And it looks like the (jumbo-enabled) build
is passing anyway, so try just omitting this (RPM-Fusion-only) snippet
(reducing the delta from Fedora further).
qt5-qtwebengine-freeworld.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index f7b2d2d..85a5fec 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -389,10 +389,6 @@ cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/
sed -i -e 's/symbol_level=1/symbol_level=2/g' src/core/config/common.pri
%endif
-%ifarch aarch64
-sed -i -e 's/use_jumbo_build=true/use_jumbo_build=false/g' src/core/config/common.pri
-%endif
-
# generate qtwebengine-3rdparty.qdoc, it is missing from the tarball
pushd src/3rdparty
%{__python2} chromium/tools/licenses.py \
2 years, 10 months
[qt5-qtwebengine-freeworld] Try x86_64 and aarch64 only, no armv7hl.
by Kevin Kofler
commit 8bd81f67296575e7e015708fbf01d7a42b07994e
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun Jan 23 22:32:22 2022 +0100
Try x86_64 and aarch64 only, no armv7hl.
The 32-bit ARM builders apparently refuse to take
qt5-qtwebengine-freeworld altogether. Also explicitly omit 32-bit x86
from the bootstrap list, it will not be built by the infrastructure
anyway.
qt5-qtwebengine-freeworld.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 7b6972a..f7b2d2d 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -5,7 +5,7 @@
# package-notes causes FTBFS (#2043178)
%undefine _package_note_file
-%global bootstrap 0
+%global bootstrap 1
# work around missing macro in the RPM Fusion build system (matches list in macros.qt5-srpm)
%{!?qt5_qtwebengine_arches:%global qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el}
@@ -101,7 +101,7 @@ Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
## Upstream patches:
%if 0%{?bootstrap}
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: x86_64 aarch64
%else
# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
ExclusiveArch: %{qt5_qtwebengine_arches}
@@ -463,7 +463,7 @@ echo "%{_libdir}/%{name}" \
%changelog
* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-2
-- Try enabling ARM builds
+- Try enabling aarch64 builds
* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-1
- 5.15.8
2 years, 10 months
[qt5-qtwebengine-freeworld] Try enabling ARM builds.
by Kevin Kofler
commit fc032d42dfa3dd0db1ae61c5fbd2f95f1beb86c2
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun Jan 23 21:55:05 2022 +0100
Try enabling ARM builds.
* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-2
- Try enabling ARM builds
qt5-qtwebengine-freeworld.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 21dd971..7b6972a 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -5,7 +5,7 @@
# package-notes causes FTBFS (#2043178)
%undefine _package_note_file
-%global bootstrap 1
+%global bootstrap 0
# work around missing macro in the RPM Fusion build system (matches list in macros.qt5-srpm)
%{!?qt5_qtwebengine_arches:%global qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el}
@@ -55,7 +55,7 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
Version: 5.15.8
-Release: 1%{?dist}
+Release: 2%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -462,6 +462,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-2
+- Try enabling ARM builds
+
* Sun Jan 23 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-1
- 5.15.8
- Sync packaging fixes from Fedora (comment fixes, EL7 support, removed an old
2 years, 10 months
[qt5-qtwebengine-freeworld] Sync qtwebengine-everywhere-5.15.5-use-python2 from Fedora.
by Kevin Kofler
commit 88e36e4f0d17dd469935c98fb2cf545e162cdc6d
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun Jan 23 19:31:17 2022 +0100
Sync qtwebengine-everywhere-5.15.5-use-python2 from Fedora.
It turns out the reason this does not fail in Fedora is because this was
already fixed in Fedora, the patch was just not synced.
qtwebengine-everywhere-5.15.5-use-python2.patch | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/qtwebengine-everywhere-5.15.5-use-python2.patch b/qtwebengine-everywhere-5.15.5-use-python2.patch
index f4aa432..9626d27 100644
--- a/qtwebengine-everywhere-5.15.5-use-python2.patch
+++ b/qtwebengine-everywhere-5.15.5-use-python2.patch
@@ -1,6 +1,7 @@
-diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.use-python2 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
---- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.use-python2 2021-05-28 07:05:45.000000000 -0500
-+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2021-06-23 15:27:45.771765298 -0500
+diff --git a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
+index 8af373102..b551c0fe2 100644
+--- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
++++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
@@ -83,7 +83,7 @@ def _MinifyJS(input_js):
with tempfile.NamedTemporaryFile() as _:
@@ -10,7 +11,7 @@ diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/cat
rjsmin_path
]
p = subprocess.Popen(args,
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ def _MinifyCSS(css_text):
os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
with tempfile.NamedTemporaryFile() as _:
@@ -19,9 +20,10 @@ diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/cat
p = subprocess.Popen(rcssmin_args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
-diff -up qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro
---- qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 2021-06-11 00:31:04.000000000 -0500
-+++ qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro 2021-06-23 15:26:48.897435095 -0500
+diff --git a/src/webengine/module.pro b/src/webengine/module.pro
+index 49a1086b2..afc89d49e 100644
+--- a/src/webengine/module.pro
++++ b/src/webengine/module.pro
@@ -76,7 +76,7 @@ qtConfig(webengine-testsupport) {
python = $$pythonPathForShell()
chromium_attributions.commands = \
2 years, 10 months
[qt5-qtwebengine-freeworld] Fix qtwebengine-everywhere-5.15.5-use-python2.patch.
by Kevin Kofler
commit 876b35c37d5be3b0dc0ed1e2f10dedd77407090e
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun Jan 23 19:26:28 2022 +0100
Fix qtwebengine-everywhere-5.15.5-use-python2.patch.
Fix a missing place where python should be replaced by python2 or
python3. Use python2 for now because everything else does, but this
particular tool actually already supports Python 3.
For some reason, this does not trigger an error in the Fedora buildroot.
(The BuildRequires: /usr/bin/python is not in the Fedora
qt5-qtwebengine.spec, that is why I removed it from here, uncovering
this error.)
qtwebengine-everywhere-5.15.5-use-python2.patch | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/qtwebengine-everywhere-5.15.5-use-python2.patch b/qtwebengine-everywhere-5.15.5-use-python2.patch
index 12c53ea..f4aa432 100644
--- a/qtwebengine-everywhere-5.15.5-use-python2.patch
+++ b/qtwebengine-everywhere-5.15.5-use-python2.patch
@@ -10,6 +10,15 @@ diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/cat
rjsmin_path
]
p = subprocess.Popen(args,
+@@ -203,7 +203,7 @@
+ os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
+
+ with tempfile.NamedTemporaryFile() as _:
+- rcssmin_args = ['python', rcssmin_path]
++ rcssmin_args = ['python2', rcssmin_path]
+ p = subprocess.Popen(rcssmin_args,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
diff -up qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro
--- qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 2021-06-11 00:31:04.000000000 -0500
+++ qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro 2021-06-23 15:26:48.897435095 -0500
2 years, 10 months