commit c1f9f1ca2014b4d6db980265bcff7f93a9123b3c Author: Rex Dieter <rdieter(a)gmail.com&gt; Date: Sat Jun 23 10:51:56 2018 -0500 5.11.1 drop shadow build (to match other qt5 packages where it has been problematic) drop upstreamed patches rebase no-icudtl-dat.patch patches needswork: system-nspr-prtime,system-icu-utf,no-sse2,skia-neon,icu59 use macros %make_build %ldconfig_scriptlets %__ninja %__ninja_common_opts .gitignore | 1 + qt5-qtwebengine-freeworld.spec | 65 ++++++++++------------ ...ngine-everywhere-src-5.11.0-no-icudtl-dat.patch | 22 +++++--- sources | 2 +- 4 files changed, 44 insertions(+), 46 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7872c80..6548e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /qtwebengine-opensource-src-5.9.3.tar.xz /qtwebengine-everywhere-src-5.10.0.tar.xz /qtwebengine-everywhere-src-5.10.1.tar.xz +/qtwebengine-everywhere-src-5.11.1.tar.xz diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index d7bee1a..6509b9f 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -40,8 +40,8 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld -Version: 5.10.1 -Release: 5%{?dist} +Version: 5.11.1 +Release: 1%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) %global major %(echo %{version} | cut -d. -f1) @@ -58,7 +58,7 @@ Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch # 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 # we use the system ICU, which embeds the data statically) completely -Patch1: qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch +Patch1: qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch # fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the # ARM flags with our %%qmake_qt5 macro, including for the next patch Patch2: qtwebengine-opensource-src-5.9.0-fix-extractcflag.patch @@ -103,18 +103,6 @@ Patch22: qtwebengine-everywhere-src-5.10.0-icu59.patch # to get the value we expect (and chromium checks for). Patch by spot. Patch23: qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch ## Upstream patches: -# drop support for obsolete Unicode "aspirational scripts" (dropped in UTS 31), -# fixes #error with ICU >= 60 (which was a reminder to double-check the list) -# see: http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts -# backport of: https://chromium-review.googlesource.com/c/chromium/src/+/731871 -Patch100: qtwebengine-everywhere-src-5.10.0-no-aspirational-scripts.patch -# forward-port security backports from 5.9.5 LTS (up to Chromium 65.0.3325.146) -# see the patch metadata for the list of fixed CVEs and Chromium bug IDs -# omit the Chromium bug 806122 fix because we use the system FFmpeg -Patch101: qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch -# fix incomplete (and thus having no effect) fix for CVE-2018-6033 in 5.10.1 -# (forward-ported from 5.9.5, will also be included in 5.11) -Patch102: qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch # fix build with FFmpeg 4 (apply conditionally because it breaks older FFmpeg) # backport of: https://chromium-review.googlesource.com/c/chromium/src/+/754261 # https://chromium-review.googlesource.com/c/chromium/src/+/889686 @@ -337,22 +325,23 @@ This version is compiled with support for patent-encumbered codecs enabled. %if !0%{?arm_neon} %patch3 -p1 -b .no-neon %endif -%patch4 -p1 -b .system-nspr-prtime -%patch5 -p1 -b .system-icu-utf -%patch6 -p1 -b .no-sse2 +#patch4 -p1 -b .system-nspr-prtime +#patch5 -p1 -b .system-icu-utf +#patch6 -p1 -b .no-sse2 +%ifarch %{ix86} +#global sse2 1 +%endif %patch9 -p1 -b .arm-fpu-fix %patch10 -p1 -b .openmax-dl-neon -%patch11 -p1 -b .skia-neon +#patch11 -p1 -b .skia-neon %patch12 -p1 -b .webrtc-neon-detect %patch21 -p1 -b .gn-bootstrap-verbose -%patch22 -p1 -b .icu59 +#patch22 -p1 -b .icu59 %patch23 -p1 -b .gcc8 -%patch100 -p1 -b .no-aspirational-scripts -%patch101 -p1 -b .security-5.9.5 -%patch102 -p1 -b .CVE-2018-6033 -%if 0%{?fedora} > 27 -%patch103 -p1 -b .ffmpeg4 -%endif +## keep around in case it needs reverting for older ffmpeg +#if 0%{?fedora} > 27 +#patch103 -p1 -b .ffmpeg4 +#endif # 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 @@ -399,16 +388,13 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium %build export STRIP=strip -export NINJAFLAGS="-v %{_smp_mflags}" -export NINJA_PATH=%{_bindir}/ninja-build - -mkdir %{_target_platform} -pushd %{_target_platform} +export NINJAFLAGS="%{__ninja_common_opts}" +export NINJA_PATH=%{__ninja} %{qmake_qt5} CONFIG+="%{debug_config}" \ - QMAKE_EXTRA_ARGS+="-system-webengine-icu %{?system_ffmpeg_flag} -proprietary-codecs" .. + QMAKE_EXTRA_ARGS+="-system-webengine-icu %{?system_ffmpeg_flag} -proprietary-codecs" . -make %{?_smp_mflags} +%make_build %install # install the libraries to a special directory to avoid conflict with official @@ -416,7 +402,7 @@ make %{?_smp_mflags} # qt5-qtwebengine for them instead) mkdir -p %{buildroot}%{_libdir}/%{name} for i in libQt5WebEngineCore libQt5WebEngine libQt5WebEngineWidgets ; do - install -m 755 -p %{_target_platform}/lib/$i.so.%{version} %{buildroot}%{_libdir}/%{name}/ + install -m 755 -p lib/$i.so.%{version} %{buildroot}%{_libdir}/%{name}/ ln -sf $i.so.%{version} %{buildroot}%{_libdir}/%{name}/$i.so.%{major} ln -sf $i.so.%{version} %{buildroot}%{_libdir}/%{name}/$i.so.%{major_minor} done @@ -426,8 +412,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/%{name}" \ -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc @@ -435,6 +420,14 @@ echo "%{_libdir}/%{name}" \ %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Sat Jun 23 2018 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 5.11.1-1 +- 5.11.1 +- drop shadow build (to match other qt5 packages where it has been problematic) +- drop upstreamed patches +- rebase no-icudtl-dat.patch +- patches needswork: system-nspr-prtime,system-icu-utf,no-sse2,skia-neon,icu59 +- use macros %%make_build %%ldconfig_scriptlets %%__ninja %%__ninja_common_opts + * Mon May 21 2018 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 5.10.1-5 - Use the FFmpeg 4 patch from Arch Linux, the previous one crashed (rh#1563446) - Add patch by spot from the Fedora Chromium RPM for FTBFS with GCC 8 on i686 diff --git a/qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch similarity index 63% rename from qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch rename to qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch index 00cbfc2..59da86e 100644 --- a/qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch +++ b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch @@ -1,12 +1,17 @@ -diff -ur qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp qtwebengine-opensource-src-5.6.0-no-icudtl-dat/src/core/web_engine_library_info.cpp ---- qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp 2016-03-03 17:02:28.000000000 +0100 -+++ qtwebengine-opensource-src-5.6.0-no-icudtl-dat/src/core/web_engine_library_info.cpp 2016-03-18 03:08:24.385444415 +0100 -@@ -207,24 +207,7 @@ +diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp +--- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat 2018-06-14 09:23:48.931195271 -0500 ++++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp 2018-06-14 09:27:26.248014325 -0500 +@@ -258,28 +258,12 @@ QString dictionariesPath() + + QString icuDataPath() + { +- static bool initialized = false; + static QString potentialResourcesPath = #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) - return getResourcesPath(frameworkBundle()); + getResourcesPath(frameworkBundle()); #else -- static bool initialized = false; - static QString potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources"); + QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources"); + #endif - if (!initialized) { - initialized = true; - if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) { @@ -22,7 +27,6 @@ diff -ur qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp q - potentialResourcesPath = fallbackDir(); - } - } -- + return potentialResourcesPath; - #endif } diff --git a/sources b/sources index e5768f5..513105b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77374c184f2ff5005d1c61a32ea38491 qtwebengine-everywhere-src-5.10.1.tar.xz +75d2ff31addba4ec41981b0f459cc587 qtwebengine-everywhere-src-5.11.1.tar.xz