diff --git a/qt6base/Makefile b/qt6base/Makefile index 3ab6110..5384054 100644 --- a/qt6base/Makefile +++ b/qt6base/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6base -PKG_VERSION:=6.4.0 +PKG_VERSION:=6.4.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:=fbc462816bf5b87d521e9f69cebe0ce331de2258396e0932fa580283f07fce0c +PKG_HASH:=0ef6db6b3e1074e03dcae7e689144af66fd51b95a6efe949d40281cc43e6fecf HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qtbase-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-$(PKG_VERSION) diff --git a/qt6base/patches/001-fix_build_for_openwrt.patch b/qt6base/patches/001-fix_build_for_openwrt.patch index ecfc9c4..2364a9b 100644 --- a/qt6base/patches/001-fix_build_for_openwrt.patch +++ b/qt6base/patches/001-fix_build_for_openwrt.patch @@ -1,6 +1,6 @@ --- a/src/corelib/plugin/qelfparser_p.cpp +++ b/src/corelib/plugin/qelfparser_p.cpp -@@ -408,7 +408,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade +@@ -372,7 +372,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; case EM_ARM: d << ", ARM"; break; diff --git a/qt6base/patches/002-ignore_vcpkg_toolchain.patch b/qt6base/patches/002-ignore_vcpkg_toolchain.patch index d46997a..0bddbd8 100644 --- a/qt6base/patches/002-ignore_vcpkg_toolchain.patch +++ b/qt6base/patches/002-ignore_vcpkg_toolchain.patch @@ -31,9 +31,9 @@ -endfunction() - function(qt_auto_detect_ios) - if(CMAKE_SYSTEM_NAME STREQUAL iOS - OR CMAKE_SYSTEM_NAME STREQUAL watchOS -@@ -445,7 +419,6 @@ qt_auto_detect_darwin() + if(CMAKE_SYSTEM_NAME STREQUAL iOS) + message(STATUS "Using internal CMake ${CMAKE_SYSTEM_NAME} toolchain file.") +@@ -484,7 +458,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 038d22e..cb4b30b 100644 --- a/qt6tools/Makefile +++ b/qt6tools/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6tools -PKG_VERSION:=6.4.0 +PKG_VERSION:=6.4.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:=b408ed50b0523ee9cc8fab94db2cd73e7ac693605764b12ec251c99563877ff2 +PKG_HASH:=81b705e6fd4bee56f40fe9f4bc1621bbe0dc590cfdc07380e29064a146cdeb34 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-$(PKG_VERSION)