From f8ab535dc543dbcd538301aebe633595d3e53d8f Mon Sep 17 00:00:00 2001 From: Strawberry Bot Date: Fri, 27 Sep 2024 08:32:34 +0200 Subject: [PATCH] Update qt6 --- src/qt6-qtbase-1-fixes.patch | 56 ------------------------------------ src/qt6-qtbase.mk | 4 +-- src/qt6-qttools.mk | 4 +-- src/qt6-qttranslations.mk | 4 +-- 4 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 src/qt6-qtbase-1-fixes.patch diff --git a/src/qt6-qtbase-1-fixes.patch b/src/qt6-qtbase-1-fixes.patch deleted file mode 100644 index 31482b28..00000000 --- a/src/qt6-qtbase-1-fixes.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 39fa7e7bef90be2940c5f736935f963e3969e0bd Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Sat, 27 Jul 2024 23:03:07 +0300 -Subject: Use _Float16 only when SSE2 is enabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The GCC documentation [1] says: “On x86 targets with SSE2 enabled, GCC -supports half-precision (16-bit) floating point via the _Float16 type”. - -On non-SSE2 x86 (such as Debian i386 baseline [2]), __FLT16_MAX__ is -defined starting with GCC 14 [3], however any non-trivial use of the -_Float16 type results in an error: - -error: operation not permitted on type ‘_Float16’ without option ‘-msse2’ - -which makes some packages fail to build on i386 architecture [4]. - -[1]: https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html -[2]: https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 -[3]: https://gcc.gnu.org/g:9a19fa8b616f83474c35cc5b34a3865073ced829 -[4]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076986 - -Pick-to: 6.8 6.7 6.5 -Change-Id: I393ee83eb8e8888f5fc9e3b349dc8b063eef6f5a -Reviewed-by: Thiago Macieira -Reviewed-by: Edward Welbourne ---- - src/corelib/global/qtypes.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/global/qtypes.h b/src/corelib/global/qtypes.h -index db9ba38e4c..28458f63c2 100644 ---- a/src/corelib/global/qtypes.h -+++ b/src/corelib/global/qtypes.h -@@ -263,13 +263,12 @@ using NativeFloat16Type = std::float16_t; - // disabled due to https://github.com/llvm/llvm-project/issues/56963 - # define QFLOAT16_IS_NATIVE 1 - using NativeFloat16Type = decltype(__FLT16_MAX__); --#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) -+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__ARM_FP16_FORMAT_IEEE) - # define QFLOAT16_IS_NATIVE 1 --# ifdef __ARM_FP16_FORMAT_IEEE - using NativeFloat16Type = __fp16; --# else -+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__SSE2__) -+# define QFLOAT16_IS_NATIVE 1 - using NativeFloat16Type = _Float16; --# endif - #else - # define QFLOAT16_IS_NATIVE 0 - using NativeFloat16Type = void; --- -cgit v1.2.3 - diff --git a/src/qt6-qtbase.mk b/src/qt6-qtbase.mk index 52924a9f..b43021d2 100644 --- a/src/qt6-qtbase.mk +++ b/src/qt6-qtbase.mk @@ -4,8 +4,8 @@ PKG := qt6-qtbase $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt 6 Base $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7.2 -$(PKG)_CHECKSUM := c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 +$(PKG)_VERSION := 6.7.3 +$(PKG)_CHECKSUM := 8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097 $(PKG)_FILE := qtbase-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_SUBDIR := qtbase-everywhere-src-$($(PKG)_VERSION) $(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qt6-qttools.mk b/src/qt6-qttools.mk index 7b8ddfdc..71c47264 100644 --- a/src/qt6-qttools.mk +++ b/src/qt6-qttools.mk @@ -4,8 +4,8 @@ PKG := qt6-qttools $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt 6 Tools $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7.2 -$(PKG)_CHECKSUM := 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a +$(PKG)_VERSION := 6.7.3 +$(PKG)_CHECKSUM := f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f $(PKG)_FILE := qttools-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_SUBDIR := qttools-everywhere-src-$($(PKG)_VERSION) $(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qt6-qttranslations.mk b/src/qt6-qttranslations.mk index d0adb7d6..97c71836 100644 --- a/src/qt6-qttranslations.mk +++ b/src/qt6-qttranslations.mk @@ -4,8 +4,8 @@ PKG := qt6-qttranslations $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt 6 Translations $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7.2 -$(PKG)_CHECKSUM := 9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9 +$(PKG)_VERSION := 6.7.3 +$(PKG)_CHECKSUM := dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8 $(PKG)_FILE := qttranslations-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_SUBDIR := qttranslations-everywhere-src-$($(PKG)_VERSION) $(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)