diff --git a/qt6base/Makefile b/qt6base/Makefile index 898ec1b..4006463 100644 --- a/qt6base/Makefile +++ b/qt6base/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6base -PKG_VERSION:=6.4.3 +PKG_VERSION:=6.5.1 PKG_RELEASE:=1 PKG_SOURCE:=qtbase-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/qt/qtbase/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e156692029a5503bad5f681bda856dd9df9dec17baa0ca7ee36b10178503ed40 +PKG_HASH:=fdde60cdc5c899ab7165f1c3f7b93bc727c2484c348f367d155604f5d901bfb6 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qtbase-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-$(PKG_VERSION) @@ -20,6 +20,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-$(PKG_VERSION) PKG_BUILD_DEPENDS:=qt6base/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/qt6base/patches/001-fix_build_for_openwrt.patch b/qt6base/patches/001-fix_build_for_openwrt.patch index 38624f1..a6c03cc 100644 --- a/qt6base/patches/001-fix_build_for_openwrt.patch +++ b/qt6base/patches/001-fix_build_for_openwrt.patch @@ -1,8 +1,8 @@ --- a/src/corelib/plugin/qelfparser_p.cpp +++ b/src/corelib/plugin/qelfparser_p.cpp -@@ -377,7 +377,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade - // list definitely not exhaustive! - case EM_NONE: d << ", no machine"; break; +@@ -387,7 +387,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade + 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; diff --git a/qt6base/patches/002-ignore_vcpkg_toolchain.patch b/qt6base/patches/002-ignore_vcpkg_toolchain.patch index 0bddbd8..fbde361 100644 --- a/qt6base/patches/002-ignore_vcpkg_toolchain.patch +++ b/qt6base/patches/002-ignore_vcpkg_toolchain.patch @@ -1,6 +1,6 @@ --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake -@@ -155,32 +155,6 @@ function(qt_auto_detect_android) +@@ -160,32 +160,6 @@ function(qt_auto_detect_android) endif() endfunction() @@ -33,7 +33,7 @@ function(qt_auto_detect_ios) if(CMAKE_SYSTEM_NAME STREQUAL iOS) message(STATUS "Using internal CMake ${CMAKE_SYSTEM_NAME} toolchain file.") -@@ -484,7 +458,6 @@ qt_auto_detect_darwin() +@@ -489,7 +463,6 @@ qt_auto_detect_darwin() qt_auto_detect_macos_universal() qt_auto_detect_ios() qt_auto_detect_android() diff --git a/qt6tools/Makefile b/qt6tools/Makefile index eec9277..a695021 100644 --- a/qt6tools/Makefile +++ b/qt6tools/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6tools -PKG_VERSION:=6.4.3 +PKG_VERSION:=6.5.1 PKG_RELEASE:=1 PKG_SOURCE:=qttools-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/qt/qttools/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=d0bce31c0780630f6f15a531a07f727a4bf409f9b6af3348c462b5c044b12920 +PKG_HASH:=d86516cb8083ce6088fae9f900490c41cf4e472c51e4334e06e5dbb2e24fe688 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-$(PKG_VERSION) diff --git a/qt6tools/patches/010-no-clang.patch b/qt6tools/patches/010-no-clang.patch index 71f9699..674f25e 100644 --- a/qt6tools/patches/010-no-clang.patch +++ b/qt6tools/patches/010-no-clang.patch @@ -1,6 +1,6 @@ --- a/configure.cmake +++ b/configure.cmake -@@ -14,7 +14,7 @@ +@@ -17,7 +17,7 @@ # Presumably because 6.0 ClangConfig.cmake files are not good enough? # In any case explicitly request a minimum version of 8.x for now, otherwise # building with CMake will fail at compilation time.