commit ccf84842267edf879896dc8555bddde4fb95280c Author: Kevin Kofler <kevin.kofler(a)chello.at&gt; Date: Sun Oct 15 01:35:12 2017 +0200 Update to 5.9.2 * Sat Oct 14 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 5.9.2-1 - Update to 5.9.2 - Add BuildRequires: qt5-qtquickcontrols2-devel for the examples - Rebase linux-pri patch - Drop qt57 and qtbug-61521 patches, fixed upstream - arm-fpu-fix patch: Drop the host tools hunk added in 5.9.0-2, fixed upstream - linux-pri patch: Do not call the Chromium unbundling script on re2, QtWebEngine now auto-detects and uses the system re2 out of the box - Drop system-re2 patch (patching the no longer used unbundle/re2.gn), the QtWebEngine re2/BUILD.gn is already correct .gitignore | 1 + qt5-qtwebengine-freeworld.spec | 33 +++-- qtwebengine-opensource-src-5.8.0-qt57.patch | 12 -- qtwebengine-opensource-src-5.9.0-system-re2.patch | 24 ---- qtwebengine-opensource-src-5.9.1-qtbug-61521.patch | 160 --------------------- ...ebengine-opensource-src-5.9.2-arm-fpu-fix.patch | 9 -- ...twebengine-opensource-src-5.9.2-linux-pri.patch | 15 +- sources | 2 +- 8 files changed, 26 insertions(+), 230 deletions(-) --- diff --git a/.gitignore b/.gitignore index 91fbc7c..44dadbf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qtwebengine-opensource-src-5.9.0.tar.xz /qtwebengine-opensource-src-5.9.1.tar.xz /qtwebengine-opensource-src-5.6.3-ee719ad313e564d4e6f06d74b313ae179169466f.tar.xz +/qtwebengine-opensource-src-5.9.2.tar.xz diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index 151f136..0c9a74c 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -43,8 +43,8 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld -Version: 5.9.1 -Release: 3%{?dist} +Version: 5.9.2 +Release: 1%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) %global major %(echo %{version} | cut -d. -f1) @@ -55,8 +55,8 @@ Release: 3%{?dist} License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: http://www.qt.io Source0: http://download.qt.io/official_releases/qt/%{major_minor}/%{version}/subm... -# some tweaks to linux.pri (system libs, link libpci, run unbundling script) -Patch0: qtwebengine-opensource-src-5.9.0-linux-pri.patch +# some tweaks to linux.pri (system yasm, link libpci, run unbundling script) +Patch0: qtwebengine-opensource-src-5.9.2-linux-pri.patch # quick hack to avoid checking for the nonexistent icudtl.dat and silence the # resulting warnings - not upstreamable as is because it removes the fallback # mechanism for the ICU data directory (which is not used in our builds because @@ -84,7 +84,7 @@ Patch5: qtwebengine-opensource-src-5.9.0-system-icu-utf.patch # also build V8 shared and twice on i686 (once for x87, once for SSE2) Patch6: qtwebengine-opensource-src-5.9.1-no-sse2.patch # fix missing ARM -mfpu setting -Patch9: qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch +Patch9: qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch # remove Android dependencies from openmax_dl ARM NEON detection (detect.c) Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch # restore NEON runtime detection in Skia: revert upstream review 1952953004, @@ -93,15 +93,8 @@ Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch Patch11: qtwebengine-opensource-src-5.9.0-skia-neon.patch # webrtc: enable the CPU feature detection for ARM Linux also for Chromium Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch -# FTBFS using qt < 5.8 -Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch # Force verbose output from the GN bootstrap process Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch -# Fix src/3rdparty/chromium/build/linux/unbundle/re2.gn -Patch22: qtwebengine-opensource-src-5.9.0-system-re2.patch -# Fix broken binary compatibility for C memory management functions (incomplete -# upstream fix for QTBUG-60565) (QTBUG-61521) -Patch23: qtwebengine-opensource-src-5.9.1-qtbug-61521.patch %if 0%{?fedora} && 0%{?fedora} < 25 # work around missing qt5_qtwebengine_arches macro on F24 @@ -121,6 +114,8 @@ BuildRequires: qt5-qtlocation-devel BuildRequires: qt5-qtsensors-devel BuildRequires: qt5-qtwebchannel-devel BuildRequires: qt5-qttools-static +# for examples? +BuildRequires: qt5-qtquickcontrols2-devel BuildRequires: ninja-build BuildRequires: cmake BuildRequires: bison @@ -323,10 +318,7 @@ This version is compiled with support for patent-encumbered codecs enabled. %patch10 -p1 -b .openmax-dl-neon %patch11 -p1 -b .skia-neon %patch12 -p1 -b .webrtc-neon-detect -%patch20 -p1 -b .qt57 %patch21 -p1 -b .gn-bootstrap-verbose -%patch22 -p1 -b .system-re2 -%patch23 -p1 -b .qtbug-61521 # fix // in #include in content/renderer/gpu to avoid debugedit failure sed -i -e 's!gpu//!gpu/!g' \ src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc @@ -405,6 +397,17 @@ echo "%{_libdir}/%{name}" \ %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Sat Oct 14 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 5.9.2-1 +- Update to 5.9.2 +- Add BuildRequires: qt5-qtquickcontrols2-devel for the examples +- Rebase linux-pri patch +- Drop qt57 and qtbug-61521 patches, fixed upstream +- arm-fpu-fix patch: Drop the host tools hunk added in 5.9.0-2, fixed upstream +- linux-pri patch: Do not call the Chromium unbundling script on re2, + QtWebEngine now auto-detects and uses the system re2 out of the box +- Drop system-re2 patch (patching the no longer used unbundle/re2.gn), the + QtWebEngine re2/BUILD.gn is already correct + * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 5.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch b/qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch similarity index 63% rename from qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch rename to qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch index ca308d4..a475199 100644 --- a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch +++ b/qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch @@ -1,15 +1,6 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-arm-fpu-fix/src/core/config/linux.pri --- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200 +++ qtwebengine-opensource-src-5.9.0-arm-fpu-fix/src/core/config/linux.pri 2017-06-13 14:51:26.986633933 +0200 -@@ -41,7 +41,7 @@ - !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\" - } - --contains(QT_ARCH, "arm"):!host_build { -+contains(QT_ARCH, "arm") { - # Extract ARM specific compiler options that we have to pass to gn, - # but let gn figure out a default if an option is not present. - MTUNE = $$extractCFlag("-mtune=.*") @@ -64,6 +64,7 @@ gn_args += arm_use_neon=true } else { diff --git a/qtwebengine-opensource-src-5.9.0-linux-pri.patch b/qtwebengine-opensource-src-5.9.2-linux-pri.patch similarity index 57% rename from qtwebengine-opensource-src-5.9.0-linux-pri.patch rename to qtwebengine-opensource-src-5.9.2-linux-pri.patch index c671f6b..ac7b583 100644 --- a/qtwebengine-opensource-src-5.9.0-linux-pri.patch +++ b/qtwebengine-opensource-src-5.9.2-linux-pri.patch @@ -1,14 +1,11 @@ -diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri ---- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri 2017-06-08 00:20:53.688419747 +0200 -@@ -148,3 +148,22 @@ - use?(system_ffmpeg): gn_args += use_system_ffmpeg=true +diff -up qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri +--- qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri 2017-10-09 15:08:43.206663093 -0500 ++++ qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri 2017-10-09 15:09:52.248208321 -0500 +@@ -153,3 +153,19 @@ host_build { + use?(system_re2): gn_args += use_system_re2=true #use?(system_protobuf): gn_args += use_system_protobuf=true } + -+# some more system packages, that are not checked for for some reason -+gn_args += use_system_re2=true -+ +# yasm is only used on x86, and passing use_system_yasm makes the build fail on +# other architectures (e.g., ARM), so make it conditional on the architecture +contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") { @@ -21,6 +18,6 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine- +# run the unbundling script Chromium provides +CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()" +R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py" -+R_G_F_PY_ARGS = "--system-libraries re2 yasm" ++R_G_F_PY_ARGS = "--system-libraries yasm" +log("Running python $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}") +!system("python $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed") diff --git a/sources b/sources index a5cd74f..2cccd0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4ad2f5df86c8483c06b3fe14c30136a qtwebengine-opensource-src-5.9.1.tar.xz +366bb699788c79c92787b38c60cbf5db qtwebengine-opensource-src-5.9.2.tar.xz