diff options
author | Joshua Henderson <joshua.henderson@microchip.com> | 2017-07-13 09:18:43 -0700 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-20 09:33:12 +0200 |
commit | 854b933705fa42952ab64a3e0b068520a5bca10f (patch) | |
tree | 98ab3fd3c8050bb330cd7f019653ff67a70263d5 /package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch | |
parent | 4b4a928d9020c93e06421b7903d0ece1525147b7 (diff) | |
download | buildroot-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/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch')
-rw-r--r-- | package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch b/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch deleted file mode 100644 index 3a43584eeb..0000000000 --- a/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c5d7425f8ad391112758db161e3e08f18dc9d299 Mon Sep 17 00:00:00 2001 -From: Marc Mutz <marc.mutz@kdab.com> -Date: Thu, 26 May 2016 08:30:26 +0200 -Subject: [PATCH] QAtomic: pass explicit failure mode to - std::atomic::compare_exchange_strong - -... in an attempt to avoid GCC 4.8 errors such as - - bits/atomic_base.h:577:70: error: failure memory model cannot be stronger than success memory model for '__atomic_compare_exchange' - return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2); - ^ - -as seen on Android. - -Change-Id: If046e735888cf331d2d6506d8d5ca9aa7402f9ad -[Bug report: https://bugreports.qt.io/browse/QTBUG-59399 - Patch sent upstream: https://codereview.qt-project.org/#/c/187980/] -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.org> ---- - src/corelib/arch/qatomic_cxx11.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h -index bb49aae..d6731ec 100644 ---- a/src/corelib/arch/qatomic_cxx11.h -+++ b/src/corelib/arch/qatomic_cxx11.h -@@ -153,7 +153,7 @@ template <typename X> struct QAtomicOps - template <typename T> - static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW - { -- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed); -+ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed); - if (currentValue) - *currentValue = expectedValue; - return tmp; -@@ -162,7 +162,7 @@ template <typename X> struct QAtomicOps - template <typename T> - static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW - { -- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire); -+ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire); - if (currentValue) - *currentValue = expectedValue; - return tmp; -@@ -171,7 +171,7 @@ template <typename X> struct QAtomicOps - template <typename T> - static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW - { -- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release); -+ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed); - if (currentValue) - *currentValue = expectedValue; - return tmp; -@@ -180,7 +180,7 @@ template <typename X> struct QAtomicOps - template <typename T> - static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW - { -- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel); -+ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire); - if (currentValue) - *currentValue = expectedValue; - return tmp; --- -1.7.10.4 - |