From 90ee28878b24fcb081bbe617e821daf918f2cb8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 2 Nov 2022 18:24:30 +0100
Subject: [PATCH] qt6-tools: update to 6.4.0.

---
 srcpkgs/qt6-tools/patches/gumbo.patch     | 15 +++++
 srcpkgs/qt6-tools/patches/qlitehtml.patch | 68 -----------------------
 srcpkgs/qt6-tools/template                |  6 +-
 3 files changed, 18 insertions(+), 71 deletions(-)
 create mode 100644 srcpkgs/qt6-tools/patches/gumbo.patch
 delete mode 100644 srcpkgs/qt6-tools/patches/qlitehtml.patch

diff --git a/srcpkgs/qt6-tools/patches/gumbo.patch b/srcpkgs/qt6-tools/patches/gumbo.patch
new file mode 100644
index 00000000000..42c8e40203c
--- /dev/null
+++ b/srcpkgs/qt6-tools/patches/gumbo.patch
@@ -0,0 +1,15 @@
+--- qttools-everywhere-src-6.4.0/src/assistant/qlitehtml/src/CMakeLists.txt	2022-09-23 13:50:40.000000000 +0200
++++ -	2022-11-03 01:17:21.262108484 +0100
+@@ -30,12 +30,6 @@
+       PROPERTIES
+         QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON
+     )
+-    set_target_properties(
+-      gumbo
+-      PROPERTIES
+-        QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON
+-    )
+-
+     set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}")
+     set(BUILD_SHARED_LIBS ${ORIG_BUILD_SHARED_LIBS})
+     # force optimized litehtml even in debug
diff --git a/srcpkgs/qt6-tools/patches/qlitehtml.patch b/srcpkgs/qt6-tools/patches/qlitehtml.patch
deleted file mode 100644
index 6bec279bca6..00000000000
--- a/srcpkgs/qt6-tools/patches/qlitehtml.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/src/assistant/CMakeLists.txt
-+++ b/src/assistant/CMakeLists.txt
-@@ -34,7 +34,9 @@ if(TARGET qlitehtml)
-     qt_internal_set_exceptions_flags(litehtml OFF)
-     qt_disable_warnings(litehtml)
-     qt_disable_warnings(qlitehtml)
--    qt_disable_warnings(gumbo)
-+    if (TARGET gumbo)
-+        qt_disable_warnings(gumbo)
-+    endif()
-     qt_handle_multi_config_output_dirs(qlitehtml)
-     set_target_properties(qlitehtml PROPERTIES
-         RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
---- a/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
-+++ b/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
-@@ -196,52 +196,6 @@ endif()
- set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
- 
- # Tests
--
--if (BUILD_TESTING)
--    include(FetchContent)
--    FetchContent_Declare(
--      googletest
--      URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
--    )
--    # For Windows: Prevent overriding the parent project's compiler/linker settings
--    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--    FetchContent_GetProperties(googletest)
--    if(NOT googletest_POPULATED)
--      FetchContent_Populate(googletest)
--      add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
--    endif()
--
--    enable_testing()
--
--    set(TEST_NAME ${PROJECT_NAME}_tests)
--
--    add_executable(
--        ${TEST_NAME}
--        ${TEST_LITEHTML}
--        ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
--    )
--
--    set_target_properties(${TEST_NAME} PROPERTIES
--        CXX_STANDARD 11
--        C_STANDARD 99
--        PUBLIC_HEADER "${HEADER_LITEHTML}"
--    )
--
--    target_include_directories(
--        ${TEST_NAME}
--        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/containers
--    )
--
--    target_link_libraries(
--        ${TEST_NAME}
--        ${PROJECT_NAME}
--        gtest_main
--    )
--
--    include(GoogleTest)
--    gtest_discover_tests(${TEST_NAME})
--endif()
--
- #     set(TEST_NAME ${PROJECT_NAME}_tests)
- #     add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
- #     set_target_properties(${TEST_NAME} PROPERTIES
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index a844b67dee9..d17f51c97e6 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.1
+version=6.4.0
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -14,10 +14,10 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+checksum=97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE"
+	configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
 	hostmakedepends+=" qt6-tools-devel"
 fi