rpms
/
qt5-qtwebengine
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a hunk to the QTBUG-61521 fix according to the upstream review 

* Mon Jun 26 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-4
- Add a hunk to the QTBUG-61521 fix according to the upstream review
This commit is contained in:
Kevin Kofler 2017-06-26 23:23:28 +02:00
parent 09a57d530c
commit 1c2a8df203
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt5-qtwebengine.spec
View File

@ -56,7 +56,7 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
Version: 5.9.0
Release: 3%{?dist}
Release: 4%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@ -118,8 +118,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
@ -371,7 +371,7 @@ BuildArch: noarch
%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
@ -580,9 +580,12 @@ done
%changelog
* Mon Jun 26 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-4
- Add a hunk to the QTBUG-61521 fix according to the upstream review
* Sun Jun 25 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-3
- Fix broken binary compatibility for C memory management functions (incomplete
upstream fix for QTBUG-60565)
upstream fix for QTBUG-60565) (QTBUG-61521)
* Tue Jun 13 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-2
- arm-fpu-fix patch: Also build the host tools (i.e., GN) with the correct FPU

23
qtwebengine-opensource-src-5.9.0-qtbug-60565-c-symbols.patch → qtwebengine-opensource-src-5.9.0-qtbug-61521.patch
View File

@ -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:15:31.499258482 +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>