From 7f50a167f9b8de49e6ff43a2dcbc7afebc557f50 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Mon, 30 Oct 2023 23:26:00 +0800
Subject: [PATCH] qt6base/qt6tools: update to v6.6.0

---
 qt6base/Makefile                                 |  4 ++--
 qt6base/patches/002-ignore_vcpkg_toolchain.patch | 10 +++++-----
 qt6tools/Makefile                                |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qt6base/Makefile b/qt6base/Makefile
index e7dfa35..fb09b20 100644
--- a/qt6base/Makefile
+++ b/qt6base/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6base
-PKG_VERSION:=6.5.2
+PKG_VERSION:=6.6.0
 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:=221cafd400c0a992a42746b43ea879d23869232e56d9afe72cb191363267c674
+PKG_HASH:=882f39ea3a40a0894cd64e515ce51711a4fab79b8c47bc0fe0279e99493a62cf
 
 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
index fbde361..28b19ef 100644
--- a/qt6base/patches/002-ignore_vcpkg_toolchain.patch
+++ b/qt6base/patches/002-ignore_vcpkg_toolchain.patch
@@ -1,11 +1,11 @@
 --- a/cmake/QtAutoDetect.cmake
 +++ b/cmake/QtAutoDetect.cmake
-@@ -160,32 +160,6 @@ function(qt_auto_detect_android)
+@@ -163,32 +163,6 @@ function(qt_auto_detect_android)
      endif()
  endfunction()
  
 -function(qt_auto_detect_vcpkg)
--    if(DEFINED ENV{VCPKG_ROOT})
+-    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)
 -
@@ -18,8 +18,8 @@
 -        endif()
 -        set(CMAKE_TOOLCHAIN_FILE "${vcpkg_toolchain_file}" CACHE STRING "" FORCE)
 -        message(STATUS "Using vcpkg from $ENV{VCPKG_ROOT}")
--        if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
--            set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
+-        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)
@@ -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.")
-@@ -489,7 +463,6 @@ qt_auto_detect_darwin()
+@@ -508,7 +482,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 d1e34c1..3ba6d07 100644
--- a/qt6tools/Makefile
+++ b/qt6tools/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6tools
-PKG_VERSION:=6.5.2
+PKG_VERSION:=6.6.0
 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:=962a343f090adcf73340f72cb81655b6243f7b4d91a980e0f538c2a111e1aa3a
+PKG_HASH:=b7e3f49543176cea0b48641d115e00f4779b7c366b9fcf70235abe1b50b89112
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-$(PKG_VERSION)