From 8d10a950e255b60e8e274c674e147cefdab955c5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 10 Oct 2017 08:57:34 -0500 Subject: [PATCH] 5.9.2 --- .gitignore | 9 +- qt5-qtwebengine.spec | 18 +- qtwebengine-opensource-src-5.8.0-qt57.patch | 12 -- ...ine-opensource-src-5.9.0-arm-fpu-fix.patch | 9 - ...ine-opensource-src-5.9.1-qtbug-61521.patch | 160 ------------------ ...ngine-opensource-src-5.9.2-linux-pri.patch | 11 +- sources | 2 +- 7 files changed, 15 insertions(+), 206 deletions(-) delete mode 100644 qtwebengine-opensource-src-5.8.0-qt57.patch delete mode 100644 qtwebengine-opensource-src-5.9.1-qtbug-61521.patch rename qtwebengine-opensource-src-5.9.0-linux-pri.patch => qtwebengine-opensource-src-5.9.2-linux-pri.patch (68%) diff --git a/.gitignore b/.gitignore index 01c15f0..7789fc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ -/qtwebengine-opensource-src-5.6.0-beta-clean.tar.xz -/qtwebengine-opensource-src-5.6.0-rc-clean.tar.xz -/qtwebengine-opensource-src-5.6.0-clean.tar.xz -/qtwebengine-opensource-src-5.6.1-clean.tar.xz -/qtwebengine-opensource-src-5.7.0-clean.tar.xz -/qtwebengine-opensource-src-5.7.1-clean.tar.xz -/qtwebengine-opensource-src-5.8.0-clean.tar.xz -/qtwebengine-opensource-src-5.9.0-clean.tar.xz /qtwebengine-opensource-src-5.9.1-clean.tar.xz +/qtwebengine-opensource-src-5.9.2-clean.tar.xz diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index c011a83..d1d2c8b 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -55,8 +55,8 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.9.1 -Release: 5%{?dist} +Version: 5.9.2 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -74,7 +74,7 @@ Source3: get_free_ffmpeg_source_files.py # macros Source10: macros.qt5-qtwebengine # some tweaks to linux.pri (system libs, link libpci, run unbundling script) -Patch0: qtwebengine-opensource-src-5.9.0-linux-pri.patch +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 @@ -111,15 +111,10 @@ 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 @@ -139,6 +134,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 @@ -362,10 +359,8 @@ BuildArch: noarch %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 @@ -572,6 +567,9 @@ done %changelog +* Tue Oct 10 2017 Rex Dieter - 5.9.2-1 +- 5.9.2 + * Mon Oct 09 2017 Rex Dieter - 5.9.1-5 - rebuild (qt5) diff --git a/qtwebengine-opensource-src-5.8.0-qt57.patch b/qtwebengine-opensource-src-5.8.0-qt57.patch deleted file mode 100644 index 480ae11..0000000 --- a/qtwebengine-opensource-src-5.8.0-qt57.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp.qt58 qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp ---- qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp.qt58 2017-01-03 04:35:11.000000000 -0600 -+++ qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp 2017-03-24 14:43:55.120363292 -0500 -@@ -109,7 +109,7 @@ net::ProxyConfigService::ConfigAvailabil - } - m_qtApplicationProxy = qtProxy; - m_qtProxyConfig = net::ProxyConfig(); --#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) -+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) - if (qtProxy.type() == QNetworkProxy::NoProxy - && QNetworkProxyFactory::usesSystemConfiguration()) { - *config = systemConfig; diff --git a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch b/qtwebengine-opensource-src-5.9.0-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.0-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.1-qtbug-61521.patch b/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch deleted file mode 100644 index 82d3a14..0000000 --- a/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -ur qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/base/process/memory_linux.cc qtwebengine-opensource-src-5.9.1-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc ---- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-20 11:10:02.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.1-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-07-01 01:20:35.113886332 +0200 -@@ -60,6 +60,7 @@ - #endif - void* __libc_memalign(size_t alignment, size_t size); - -+#if !defined(TOOLKIT_QT) //QTBUG-61521,QTBUG-60565 - // Overriding the system memory allocation functions: - // - // For security reasons, we want malloc failures to be fatal. Too much code -@@ -129,6 +130,7 @@ - *ptr = memalign(alignment, size); - return 0; - } -+#endif // TOOLKIT_QT - - } // extern C - -diff -ur qtwebengine-opensource-src-5.9.1/src/core/api/qtbug-60565.cpp qtwebengine-opensource-src-5.9.1-qtbug-61521/src/core/api/qtbug-60565.cpp ---- qtwebengine-opensource-src-5.9.1/src/core/api/qtbug-60565.cpp 2017-06-23 08:29:46.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.1-qtbug-61521/src/core/api/qtbug-60565.cpp 2017-07-01 01:22:27.626242360 +0200 -@@ -39,6 +39,8 @@ - - #include - #include -+#include -+#include - - #if defined(__LP64__) - # define SIZE_T_MANGLING "m" -@@ -83,10 +85,51 @@ - void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppDeleteArray); - -+__asm__(".symver __ShimMalloc, malloc@Qt_5"); -+void* __ShimMalloc(size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimMalloc); -+ -+__asm__(".symver __ShimCalloc, calloc@Qt_5"); -+void* __ShimCalloc(size_t n, size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimCalloc); -+ -+__asm__(".symver __ShimRealloc, realloc@Qt_5"); -+void* __ShimRealloc(void* address, size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimRealloc); -+ -+__asm__(".symver __ShimMemalign, memalign@Qt_5"); -+void* __ShimMemalign(size_t alignment, size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimMemalign); -+ -+__asm__(".symver __ShimPosixMemalign, posix_memalign@Qt_5"); -+int __ShimPosixMemalign(void** res, size_t alignment, size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimPosixMemalign); -+ -+__asm__(".symver __ShimValloc, valloc@Qt_5"); -+void* __ShimValloc(size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimValloc); -+ -+__asm__(".symver __ShimPvalloc, pvalloc@Qt_5"); -+void* __ShimPvalloc(size_t size) noexcept -+ SHIM_ALIAS_SYMBOL(ShimPvalloc); -+ -+__asm__(".symver __ShimFree, free@Qt_5"); -+void __ShimFree(void* address) noexcept -+ SHIM_ALIAS_SYMBOL(ShimFree); -+ - static void* __shimCppNew(size_t size); - static void* __shimCppNewArray(size_t size); - static void __shimCppDelete(void *address); - static void __shimCppDeleteArray(void *address); -+static void* __shimMalloc(size_t size) noexcept; -+static void* __shimCalloc(size_t n, size_t size) noexcept; -+static void* __shimRealloc(void* address, size_t size) noexcept; -+static void* __shimMemalign(size_t alignment, size_t size) noexcept; -+static int __shimPosixMemalign(void** res, size_t alignment, size_t size) -+ noexcept; -+static void* __shimValloc(size_t size) noexcept; -+static void* __shimPvalloc(size_t size) noexcept; -+static void __shimFree(void* address) noexcept; - - SHIM_HIDDEN void* ShimCppNew(size_t size) { - return __shimCppNew(size); -@@ -103,6 +146,39 @@ - SHIM_HIDDEN void ShimCppDeleteArray(void* address) { - __shimCppDeleteArray(address); - } -+ -+SHIM_HIDDEN void* ShimMalloc(size_t size) noexcept { -+ return __shimMalloc(size); -+} -+ -+SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) noexcept { -+ return __shimCalloc(n, size); -+} -+ -+SHIM_HIDDEN void* ShimRealloc(void* address, size_t size) noexcept { -+ return __shimRealloc(address, size); -+} -+ -+SHIM_HIDDEN void* ShimMemalign(size_t alignment, size_t size) noexcept { -+ return __shimMemalign(alignment, size); -+} -+ -+SHIM_HIDDEN int ShimPosixMemalign(void** res, size_t alignment, size_t size) -+ noexcept { -+ return __shimPosixMemalign(res, alignment, size); -+} -+ -+SHIM_HIDDEN void* ShimValloc(size_t size) noexcept { -+ return __shimValloc(size); -+} -+ -+SHIM_HIDDEN void* ShimPvalloc(size_t size) noexcept { -+ return __shimPvalloc(size); -+} -+ -+SHIM_HIDDEN void ShimFree(void* address) noexcept { -+ __shimFree(address); -+} - } // extern "C" - - static void* __shimCppNew(size_t size) { -@@ -120,3 +196,36 @@ - static void __shimCppDeleteArray(void* address) { - operator delete[](address); - } -+ -+static void* __shimMalloc(size_t size) noexcept { -+ return malloc(size); -+} -+ -+static void* __shimCalloc(size_t n, size_t size) noexcept { -+ return calloc(n, size); -+} -+ -+static void* __shimRealloc(void* address, size_t size) noexcept { -+ return realloc(address, size); -+} -+ -+static void* __shimMemalign(size_t alignment, size_t size) noexcept { -+ return memalign(alignment, size); -+} -+ -+static int __shimPosixMemalign(void** res, size_t alignment, size_t size) -+ noexcept { -+ return posix_memalign(res, alignment, size); -+} -+ -+static void* __shimValloc(size_t size) noexcept { -+ return valloc(size); -+} -+ -+static void* __shimPvalloc(size_t size) noexcept { -+ return pvalloc(size); -+} -+ -+static void __shimFree(void* address) noexcept { -+ free(address); -+} diff --git a/qtwebengine-opensource-src-5.9.0-linux-pri.patch b/qtwebengine-opensource-src-5.9.2-linux-pri.patch similarity index 68% rename from qtwebengine-opensource-src-5.9.0-linux-pri.patch rename to qtwebengine-opensource-src-5.9.2-linux-pri.patch index c671f6b..564bdbe 100644 --- a/qtwebengine-opensource-src-5.9.0-linux-pri.patch +++ b/qtwebengine-opensource-src-5.9.2-linux-pri.patch @@ -1,11 +1,10 @@ -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,21 @@ 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 + diff --git a/sources b/sources index 979b865..aa0eaf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebengine-opensource-src-5.9.1-clean.tar.xz) = 86bbfe50d557b82df3b3598a43340b5fa913d01df0a8c7cd43ae8d36eed59e6deca633e42f8813c1074b3bbc5ac21179571f2ef9fd125838875bddd92faca36c +SHA512 (qtwebengine-opensource-src-5.9.2-clean.tar.xz) = d4919a4475101175c37455949b9e9dc8cdfb18243ff2fe3320e3c14c685523cc46a3e5fac4c01b40a090ad1f0f9458bf3fc15a86b7fcdd9b43f1c76b090dc9cf