From 8db31cb5ae02a424ca73c32ee345a168a5453400 Mon Sep 17 00:00:00 2001
From: actions <action@github.com>
Date: Thu, 15 Feb 2024 00:13:30 +0800
Subject: [PATCH] qt6base/qt6tools: update to 6.6.2

---
 qt6base/Makefile                              |  4 +-
 .../patches/002-ignore_vcpkg_toolchain.patch  | 43 -------------------
 qt6tools/Makefile                             |  4 +-
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 qt6base/patches/002-ignore_vcpkg_toolchain.patch

diff --git a/qt6base/Makefile b/qt6base/Makefile
index 8521525..022cec7 100644
--- a/qt6base/Makefile
+++ b/qt6base/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6base
-PKG_VERSION:=6.6.1
+PKG_VERSION:=6.6.2
 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:=eb091c56e8c572d35d3da36f94f9e228892d43aecb559fa4728a19f0e44914c4
+PKG_HASH:=2cbdc4791c5838fddb1ce7ee693b165bb4acf3f81acd6c1bf9e56413b25050df
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qtbase-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-$(PKG_VERSION)
diff --git a/qt6base/patches/002-ignore_vcpkg_toolchain.patch b/qt6base/patches/002-ignore_vcpkg_toolchain.patch
deleted file mode 100644
index 28b19ef..0000000
--- a/qt6base/patches/002-ignore_vcpkg_toolchain.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/cmake/QtAutoDetect.cmake
-+++ b/cmake/QtAutoDetect.cmake
-@@ -163,32 +163,6 @@ function(qt_auto_detect_android)
-     endif()
- endfunction()
- 
--function(qt_auto_detect_vcpkg)
--    if(QT_USE_VCPKG AND DEFINED ENV{VCPKG_ROOT})
--        set(vcpkg_toolchain_file "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
--        get_filename_component(vcpkg_toolchain_file "${vcpkg_toolchain_file}" ABSOLUTE)
--
--        if(DEFINED CMAKE_TOOLCHAIN_FILE)
--            get_filename_component(supplied_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
--            if(NOT supplied_toolchain_file STREQUAL vcpkg_toolchain_file)
--                set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" CACHE STRING "")
--            endif()
--            unset(supplied_toolchain_file)
--        endif()
--        set(CMAKE_TOOLCHAIN_FILE "${vcpkg_toolchain_file}" CACHE STRING "" FORCE)
--        message(STATUS "Using vcpkg from $ENV{VCPKG_ROOT}")
--        if(DEFINED ENV{QT_VCPKG_TARGET_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
--            set(VCPKG_TARGET_TRIPLET "$ENV{QT_VCPKG_TARGET_TRIPLET}" CACHE STRING "")
--            message(STATUS "Using vcpkg triplet ${VCPKG_TARGET_TRIPLET}")
--        endif()
--        unset(vcpkg_toolchain_file)
--        message(STATUS "CMAKE_TOOLCHAIN_FILE is: ${CMAKE_TOOLCHAIN_FILE}")
--        if(DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
--            message(STATUS "VCPKG_CHAINLOAD_TOOLCHAIN_FILE is: ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
--        endif()
--    endif()
--endfunction()
--
- function(qt_auto_detect_ios)
-     if(CMAKE_SYSTEM_NAME STREQUAL iOS)
-         message(STATUS "Using internal CMake ${CMAKE_SYSTEM_NAME} toolchain file.")
-@@ -508,7 +482,6 @@ qt_auto_detect_darwin()
- qt_auto_detect_macos_universal()
- qt_auto_detect_ios()
- qt_auto_detect_android()
--qt_auto_detect_vcpkg()
- qt_auto_detect_pch()
- qt_auto_detect_wasm()
- qt_auto_detect_win32_arm()
diff --git a/qt6tools/Makefile b/qt6tools/Makefile
index b3b8db4..9ffc5d9 100644
--- a/qt6tools/Makefile
+++ b/qt6tools/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6tools
-PKG_VERSION:=6.6.1
+PKG_VERSION:=6.6.2
 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:=6e5816628a2cdcf4147483f7d088870695af7d9770d4e2b68a0765fda5b3e12a
+PKG_HASH:=75075646c05635ade8bf91b64287f8ec90572a9ac559bf3fc744c461e24db0e5
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-$(PKG_VERSION)