update qgis, update vcpkg, run on macos-13

MerginMaps · Feb 15, 2024 · 9fdbb2a · 9fdbb2a
1 parent 9fa35e9
commit 9fdbb2a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 176 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -27,8 +27,8 @@ jobs:
     env: # update README for devs if you modify these env. variables
       QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       TRIPLET: "arm64-ios"
-      DEPLOYMENT_TARGET: '14.0' # iOS Deployment target 
-      XC_VERSION: ${{ '14.2' }}
+      DEPLOYMENT_TARGET: '13.0' # iOS Deployment target 
+      XC_VERSION: ${{ '15.1' }}
       QT_ARCH: "ios"
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
 

diff --git a/VCPKG_BASELINE b/VCPKG_BASELINE
@@ -1 +1 @@
-d765306b074717dea8dc1c4723e1b025acb61c2d
+fba75d09065fcc76a25dcf386b1d00d33f5175af
diff --git a/vcpkg-overlay/ports/qgis-qt6/awss3.patch b/vcpkg-overlay/ports/qgis-qt6/awss3.patch
diff --git a/vcpkg-overlay/ports/qgis-qt6/portfile.cmake b/vcpkg-overlay/ports/qgis-qt6/portfile.cmake
@@ -1,5 +1,5 @@
-set(QGIS_REF final-3_34_0)
-set(QGIS_SHA512 59125ebef3d9047850d839ddc3f1fda18c1d758aeabfe3a3e88570fe2338b545c1c82ff8f455c6e590798a9cf081d607b1659c475ea23395bcb736ce138fbcaa)
+set(QGIS_REF 2a5ada7d8cc286ed9b8f1bc3976bb82db9a754fd) # branch release-3_34, on 15 Feb 2024, including fix qgis#55914
+set(QGIS_SHA512 ecf7967810a719e798c8e759fb6804a63ddebfddb8e18550daa0c2bb813645cedbf011965bfb33799431b977101646adafccc4a550c8291c5a0bdb0e08015b44)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -10,9 +10,6 @@ vcpkg_from_github(
         cmakelists.patch
         crssync.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)

diff --git a/vcpkg-overlay/ports/qgis-qt6/qsharedmemory_android.patch b/vcpkg-overlay/ports/qgis-qt6/qsharedmemory_android.patch
diff --git a/vcpkg-overlay/ports/qgis-qt6/vcpkg.json b/vcpkg-overlay/ports/qgis-qt6/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "qgis-qt6",
-    "version": "3.34.0",
+    "version": "3.34.3",
     "port-version": 0,
     "homepage": "https://qgis.org",
     "description": "QGIS is a free, open source, cross platform (lin/win/mac) geographical information system (GIS)",

diff --git a/vcpkg-overlay/ports/qgis-qt6/wcs_capabilities_qt66.patch b/vcpkg-overlay/ports/qgis-qt6/wcs_capabilities_qt66.patch