WIP: Qt 6.10.2 upgrade

VCPKG_BASELINE

@@ -1 +1 @@
-d6995a0cf3cafda5e9e52749fad075dd62bfd90c
+13bf92b7216b42ffc7d8cf55b6181e486039accd

app/bluetoothdiscoverymodel.cpp

@@ -108,7 +108,7 @@ void BluetoothDiscoveryModel::setDiscovering( bool discovering )
   if ( discovering )
   {
     mDiscoveryAgent->start();
-    CoreUtils::log( QStringLiteral( "Bluetooth discovery" ), QStringLiteral( "Started discovering devices, method %1" ).arg( mDiscoveryAgent->supportedDiscoveryMethods() ) );
+    CoreUtils::log( QStringLiteral( "Bluetooth discovery" ), QStringLiteral( "Started discovering devices, method %1" ).arg( static_cast<int>( mDiscoveryAgent->supportedDiscoveryMethods() ) ) );
   }
   else
   {

vcpkg.json

@@ -114,7 +114,7 @@
           "default-features": false
         }
     ],
-    "builtin-baseline": "d6995a0cf3cafda5e9e52749fad075dd62bfd90c",
+    "builtin-baseline": "13bf92b7216b42ffc7d8cf55b6181e486039accd",
     "overrides": [
         {
             "name": "openssl",

vcpkg/ports/geodiff/portfile.cmake

@@ -32,6 +32,7 @@ vcpkg_configure_cmake(
   -DENABLE_TESTS=OFF
   -DBUILD_TOOLS=OFF
   -DWITH_POSTGRESQL=OFF
+  -DCMAKE_CXX_FLAGS=-Wno-error=deprecated-literal-operator
   ${GEODIFF_LINK_OPTIONS}
 )
 

vcpkg/ports/geodiff/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "geodiff",
-  "version": "2.0.2",
+  "version": "2.2.0",
   "port-version": 2,
   "description": "Library for handling diffs for geospatial data",
   "homepage": "https://github.com/MerginMaps/geodiff",

vcpkg/ports/libiconv/0002-Config-for-MSVC.patch

@@ -0,0 +1,14 @@
+diff --git a/srclib/fcntl.c b/srclib/fcntl.c
+index f9753c4..02fc8be 100644
+--- a/srclib/fcntl.c
++++ b/srclib/fcntl.c
+@@ -37,6 +37,9 @@
+ /* Get declarations of the native Windows API functions.  */
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
++#define HANDLE_FLAG_INHERIT 0
++#endif
+
+ /* Get _get_osfhandle.  */
+ # if GNULIB_MSVC_NOTHROW

vcpkg/ports/libiconv/0003-Add-export.patch

@@ -0,0 +1,12 @@
+diff -uNr libiconv-1.16/libcharset/include/libcharset.h.in libiconv-1.16-work/libcharset/include/libcharset.h.in
+--- libiconv-1.16/libcharset/include/libcharset.h.in	2018-09-17 19:07:42.000000000 +0300
++++ libiconv-1.16-work/libcharset/include/libcharset.h.in	2019-12-04 17:15:50.000000000 +0300
+@@ -33,7 +33,7 @@
+    by the corresponding pathname with the current prefix instead.  Both
+    prefixes should be directory names without trailing slash (i.e. use ""
+    instead of "/").  */
+-extern void libcharset_set_relocation_prefix (const char *orig_prefix,
++extern void LIBCHARSET_DLL_EXPORTED libcharset_set_relocation_prefix (const char *orig_prefix,
+                                               const char *curr_prefix);
+
+

vcpkg/ports/libiconv/0004-ModuleFileName.patch

@@ -0,0 +1,13 @@
+diff --git a/srclib/relocatable.c b/srclib/relocatable.c
+index 365c085..4e08fdc 100644
+--- a/srclib/relocatable.c
++++ b/srclib/relocatable.c
+@@ -338,7 +338,7 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
+       /* The DLL is being loaded into an application's address range.  */
+       static char location[MAX_PATH];
+
+-      if (!GetModuleFileName (module_handle, location, sizeof (location)))
++      if (!GetModuleFileNameA (module_handle, location, sizeof (location)))
+         /* Shouldn't happen.  */
+         return FALSE;
+

vcpkg/ports/libiconv/0005-ios-cross-compile.patch

@@ -0,0 +1,13 @@
+--- a/configure
++++ b/configure
+@@ -5506,5 +5506,10 @@ ac_clean_files="$ac_clean_files conftest.out"
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+ printf %s "checking whether we are cross compiling... " >&6; }
++# On Apple Silicon, arm64-ios binaries are executable on the host macOS, causing
++# this detection to hang. Force cross_compiling=yes for iOS targets.
++case "$host" in
++  *-*-ios*) cross_compiling=yes ;;
++esac
+ if test "$cross_compiling" != yes; then

vcpkg/ports/libiconv/portfile.cmake

@@ -0,0 +1,74 @@
+if(NOT DEFINED X_VCPKG_BUILD_GNU_LIBICONV)
+    set(X_VCPKG_BUILD_GNU_LIBICONV 0)
+    if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_BSD)
+        set(X_VCPKG_BUILD_GNU_LIBICONV 1)
+    elseif(VCPKG_TARGET_IS_ANDROID)
+        vcpkg_cmake_get_vars(cmake_vars_file)
+        include("${cmake_vars_file}")
+        if(VCPKG_DETECTED_CMAKE_SYSTEM_VERSION VERSION_LESS "28")
+            set(X_VCPKG_BUILD_GNU_LIBICONV 1)
+        endif()
+    endif()
+endif()
+
+if(NOT X_VCPKG_BUILD_GNU_LIBICONV)
+    message(STATUS "Not building GNU libiconv.")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv")
+    file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv")
+    return()
+endif()
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${VERSION}.tar.gz"
+         "https://ftp.gnu.org/gnu/libiconv/libiconv-${VERSION}.tar.gz"
+         "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${VERSION}.tar.gz"
+    FILENAME "libiconv-${VERSION}.tar.gz"
+    SHA512 a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a
+)
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "v${VERSION}"
+    PATCHES
+        0002-Config-for-MSVC.patch
+        0003-Add-export.patch
+        0004-ModuleFileName.patch
+        0005-ios-cross-compile.patch
+)
+
+vcpkg_list(SET OPTIONS)
+if (NOT VCPKG_TARGET_IS_ANDROID)
+    vcpkg_list(APPEND OPTIONS --enable-relocatable)
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DETERMINE_BUILD_TRIPLET
+    USE_WRAPPERS
+    OPTIONS
+        --enable-extra-encodings
+        --without-libiconv-prefix
+        --without-libintl-prefix
+        ${OPTIONS}
+)
+vcpkg_install_make()
+
+vcpkg_copy_pdbs()
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin")
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv")
+
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files
+
+# Please keep, the default usage is broken
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LIB" "${SOURCE_PATH}/COPYING" COMMENT "
+The libiconv and libcharset libraries and their header files are under LGPL,
+see COPYING.LIB below.
+
+The iconv program and the documentation are under GPL, see COPYING below.")

