From f456610d8c80d8fdbf3dfaca93a55b2e960befc6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 1 Jul 2017 01:30:34 +0200 Subject: [PATCH] Update to 5.9.1 * Fri Jun 30 2017 Kevin Kofler - 5.9.1-1 - Update to 5.9.1 - Rebase qtbug-61521 patch (drop the parts that are already in 5.9.1) - Drop backported GN aarch64 patches already included in 5.9.1 --- .gitignore | 1 + qt5-qtwebengine.spec | 27 ++++++------ ...urce-src-5.9.0-aarch64-gcc-toolchain.patch | 30 ------------- ...gine-opensource-src-5.9.0-gn-aarch64.patch | 43 ------------------- ...ine-opensource-src-5.9.1-qtbug-61521.patch | 43 +++++-------------- sources | 2 +- 6 files changed, 25 insertions(+), 121 deletions(-) delete mode 100644 qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch delete mode 100644 qtwebengine-opensource-src-5.9.0-gn-aarch64.patch rename qtwebengine-opensource-src-5.9.0-qtbug-61521.patch => qtwebengine-opensource-src-5.9.1-qtbug-61521.patch (75%) diff --git a/.gitignore b/.gitignore index 3eee6b2..01c15f0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /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 diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 480d8c7..319699a 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -55,8 +55,8 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.9.0 -Release: 4%{?dist} +Version: 5.9.1 +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 @@ -64,8 +64,8 @@ Release: 4%{?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 # cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg -# wget http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtwebengine-opensource-src-5.9.0.tar.xz -# ./clean_qtwebengine.sh 5.9.0 +# wget http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz +# ./clean_qtwebengine.sh 5.9.1 Source0: qtwebengine-opensource-src-%{version}-clean.tar.xz # cleanup scripts used above Source1: clean_qtwebengine.sh @@ -119,13 +119,7 @@ Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch 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.0-qtbug-61521.patch -# Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128) -# https://codereview.qt-project.org/196178 -Patch100: qtwebengine-opensource-src-5.9.0-gn-aarch64.patch -# Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium -# https://codereview.chromium.org/2545053002 -Patch101: qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch +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 @@ -215,9 +209,9 @@ BuildRequires: pkgconfig(vpx) >= 1.6.0 # Of course, Chromium itself is bundled. It cannot be unbundled because it is # not a library, but forked (modified) application code. -# Some security fixes (up to version 58.0.3029.96) are backported, see: +# Some security fixes (up to version 59.0.3071.104) are backported, see: # http://code.qt.io/cgit/qt/qtwebengine-chromium.git/log/?h=56-based -# see dist/changes-5.9.0 for the version numbers (base, security fixes) and for +# see dist/changes-5.9.1 for the version numbers (base, security fixes) and for # a list of CVEs fixed by the added security backports Provides: bundled(chromium) = 56.0.2924.122 @@ -372,8 +366,6 @@ BuildArch: noarch %patch21 -p1 -b .gn-bootstrap-verbose %patch22 -p1 -b .system-re2 %patch23 -p1 -b .qtbug-61521 -%patch100 -p1 -b .gn-aarch64 -%patch101 -p1 -b .aarch64-gcc-toolchain # 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 @@ -580,6 +572,11 @@ done %changelog +* Fri Jun 30 2017 Kevin Kofler - 5.9.1-1 +- Update to 5.9.1 +- Rebase qtbug-61521 patch (drop the parts that are already in 5.9.1) +- Drop backported GN aarch64 patches already included in 5.9.1 + * Mon Jun 26 2017 Kevin Kofler - 5.9.0-4 - Add a hunk to the QTBUG-61521 fix according to the upstream review diff --git a/qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch b/qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch deleted file mode 100644 index 76228a0..0000000 --- a/qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: src/3rdparty/chromium/build/toolchain/linux/BUILD.gn -diff --git a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn -index 548722d3938017ac936b9088b7a686c2afbbb5fe..86cd7dabc6e86d22a266817dfbb3bf0c719f7992 100644 ---- a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn -+++ b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn -@@ -21,6 +21,24 @@ clang_toolchain("clang_arm64") { - } - } - -+gcc_toolchain("arm64") { -+ toolprefix = "aarch64-linux-gnu-" -+ -+ cc = "${toolprefix}gcc" -+ cxx = "${toolprefix}g++" -+ -+ ar = "${toolprefix}ar" -+ ld = cxx -+ readelf = "${toolprefix}readelf" -+ nm = "${toolprefix}nm" -+ -+ toolchain_args = { -+ current_cpu = "arm64" -+ current_os = "linux" -+ is_clang = false -+ } -+} -+ - gcc_toolchain("arm") { - toolprefix = "arm-linux-gnueabihf-" - diff --git a/qtwebengine-opensource-src-5.9.0-gn-aarch64.patch b/qtwebengine-opensource-src-5.9.0-gn-aarch64.patch deleted file mode 100644 index 1e8f31f..0000000 --- a/qtwebengine-opensource-src-5.9.0-gn-aarch64.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 801c957651fba94b5d7dde9cc490378a4dc3a987 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Thu, 1 Jun 2017 11:40:02 +0200 -Subject: [PATCH] [Backport] GN: Add Arm64 Linux support - -Add Arm64 linux support be able to build GN binary for -native arm64 builds. - -R=dpranke@chromium.org, brettw@chromium.org - -Review-Url: https://codereview.chromium.org/2550673002 - -Task-number: QTBUG-61128 -Change-Id: I3aa6b6ca7df374428a7f4a8b4db9f488a8926f6c -Reviewed-by: Joerg Bornemann ---- - chromium/tools/gn/args.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/3rdparty/chromium/tools/gn/args.cc b/src/3rdparty/chromium/tools/gn/args.cc -index 7285d7a..54703e1 100644 ---- a/src/3rdparty/chromium/tools/gn/args.cc -+++ b/src/3rdparty/chromium/tools/gn/args.cc -@@ -266,6 +266,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { - static const char kX86[] = "x86"; - static const char kX64[] = "x64"; - static const char kArm[] = "arm"; -+ static const char kArm64[] = "arm64"; - static const char kMips[] = "mipsel"; - static const char kS390X[] = "s390x"; - static const char kPPC64[] = "ppc64"; -@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const { - arch = kX64; - else if (os_arch.substr(0, 3) == "arm") - arch = kArm; -+ else if (os_arch == "aarch64") -+ arch = kArm64; - else if (os_arch == "mips") - arch = kMips; - else if (os_arch == "s390x") --- -2.7.4 - diff --git a/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch b/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch similarity index 75% rename from qtwebengine-opensource-src-5.9.0-qtbug-61521.patch rename to qtwebengine-opensource-src-5.9.1-qtbug-61521.patch index a9a0109..82d3a14 100644 --- a/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch +++ b/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch @@ -1,6 +1,6 @@ -diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/memory_linux.cc qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc ---- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/memory_linux.cc 2017-05-18 16:51:44.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-26 23:48:15.166464570 +0200 +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); @@ -17,9 +17,9 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/mem } // extern C -diff -ur qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp qtwebengine-opensource-src-5.9.0-qtbug-61521/src/core/api/qtbug-60565.cpp ---- qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp 2017-05-19 06:22:04.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/core/api/qtbug-60565.cpp 2017-06-25 22:33:28.508223362 +0200 +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 @@ -29,15 +29,7 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp qtwebengi #if defined(__LP64__) # define SIZE_T_MANGLING "m" -@@ -47,6 +49,7 @@ - #endif - - #define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn))) -+#define SHIM_HIDDEN __attribute__ ((visibility ("hidden"))) - - extern "C" { - -@@ -82,26 +85,100 @@ +@@ -83,10 +85,51 @@ void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept SHIM_ALIAS_SYMBOL(ShimCppDeleteArray); @@ -87,23 +79,10 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp qtwebengi +static void* __shimPvalloc(size_t size) noexcept; +static void __shimFree(void* address) noexcept; --static void* ShimCppNew(size_t size) { -+SHIM_HIDDEN void* ShimCppNew(size_t size) { + SHIM_HIDDEN void* ShimCppNew(size_t size) { return __shimCppNew(size); - } - --static void* ShimCppNewArray(size_t size) { -+SHIM_HIDDEN void* ShimCppNewArray(size_t size) { - return __shimCppNewArray(size); - } - --static void ShimCppDelete(void* address) { -+SHIM_HIDDEN void ShimCppDelete(void* address) { - __shimCppDelete(address); - } - --static void ShimCppDeleteArray(void* address) { -+SHIM_HIDDEN void ShimCppDeleteArray(void* address) { +@@ -103,6 +146,39 @@ + SHIM_HIDDEN void ShimCppDeleteArray(void* address) { __shimCppDeleteArray(address); } + @@ -142,7 +121,7 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp qtwebengi } // extern "C" static void* __shimCppNew(size_t size) { -@@ -119,3 +196,36 @@ +@@ -120,3 +196,36 @@ static void __shimCppDeleteArray(void* address) { operator delete[](address); } diff --git a/sources b/sources index 2a6156f..979b865 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebengine-opensource-src-5.9.0-clean.tar.xz) = b97da4c9cd98d4c9c3cd4f59a4b488f55234dab947d324956643d0ccd61a527d3b5d7c647626b947dfde6dedcce1a9fa630d81b40ff1200c445547e3466c0607 +SHA512 (qtwebengine-opensource-src-5.9.1-clean.tar.xz) = 86bbfe50d557b82df3b3598a43340b5fa913d01df0a8c7cd43ae8d36eed59e6deca633e42f8813c1074b3bbc5ac21179571f2ef9fd125838875bddd92faca36c