commit 4a8ebc82231975c874a2d037857eddca1d6e2635 Author: Kevin Kofler <kevin.kofler(a)chello.at&gt; Date: Tue Jun 27 01:43:58 2017 +0200 Add a hunk to the QTBUG-61521 fix according to the upstream review * Mon Jun 26 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 5.9.0-3 - Add a hunk to the QTBUG-61521 fix according to the upstream review qt5-qtwebengine-freeworld.spec | 11 +++++++---- ...ebengine-opensource-src-5.9.0-qtbug-61521.patch | 23 ++++++++++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) --- diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index d6e9646..f149bc3 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -44,7 +44,7 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld Version: 5.9.0 -Release: 2%{?dist} +Release: 3%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) %global major %(echo %{version} | cut -d. -f1) @@ -100,8 +100,8 @@ 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) -Patch23: qtwebengine-opensource-src-5.9.0-qtbug-60565-c-symbols.patch +# 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 @@ -332,7 +332,7 @@ This version is compiled with support for patent-encumbered codecs enabled. %patch20 -p1 -b .qt57 %patch21 -p1 -b .gn-bootstrap-verbose %patch22 -p1 -b .system-re2 -%patch23 -p1 -b .qtbug-60565-c-symbols +%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 @@ -413,6 +413,9 @@ echo "%{_libdir}/%{name}" \ %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Mon Jun 26 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 5.9.0-3 +- Add a hunk to the QTBUG-61521 fix according to the upstream review + * Sun Jun 25 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 5.9.0-2 - Fix broken binary compatibility for C memory management functions (incomplete upstream fix for QTBUG-60565) diff --git a/qtwebengine-opensource-src-5.9.0-qtbug-60565-c-symbols.patch b/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch similarity index 82% rename from qtwebengine-opensource-src-5.9.0-qtbug-60565-c-symbols.patch rename to qtwebengine-opensource-src-5.9.0-qtbug-61521.patch index 35edb0c..a9a0109 100644 --- a/qtwebengine-opensource-src-5.9.0-qtbug-60565-c-symbols.patch +++ b/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch @@ -1,6 +1,25 @@ -diff -ur qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp qtwebengine-opensource-src-5.9.0-qtbug-60565-c-symbols/src/core/api/qtbug-60565.cpp +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 +@@ -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.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-60565-c-symbols/src/core/api/qtbug-60565.cpp 2017-06-25 22:33:28.508223362 +0200 ++++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/core/api/qtbug-60565.cpp 2017-06-25 22:33:28.508223362 +0200 @@ -39,6 +39,8 @@ #include <new>