Revert "qt6base: Update to 6.2.9 lts version"

This reverts commit 70369e4. Signed-off-by: Tianling Shen <[email protected]> (cherry picked from commit 7518100)
immortalwrt · Sep 20, 2024 · 5d93d58 · 5d93d58
1 parent d8298c6
commit 5d93d58
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/libs/qt6base/Makefile b/libs/qt6base/Makefile
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6base
-PKG_BASE:=6.2
-PKG_BUGFIX:=9
+PKG_BASE:=6.5
+PKG_BUGFIX:=3
 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
 PKG_RELEASE:=1
 
-PKG_SOURCE:=qtbase-everywhere-opensource-src-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://download.qt-project.org/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \
-		https://mirrors.tencent.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \
-		https://mirrors.aliyun.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/
-PKG_HASH:=494154ebbb00d26ef556b4389466354aa2fa5a0e145841fd915b5f3005fe719c
+PKG_SOURCE:=qtbase-everywhere-src-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://mirrors.tencent.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \
+		  https://mirrors.aliyun.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \
+		  http://download.qt-project.org/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/
+PKG_HASH:=df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qtbase-everywhere-src-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-everywhere-src-$(PKG_VERSION)

diff --git a/libs/qt6base/patches/010-marco.patch b/libs/qt6base/patches/010-marco.patch
@@ -0,0 +1,12 @@
+--- a/src/corelib/plugin/qelfparser_p.cpp
++++ b/src/corelib/plugin/qelfparser_p.cpp
+@@ -382,7 +382,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
+     case EM_ALPHA:      d << ", Alpha"; break;
+     case EM_68K:        d << ", MC68000"; break;
+     case EM_ARM:        d << ", ARM"; break;
++#ifdef EM_AARCH64
+     case EM_AARCH64:    d << ", AArch64"; break;
++#endif
+ #ifdef EM_BLACKFIN
+     case EM_BLACKFIN:   d << ", Blackfin"; break;
+ #endif