vcpkg/ports/libiconv/usage

@@ -0,0 +1,4 @@
+libiconv provides CMake targets:
+
+  find_package(Iconv REQUIRED)
+  target_link_libraries(main PRIVATE Iconv::Iconv)

vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake

@@ -0,0 +1,21 @@
+include(SelectLibraryConfigurations)
+
+_find_package(${ARGS})
+if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
+    find_path(CHARSET_INCLUDE_DIR NAMES "libcharset.h" HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+    find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug")
+    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+    select_library_configurations(CHARSET)
+    if(NOT TARGET Iconv::Charset)
+        add_library(Iconv::Charset INTERFACE IMPORTED)
+        set_target_properties(Iconv::Charset PROPERTIES
+          INTERFACE_LINK_LIBRARIES "\$<\$<NOT:\$<CONFIG:DEBUG>>:${CHARSET_LIBRARY_RELEASE}>;\$<\$<CONFIG:DEBUG>:${CHARSET_LIBRARY_DEBUG}>"
+          INTERFACE_INCLUDE_DIRECTORIES "${CHARSET_INCLUDE_DIRS}")
+    endif()
+    if(CHARSET_LIBRARIES)
+        list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})
+        if(TARGET Iconv::Iconv)
+            set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Charset)
+        endif()
+    endif()
+endif()

vcpkg/ports/libiconv/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "libiconv",
+  "version": "1.18",
+  "port-version": 3,
+  "description": [
+    "iconv() text conversion.",
+    "This port installs GNU libiconv if the system C runtime doesn't provide a suitable iconv() implementation."
+  ],
+  "homepage": "https://www.gnu.org/software/libiconv/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true,
+      "platform": "android"
+    }
+  ]
+}

vcpkg/ports/libspatialindex/portfile.cmake

