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.9.1/0001-Fix-error-attribute-target-crc-is-unknown.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.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch')
-rw-r--r-- | package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch b/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch new file mode 100644 index 0000000000..92d93a800b --- /dev/null +++ b/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch @@ -0,0 +1,44 @@ +From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Sun, 16 Jul 2017 00:05:44 +0200 +Subject: [PATCH] Fix error attribute(target("+crc")) is unknown + +Task-number: QTBUG-61975 +Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d +--- + src/corelib/tools/qhash.cpp | 2 ++ + src/corelib/tools/qsimd_p.h | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp +index 1f9c05c..bbf6efb 100644 +--- a/src/corelib/tools/qhash.cpp ++++ b/src/corelib/tools/qhash.cpp +@@ -144,7 +144,9 @@ static inline bool hasFastCrc32() + } + + template <typename Char> ++#if defined(__aarch64__) + QT_FUNCTION_TARGET(CRC32) ++#endif + static uint crc32(const Char *ptr, size_t len, uint h) + { + // The crc32[whbd] instructions on Aarch64/Aarch32 calculate a 32-bit CRC32 checksum +diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h +index 023a4b0..a85d572 100644 +--- a/src/corelib/tools/qsimd_p.h ++++ b/src/corelib/tools/qsimd_p.h +@@ -326,7 +326,10 @@ + #endif + // AArch64/ARM64 + #if defined(Q_PROCESSOR_ARM_V8) && defined(__ARM_FEATURE_CRC32) ++#if defined(__aarch64__) ++// only available on aarch64 + #define QT_FUNCTION_TARGET_STRING_CRC32 "+crc" ++#endif + # include <arm_acle.h> + #endif + +-- +2.7.4 + |