summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff options
context:
space:
mode:
authorJoshua Henderson <joshua.henderson@microchip.com>2017-07-13 09:18:43 -0700
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-20 09:33:12 +0200
commit854b933705fa42952ab64a3e0b068520a5bca10f (patch)
tree98ab3fd3c8050bb330cd7f019653ff67a70263d5 /package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
parent4b4a928d9020c93e06421b7903d0ece1525147b7 (diff)
downloadbuildroot-854b933705fa42952ab64a3e0b068520a5bca10f.tar.gz
buildroot-854b933705fa42952ab64a3e0b068520a5bca10f.zip
package/qt5: bump latest version to 5.9.1
Qt 5.9 is a Long Term Support version [1]. Some license file changes are involved, a new dependency on pcre2, and some filename changes. qt5webkit popped back into the picture for 5.9.1 after being absent for 5.9.0 "officially." QT5_SNAPSHOTS_SITE is removed with this commit as it is not used for qtwebkit anymore. This removes the following patches that have been upstreamed for 5.9.1: - qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch [2] - qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch [3] - qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch [4] - qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch [5] - qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch [6] - qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch [7] The qt5webkit patches no longer apply to both the LTS and latest version, so they are moved to per-version directories. [1] https://www.qt.io/qt5-9/ [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff [3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44 [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=5cc0de2e084cb887a75b076b82cf470ecdcd4dd3 [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9a7739e77f79baeb5452189b6d17e63de5b341d [6] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=18d49808db46add078d9d4bcffaac5361d5c7269 [7] https://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=548380af096f8277e460383c81a4ecdf2b77523f Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Brent Sink <brents_3@hotmail.com> Cc: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch')
-rw-r--r--package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
deleted file mode 100644
index a2597a54bb..0000000000
--- a/package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 5 Jun 2015 19:55:05 -0700
-Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
-
-It was excluding musl with current checks, so lets make it such that it
-considers only glibc when using backtrace API
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Downloaded from:
-https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
-0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
-
-Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
----
- Source/WTF/wtf/Assertions.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
-index 1b2091f..ba03a28 100644
---- a/Source/WTF/wtf/Assertions.cpp
-+++ b/Source/WTF/wtf/Assertions.cpp
-@@ -61,7 +61,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
---
-2.7.0
-
OpenPOWER on IntegriCloud