@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libspatialindex/libspatialindex
+    REF "${VERSION}"
+    SHA512 a508a9ed4019641bdaaa53533505531f3db440b046a9c7d9f78ed480293200c51796c2d826a6bb9b4f9543d60bb0fef9e4c885ec3f09326cfa4d2fb81c1593aa
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    WINDOWS_USE_MSBUILD
+    OPTIONS
+        -DCMAKE_DEBUG_POSTFIX=d
+        -DSIDX_BUILD_TESTS:BOOL=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})  
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+#Debug
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

vcpkg/ports/libspatialindex/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "libspatialindex",
+  "version": "2.0.0",
+  "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.",
+  "homepage": "http://libspatialindex.github.com",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}

vcpkg/ports/qgis/fix-ogr-typedef.patch

@@ -0,0 +1,13 @@
+diff --git a/src/core/proj/qgscoordinatereferencesystem.h b/src/core/proj/qgscoordinatereferencesystem.h
+index 1234567..abcdefg 100644
+--- a/src/core/proj/qgscoordinatereferencesystem.h
++++ b/src/core/proj/qgscoordinatereferencesystem.h
+@@ -60,7 +60,7 @@
+ // forward declaration for sqlite3
+ typedef struct sqlite3 sqlite3 SIP_SKIP;
+
+-#ifdef DEBUG
++#if defined(DEBUG) || defined(GDAL_DEBUG)
+ typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH SIP_SKIP;
+ #else
+ typedef void *OGRSpatialReferenceH SIP_SKIP;

vcpkg/ports/qgis/fix-qt-6-10.patch

@@ -0,0 +1,12 @@
+diff --git a/src/core/tiledscene/qgsgltfutils.cpp b/src/core/tiledscene/qgsgltfutils.cpp
+index 2e2197a427f..618d89c22ae 100644
+--- a/src/core/tiledscene/qgsgltfutils.cpp
++++ b/src/core/tiledscene/qgsgltfutils.cpp
+@@ -23,6 +23,7 @@
+
+ #include <QImage>
+ #include <QMatrix4x4>
++#include <QQuaternion>
+ #include <QRegularExpression>
+
+ #define TINYGLTF_IMPLEMENTATION       // should be defined just in one CPP file

vcpkg/ports/qgis/portfile.cmake

@@ -18,6 +18,10 @@ vcpkg_from_github(
   libxml2.patch
   qgis4-project-properties.patch
   qgis4_url_encoding.patch
+  fix-qt-6-10.patch
+  snapping-casting.patch
+  protobuf-qbytearray-ambiguity.patch
+  fix-ogr-typedef.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/FindQtKeychain.cmake)

vcpkg/ports/qgis/protobuf-qbytearray-ambiguity.patch

@@ -0,0 +1,19 @@
+diff --git a/src/core/vectortile/qgsvectortilemvtencoder.cpp b/src/core/vectortile/qgsvectortilemvtencoder.cpp
+index 1234567..abcdefg 100644
+--- a/src/core/vectortile/qgsvectortilemvtencoder.cpp
++++ b/src/core/vectortile/qgsvectortilemvtencoder.cpp
+@@ -203,12 +203,12 @@ void QgsVectorTileMVTEncoder::addLayer( QgsVectorLayer *layer, QgsFeedback *feed
+
+   vector_tile::Tile_Layer *tileLayer = tile.add_layers();
+-  tileLayer->set_name( layerName.toUtf8() );
++  tileLayer->set_name( layerName.toUtf8().toStdString() );
+   tileLayer->set_version( 2 );  // 2 means MVT spec version 2.1
+   tileLayer->set_extent( static_cast<::google::protobuf::uint32>( mResolution ) );
+
+   const QgsFields fields = layer->fields();
+   for ( int i = 0; i < fields.count(); ++i )
+   {
+-    tileLayer->add_keys( fields[i].name().toUtf8() );
++    tileLayer->add_keys( fields[i].name().toUtf8().toStdString() );
+   }
+

vcpkg/ports/qgis/snapping-casting.patch

@@ -0,0 +1,13 @@
+diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
+index 8f2f33a05dd..5530773eac3 100644
+--- a/src/core/qgssnappingutils.cpp
++++ b/src/core/qgssnappingutils.cpp
+@@ -646,7 +646,7 @@ QString QgsSnappingUtils::dump()
+     msg += QString( "layer : %1\n"
+                     "config: %2   tolerance %3 %4\n" )
+            .arg( layer.layer->name() )
+-           .arg( layer.type ).arg( layer.tolerance ).arg( static_cast<int>( layer.unit ) );
++           .arg( static_cast<int>( layer.type ) ).arg( layer.tolerance ).arg( static_cast<int>( layer.unit ) );
+
+     if ( mStrategy == IndexAlwaysFull || mStrategy == IndexHybrid || mStrategy == IndexExtent )
+     {