diff options
Diffstat (limited to 'package/qt5/qt5base')
3 files changed, 2 insertions, 82 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 deleted file mode 100644 index 69b1bd40f5..0000000000 --- a/package/qt5/qt5base/5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 - -Upstream: https://codereview.qt-project.org/200171 -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - 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 - diff --git a/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch b/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch deleted file mode 100644 index 6735ab63e0..0000000000 --- a/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From adacb2d6701b12511c5a0e58072236da91ebf810 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Mon, 7 Aug 2017 22:54:11 +0200 -Subject: [PATCH] examples: fix compile without opengl support - -Compile examples/opengl only in case opengl support is available. - -Task-number: QTBUG-62372 -Change-Id: I742a1eb7b7639a5a722c4d5e9b4ee070b629b02e - -Upstream: https://codereview.qt-project.org/201947 -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - examples/examples.pro | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index a3851c6d81..d87fa2da88 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -14,7 +14,8 @@ qtHaveModule(concurrent): SUBDIRS += qtconcurrent - qtHaveModule(sql): SUBDIRS += sql - qtHaveModule(widgets): SUBDIRS += widgets - qtHaveModule(xml): SUBDIRS += xml --qtHaveModule(gui): SUBDIRS += gui opengl -+qtHaveModule(gui): SUBDIRS += gui -+qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl - - aggregate.files = aggregate/examples.pro - aggregate.path = $$[QT_INSTALL_EXAMPLES] --- -2.11.0 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index aab5e71fb6..4fac29a74a 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,8 +1,8 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz -# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6 qtbase-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz.mirrorlist +sha256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b qtbase-opensource-src-5.9.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 |
