use QGIS 3.34.0 LTR

CMakeLists.txt

@@ -17,7 +17,7 @@ unset_pc(FREEXL)
 
 #######################################
 
-project(MerginMapsInputSdk LANGUAGES CXX)
+project(MerginMapsMobileSdk LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -72,11 +72,11 @@ endif()
 
 #######################################
 
-add_executable(merginmapsinputsdk main.cpp)
+add_executable(merginmapsmobilesdk main.cpp)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
   set_target_properties(
-    merginmapsinputsdk
+    merginmapsmobilesdk
     PROPERTIES MACOSX_BUNDLE TRUE
                XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" # disable signing
                MACOSX_BUNDLE_GUI_IDENTIFIER MerginMaps.SDK
@@ -105,11 +105,11 @@ find_library(
   NO_DEFAULT_PATH
 )
 
-target_include_directories(merginmapsinputsdk PRIVATE ${QGIS_INCLUDE_DIR})
-target_link_libraries(merginmapsinputsdk PRIVATE ${QGIS_LIBRARY})
+target_include_directories(merginmapsmobilesdk PRIVATE ${QGIS_INCLUDE_DIR})
+target_link_libraries(merginmapsmobilesdk PRIVATE ${QGIS_LIBRARY})
 
 # 2/ Qt
-target_link_libraries(merginmapsinputsdk PRIVATE
+target_link_libraries(merginmapsmobilesdk PRIVATE
     Qt6::Qml
     Qt6::Xml
     Qt6::Concurrent
@@ -126,15 +126,15 @@ target_link_libraries(merginmapsinputsdk PRIVATE
 )
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
   find_package(Qt6 COMPONENTS PrintSupport)
-  target_link_libraries(merginmapsinputsdk PRIVATE
+  target_link_libraries(merginmapsmobilesdk PRIVATE
     Qt6::PrintSupport
   )
 endif()
 
 # 3/ next libs 
-target_link_libraries(merginmapsinputsdk PRIVATE Geodiff::Geodiff)
-target_link_libraries(merginmapsinputsdk PRIVATE PROJ::proj)
-target_link_libraries(merginmapsinputsdk PRIVATE ZXing::Core ZXing::ZXing)
+target_link_libraries(merginmapsmobilesdk PRIVATE Geodiff::Geodiff)
+target_link_libraries(merginmapsmobilesdk PRIVATE PROJ::proj)
+target_link_libraries(merginmapsmobilesdk PRIVATE ZXing::Core ZXing::ZXing)
 
 # 4/ QGIS providers
 set(QGIS_PROVIDERS_LIST
@@ -163,35 +163,35 @@ foreach (provider ${QGIS_PROVIDERS_LIST})
     PATH_SUFFIXES qgis
     NO_DEFAULT_PATH
   )
-  target_link_libraries(merginmapsinputsdk PRIVATE ${QGIS_${provider}_LIBRARY}
+  target_link_libraries(merginmapsmobilesdk PRIVATE ${QGIS_${provider}_LIBRARY}
   )
 endforeach ()
 
 # fix cycling dependencies between qgis_core and providers
-target_link_libraries(merginmapsinputsdk PRIVATE ${QGIS_LIBRARY})
+target_link_libraries(merginmapsmobilesdk PRIVATE ${QGIS_LIBRARY})
 
 # 5/ GDAL
-target_link_libraries(merginmapsinputsdk PRIVATE GDAL::GDAL)
+target_link_libraries(merginmapsmobilesdk PRIVATE GDAL::GDAL)
 
 # 6/ rest
-target_link_libraries(merginmapsinputsdk PRIVATE PostgreSQL::PostgreSQL)
-target_link_libraries(merginmapsinputsdk PRIVATE Qt6Keychain::Qt6Keychain)
-target_link_libraries(merginmapsinputsdk PRIVATE qca) 
+target_link_libraries(merginmapsmobilesdk PRIVATE PostgreSQL::PostgreSQL)
+target_link_libraries(merginmapsmobilesdk PRIVATE Qt6Keychain::Qt6Keychain)
+target_link_libraries(merginmapsmobilesdk PRIVATE qca) 
 
 if(APPLE)
-    target_link_libraries(merginmapsinputsdk PRIVATE ${LIBTASN1_LIBRARY})
+    target_link_libraries(merginmapsmobilesdk PRIVATE ${LIBTASN1_LIBRARY})
 endif()
 
-target_link_libraries(merginmapsinputsdk PRIVATE GEOS::geos_c)
-target_link_libraries(merginmapsinputsdk PRIVATE libzip::zip)
-target_link_libraries(merginmapsinputsdk PRIVATE protobuf::libprotobuf-lite)
-target_link_libraries(merginmapsinputsdk PRIVATE exiv2lib exiv2-xmp)
-target_link_libraries(merginmapsinputsdk PRIVATE CURL::libcurl)
-target_link_libraries(merginmapsinputsdk PRIVATE expat::expat)
-target_link_libraries(merginmapsinputsdk PRIVATE WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder)
-target_link_libraries(merginmapsinputsdk PRIVATE ${FREEXL_LIBRARY})
-target_link_libraries(merginmapsinputsdk PRIVATE ${ZLIB_LIBRARY})
-target_link_libraries(merginmapsinputsdk PRIVATE ${SPATIALINDEX_LIBRARY})
-target_link_libraries(merginmapsinputsdk PRIVATE ${SPATIALITE_LIBRARY})
-target_link_libraries(merginmapsinputsdk PRIVATE Iconv::Iconv)
-target_link_libraries(merginmapsinputsdk PRIVATE unofficial::sqlite3::sqlite3)
+target_link_libraries(merginmapsmobilesdk PRIVATE GEOS::geos_c)
+target_link_libraries(merginmapsmobilesdk PRIVATE libzip::zip)
+target_link_libraries(merginmapsmobilesdk PRIVATE protobuf::libprotobuf-lite)
+target_link_libraries(merginmapsmobilesdk PRIVATE exiv2lib exiv2-xmp)
+target_link_libraries(merginmapsmobilesdk PRIVATE CURL::libcurl)
+target_link_libraries(merginmapsmobilesdk PRIVATE expat::expat)
+target_link_libraries(merginmapsmobilesdk PRIVATE WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder)
+target_link_libraries(merginmapsmobilesdk PRIVATE ${FREEXL_LIBRARY})
+target_link_libraries(merginmapsmobilesdk PRIVATE ${ZLIB_LIBRARY})
+target_link_libraries(merginmapsmobilesdk PRIVATE ${SPATIALINDEX_LIBRARY})
+target_link_libraries(merginmapsmobilesdk PRIVATE ${SPATIALITE_LIBRARY})
+target_link_libraries(merginmapsmobilesdk PRIVATE Iconv::Iconv)
+target_link_libraries(merginmapsmobilesdk PRIVATE unofficial::sqlite3::sqlite3)

main.cpp

@@ -66,7 +66,7 @@ int test_qgis()
 }
 
 int main(int argc, char** argv){
-	std::cout << "Test Input-SDK" << std::endl;
+	std::cout << "Mergin Maps Mobile-SDK" << std::endl;
     int res = 0;
 
     res += test_sqlite3();

vcpkg-overlay/ports/qgis-qt6/awss3.patch

@@ -0,0 +1,11 @@
+--- a/src/auth/awss3/core/qgsauthawss3method.cpp
++++ b/src/auth/awss3/core/qgsauthawss3method.cpp
+@@ -118,7 +118,7 @@ bool QgsAuthAwsS3Method::updateNetworkRequest( QNetwor
+   const QByteArray signingKey = QMessageAuthenticationCode::hash( "aws4_request",
+                                 QMessageAuthenticationCode::hash( "s3",
+                                     QMessageAuthenticationCode::hash( region,
+-                                        QMessageAuthenticationCode::hash( date, "AWS4" + password,
++                                        QMessageAuthenticationCode::hash( date, QByteArray( "AWS4" + password ),
+                                             QCryptographicHash::Sha256 ),
+                                         QCryptographicHash::Sha256 ),
+                                     QCryptographicHash::Sha256 ),

vcpkg-overlay/ports/qgis-qt6/cmakelists.patch

@@ -0,0 +1,41 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -364,6 +364,7 @@ if(WITH_CORE)
+   message(STATUS "Found Geos: ${GEOS_VERSION} ${GEOS_DIR}")
+   find_package(GDAL REQUIRED)
+   message(STATUS "Found GDAL: ${GDAL_VERSION} ${GDAL_DIR}")
++  set(GDAL_LIBRARY ${GDAL_LIBRARIES})
+   find_package(EXPAT REQUIRED)
+   find_package(Spatialindex REQUIRED)
+   find_package(LibZip REQUIRED)
+@@ -386,7 +387,8 @@ if(WITH_CORE)
+   find_package(ZLIB REQUIRED)       # for decompression of vector tiles in MBTiles file
+   message(STATUS "Found zlib: ${ZLIB_LIBRARIES}")
+
+-  find_package(EXIV2 REQUIRED)
++  find_package(exiv2 REQUIRED)
++  set(EXIV2_LIBRARY exiv2lib)
+
+   # optional
+   if (WITH_POSTGRESQL)
+@@ -540,7 +542,11 @@ if(WITH_CORE)
+   endif()
+
+   # Password helper
+-  find_package(QtKeychain REQUIRED)
++  find_package(Qt6Keychain REQUIRED)
++  set(QTKEYCHAIN_INCLUDE_DIR ${QTKEYCHAIN_INCLUDE_DIRS}/qt6keychain)
++  set(QTKEYCHAIN_LIBRARY ${QTKEYCHAIN_LIBRARIES})
++  set(QTKEYCHAIN_FOUND ${Qt6Keychain_FOUND})  
++
+   # Master password hash and authentication encryption
+   find_package(QCA REQUIRED)
+   # Check for runtime dependency of qca-ossl plugin
+@@ -755,6 +761,7 @@ endif()
+   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+   # disable macros that offend std::numeric_limits<T>::min()/max()
+   add_definitions(-DNOMINMAX)
++  add_definitions(/bigobj)
+ endif()
+
+ # Prevent build when Qt api deprecated before this Qt version is used:

vcpkg-overlay/ports/qgis-qt6/crssync.patch

@@ -1,17 +1,6 @@
-From ee182628c01881cc3f39e86e4b00cfc41127bd19 Mon Sep 17 00:00:00 2001
-From: Matthias Kuhn <matthias@opengis.ch>
-Date: Mon, 18 Oct 2021 12:07:06 +0200
-Subject: [PATCH] No crssync on Android
-
----
- src/CMakeLists.txt | 4 +-
- 1 file changed, 3 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f7f32a998f..6338b1e539 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -16,7 +16,9 @@ endif()
+@@ -16,7 +16,9 @@ add_subdirectory(crssync)
 
  add_subdirectory(providers)
 
@@ -22,6 +11,3 @@ index f7f32a998f..6338b1e539 100644
 
  if (WITH_CRASH_HANDLER)
    add_subdirectory(crashhandler)
--- 
-2.31.1
-

vcpkg-overlay/ports/qgis-qt6/libxml2.patch

@@ -1,17 +1,6 @@
-From 5436aa8f61c232e38c579340ecffe601c49555dc Mon Sep 17 00:00:00 2001
-From: Matthias Kuhn <matthias@opengis.ch>
-Date: Wed, 28 Jul 2021 17:27:28 +0200
-Subject: [PATCH] Fix dependency libxml2
-
----
- src/providers/mdal/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/providers/mdal/CMakeLists.txt b/src/providers/mdal/CMakeLists.txt
-index e507a0f4cb..56edb89210 100644
 --- a/src/providers/mdal/CMakeLists.txt
 +++ b/src/providers/mdal/CMakeLists.txt
-@@ -16,7 +16,7 @@ if(MSVC)
+@@ -16,7 +16,7 @@ find_package(LibXml2)
  endif()
  find_package(HDF5)
  find_package(NetCDF)
@@ -20,6 +9,3 @@ index e507a0f4cb..56edb89210 100644
 
  ########################################################
  # Compile internal MDAL
--- 
-2.31.1
-

vcpkg-overlay/ports/qgis-qt6/portfile.cmake

@@ -1,18 +1,18 @@
-set(QGIS_REF 2d4258a35f1a2d99b29e321ae63c85440c685029)
-set(QGIS_SHA512 16483398afde3ebfe5cf316537c9122570648bc70ba4e2ee657b015e7ec357e50e156fd2e327773a73bfdb6cd0f736dcf4015e338517d50f96e9eb4e38a9ff92)
+set(QGIS_REF final-3_34_0)
+set(QGIS_SHA512 59125ebef3d9047850d839ddc3f1fda18c1d758aeabfe3a3e88570fe2338b545c1c82ff8f455c6e590798a9cf081d607b1659c475ea23395bcb736ce138fbcaa)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qgis/QGIS
     REF ${QGIS_REF}
     SHA512 ${QGIS_SHA512}
     PATCHES
-        gdal.patch
-        keychain.patch
-        libxml2.patch
-        exiv2.patch
+        cmakelists.patch
         crssync.patch
-        bigobj.patch
+        libxml2.patch
+        awss3.patch # already fixed on QGIS 3.35.0 master
+        wcs_capabilities_qt66.patch # already fixed on QGIS 3.35.0 master
+        qsharedmemory_android.patch # already fixed on QGIS 3.35.0 master
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/FindQtKeychain.cmake)
@@ -49,6 +49,7 @@ list(APPEND QGIS_OPTIONS -DWITH_QGIS_PROCESS:BOOL=OFF)
 list(APPEND QGIS_OPTIONS -DWITH_PDAL:BOOL=OFF)
 list(APPEND QGIS_OPTIONS -DWITH_EPT:BOOL=OFF)
 list(APPEND QGIS_OPTIONS -DWITH_3D:BOOL=OFF)
+list(APPEND QGIS_OPTIONS -DWITH_DRACO:BOOL=OFF)
 list(APPEND QGIS_OPTIONS -DWITH_COPC=OFF)
 list(APPEND QGIS_OPTIONS -DWITH_ANALYSIS=OFF)
 list(APPEND QGIS_OPTIONS -DWITH_GRASS=OFF)