[qt-advanced-docking-system] update and use qt6 (#21998)

* update port

* format-manifest

* version stuff

* version stuff

* fix arm windows

* version stuff

ports/qt-advanced-docking-system/config_changes.patch

@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bd721d..4848c5f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -52,7 +52,7 @@ if (UNIX)
-     set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
-     set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS})
- endif()
--if(BUILD_STATIC)
-+if(NOT BUILD_SHARED_LIBS)
-     add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS})
-     target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
- else()

ports/qt-advanced-docking-system/portfile.cmake

@@ -1,26 +1,40 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO githubuser0xFFFF/Qt-Advanced-Docking-System
-    REF ab4869a0e1c97fec1dfca29eeb84be67af182864 #v3.8.0
-    SHA512 220ec4604eda8a39cd7ba8839cee2ab420e8c5a0b247749afb85a7b4ec3286f6debd53c910637e84023af79319f0600eb48a6c037c3e4877708677fee3c62ce7 
+    REF 2afe62ec77c558c6c81435b479a99c0a188c5113 #v3.8.1
+    SHA512 2580f93901a72adc63151f25983a0414d732cf7e40a9255ca8ff2f6fbcecde886ab43a09a19dca16d19ec76ee8b4ecfd7af8f673012a04c0fc6c577721891715 
     HEAD_REF master
     PATCHES
         hardcode_version.patch
-        config_changes.patch
+        qt.patch
 )
 
+if(VCPKG_CROSSCOMPILING)
+    list(APPEND _qarg_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR})
+    list(APPEND _qarg_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share)
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged
+        list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows)
+    endif()
+endif()
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS 
+        ${_qarg_OPTIONS}
         -DBUILD_EXAMPLES=OFF
-        -DVERSION_SHORT=3.8.0
+        -DVERSION_SHORT=3.8.1
+        -DQT_VERSION_MAJOR=6
+        -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
+        -DBUILD_STATIC=${BUILD_STATIC}
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_Qt5
 )
-
 vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-vcpkg_cmake_config_fixup(PACKAGE_NAME qtadvanceddocking CONFIG_PATH lib/cmake/qtadvanceddocking)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
+file(INSTALL "${SOURCE_PATH}/gnu-lgpl-v2.1.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/license")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_cmake_config_fixup(PACKAGE_NAME "qtadvanceddocking" CONFIG_PATH "lib/cmake/qtadvanceddocking")

ports/qt-advanced-docking-system/qt.patch

@@ -0,0 +1,11 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 653546544..2091bce16 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ cmake_minimum_required(VERSION 3.5)
+ project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+ if (UNIX AND NOT APPLE)
+     include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})

ports/qt-advanced-docking-system/vcpkg.json

@@ -1,17 +1,17 @@
 {
   "name": "qt-advanced-docking-system",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio",
   "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
   "dependencies": [
     "bzip2",
     {
-      "name": "qt5-base",
-      "default-features": false
-    },
-    {
-      "name": "qt5-x11extras",
-      "platform": "!windows"
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui",
+        "widgets"
+      ]
     },
     {
       "name": "vcpkg-cmake",

versions/baseline.json

@@ -5533,7 +5533,7 @@
       "port-version": 0
     },
     "qt-advanced-docking-system": {
-      "baseline": "3.8.0",
+      "baseline": "3.8.1",
       "port-version": 0
     },
     "qt5": {

versions/q-/qt-advanced-docking-system.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "020e75e9decbd9491af382e08d2f8832336b2de6",
+      "version": "3.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "427efb4851b6f81f6301f6418d0e8d04bebbf557",
       "version": "3.8.0",