From 1bba69b108ebb75802f7a823581cca3757ffbcf6 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Fri, 18 Mar 2022 22:56:06 +0100
Subject: [PATCH 1/5] [CI] update vcpkg to latest hash

notable changes: * proj => v9
[CI] fix sqlite dep

[vcpkg] update hash

update vcpkg cache
---
 .github/workflows/build_test.yml | 12 ++++++------
 .github/workflows/macos.yml      |  4 ++--
 .github/workflows/ubuntu.yml     |  4 ++--
 .github/workflows/windows.yml    |  2 +-
 CMakePresets.json                |  6 +++---
 vcpkg.json                       |  9 +++++++--
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index f4e5685a4..5ad346ff0 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -13,7 +13,7 @@ jobs:
     name: Windows memory mapped
     uses: mapnik/mapnik/.github/workflows/windows.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -24,7 +24,7 @@ jobs:
     name: Windows file based
     uses: mapnik/mapnik/.github/workflows/windows.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -35,7 +35,7 @@ jobs:
     name: Linux memory mapped
     uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -46,7 +46,7 @@ jobs:
     name: Linux file based
     uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -57,7 +57,7 @@ jobs:
     name: MacOS memory mapped
     uses: mapnik/mapnik/.github/workflows/macos.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -68,7 +68,7 @@ jobs:
     name: MacOS file based
     uses: mapnik/mapnik/.github/workflows/macos.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a9dbd5fb1..a2a3d959f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -101,7 +101,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
         run: ./mapnik-test-visual -j $(sysctl -n hw.logicalcpu) --output-dir ./visual-test-result
 
       - name: Pack visual test results
@@ -111,7 +111,7 @@ jobs:
       - name: Run Benchmark
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
         run: ./run_benchmarks
 
       - name: Coverage
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 6f17ccdfb..8fb246bf1 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -117,7 +117,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
         run: ./mapnik-test-visual -j $(nproc) --output-dir ./visual-test-result
 
       - name: Pack visual test results
@@ -127,7 +127,7 @@ jobs:
       - name: Run Benchmarks
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
         run: ./run_benchmarks
 
       - name: Coverage
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 20a63565c..44f1ef6bb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -104,7 +104,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj/data
         run: OpenCppCoverage --modules *libmapnik* --modules mapnik*.exe  --modules *.input --sources ${{ github.workspace }} --export_type binary --input_coverage=${{ github.workspace }}/ctest.cov --cover_children -- .\mapnik-test-visual.exe -j (Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors --output-dir ./visual-test-result
 
       - name: Pack visual test results
diff --git a/CMakePresets.json b/CMakePresets.json
index 46720854c..0b21f4631 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -194,7 +194,7 @@
                 "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj4"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj/data"
             }
         },
         {
@@ -209,7 +209,7 @@
                 "CMAKE_CXX_FLAGS": "--coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj4"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj/data"
             }
         },
         {
@@ -225,7 +225,7 @@
                 "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj4"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj/data"
             }
         }
     ],
diff --git a/vcpkg.json b/vcpkg.json
index e3553d412..1bc58e8c3 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -60,9 +60,14 @@
     "mapbox-geometry",
     "mapbox-polylabel",
     "mapbox-variant",
-    "proj4",
+    "proj",
     "protozero",
-    "sqlite3",
+    {
+      "name": "sqlite3",
+      "features": [
+        "rtree"
+      ]
+    },
     "tiff",
     "zlib"
   ]

From 2259f8da6fb9bdf2f5cb44479ccac4e61d251638 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Mon, 11 Apr 2022 15:04:30 +0200
Subject: [PATCH 2/5] use unnamed workflows, move vcpkg into preset update
 vcpkg

---
 .github/workflows/build_test.yml | 24 ++++++++++++------------
 .github/workflows/macos.yml      | 10 +++++-----
 .github/workflows/ubuntu.yml     | 10 +++++-----
 .github/workflows/windows.yml    | 10 +++++-----
 CMakePresets.json                |  3 ++-
 5 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 5ad346ff0..dfaa9be28 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -11,9 +11,9 @@ on:
 jobs:
   windows:
     name: Windows memory mapped
-    uses: mapnik/mapnik/.github/workflows/windows.yml@master
+    uses: ./.github/workflows/windows.yml
     with:
-      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -22,9 +22,9 @@ jobs:
   
   windows-mmf-off:
     name: Windows file based
-    uses: mapnik/mapnik/.github/workflows/windows.yml@master
+    uses: ./.github/workflows/windows.yml
     with:
-      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -33,9 +33,9 @@ jobs:
 
   ubuntu:
     name: Linux memory mapped
-    uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
+    uses: ./.github/workflows/ubuntu.yml
     with:
-      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -44,9 +44,9 @@ jobs:
 
   ubuntu-mmf-off:
     name: Linux file based
-    uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
+    uses: ./.github/workflows/ubuntu.yml
     with:
-      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -55,9 +55,9 @@ jobs:
 
   macos:
     name: MacOS memory mapped
-    uses: mapnik/mapnik/.github/workflows/macos.yml@master
+    uses: ./.github/workflows/macos.yml
     with:
-      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -66,9 +66,9 @@ jobs:
 
   macos-mmf-off:
     name: MacOS file based
-    uses: mapnik/mapnik/.github/workflows/macos.yml@master
+    uses: ./.github/workflows/macos.yml
     with:
-      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a2a3d959f..092d10c45 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -35,12 +35,12 @@ jobs:
           brew install automake ninja lcov
 
       - name: checkout mapnik
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: "recursive"
 
       - name: checkout vcpkg
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: "microsoft/vcpkg"
           ref: ${{ inputs.VCPKG_SHA }}
@@ -89,7 +89,7 @@ jobs:
           setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
 
       - name: Configure CMake
-        run: cmake -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }}
+        run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }}
 
       - name: Build
         run: cmake --build --preset ${{ env.preset }}
@@ -131,7 +131,7 @@ jobs:
         run: cmake --build --preset ${{ env.preset }} --target package
 
       - name: Upload mapnik build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: ${{ env.preset }}-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
@@ -139,7 +139,7 @@ jobs:
           retention-days: 2
 
       - name: Upload visual test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
           path: build/${{ env.preset }}/out/visual-test-results.tar.gz
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 8fb246bf1..7035afda7 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -51,12 +51,12 @@ jobs:
           sudo apt-get install -y gperf libxxf86vm-dev ninja-build postgresql-client lcov
 
       - name: checkout mapnik
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: "recursive"
 
       - name: checkout vcpkg
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: "microsoft/vcpkg"
           ref: ${{ inputs.VCPKG_SHA }}
@@ -105,7 +105,7 @@ jobs:
           setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
 
       - name: Configure CMake
-        run: cmake -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }}
+        run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset=${{ env.preset }}
 
       - name: Build
         run: cmake --build --preset ${{ env.preset }}
@@ -147,7 +147,7 @@ jobs:
         run: cmake --build --preset ${{ env.preset }} --target package
 
       - name: Upload mapnik build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
@@ -155,7 +155,7 @@ jobs:
           retention-days: 2
 
       - name: Upload visual test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
           path: build/${{ env.preset }}/out/visual-test-results.tar.gz
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 44f1ef6bb..2ad229ddf 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -38,12 +38,12 @@ jobs:
       - uses: ilammy/msvc-dev-cmd@v1
 
       - name: checkout mapnik
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: "recursive"
 
       - name: checkout vcpkg
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: "microsoft/vcpkg"
           ref: ${{ inputs.VCPKG_SHA }}
@@ -91,7 +91,7 @@ jobs:
           setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "${{ inputs.NUGET_REGISTRY }}"
 
       - name: Configure CMake
-        run: cmake -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset ${{env.preset}}
+        run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ inputs.USE_MEMORY_MAPPED_FILE }} --preset ${{env.preset}}
 
       - name: Build
         run: cmake --build --preset ${{env.preset}}
@@ -120,7 +120,7 @@ jobs:
         if: failure()
         run: cmake --build --preset ${{env.preset}} --target package
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: ${{ env.preset }}-artifact-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
@@ -128,7 +128,7 @@ jobs:
           retention-days: 2
 
       - name: Upload visual test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.preset }}-visual-tests-mmio-${{ inputs.USE_MEMORY_MAPPED_FILE }}
           path: build/${{ env.preset }}/out/visual-test-results.tar.gz
diff --git a/CMakePresets.json b/CMakePresets.json
index 0b21f4631..61a84d330 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -179,7 +179,8 @@
             "hidden": true,
             "cacheVariables": {
                 "BUILD_TESTING": "ON",
-                "BUILD_DEMO_VIEWER": "OFF"
+                "BUILD_DEMO_VIEWER": "OFF",
+                "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake"
             }
         },
         {

From 75ad499fb55e71d2952025b77258cea32f33cc88 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Tue, 12 Apr 2022 14:21:45 +0200
Subject: [PATCH 3/5] [CI] update vcpkg deps

---
 .github/workflows/build_test.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index dfaa9be28..a85f483f0 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -13,7 +13,7 @@ jobs:
     name: Windows memory mapped
     uses: ./.github/workflows/windows.yml
     with:
-      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
+      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -24,7 +24,7 @@ jobs:
     name: Windows file based
     uses: ./.github/workflows/windows.yml
     with:
-      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
+      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -35,7 +35,7 @@ jobs:
     name: Linux memory mapped
     uses: ./.github/workflows/ubuntu.yml
     with:
-      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
+      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -46,7 +46,7 @@ jobs:
     name: Linux file based
     uses: ./.github/workflows/ubuntu.yml
     with:
-      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
+      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -57,7 +57,7 @@ jobs:
     name: MacOS memory mapped
     uses: ./.github/workflows/macos.yml
     with:
-      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
+      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -68,7 +68,7 @@ jobs:
     name: MacOS file based
     uses: ./.github/workflows/macos.yml
     with:
-      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
+      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'

From ca269f425c93247bfab3f6c374ab6e1fc2ca3665 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Tue, 12 Apr 2022 14:42:19 +0200
Subject: [PATCH 4/5] Revert "[CI] update vcpkg deps"

This reverts commit 75ad499fb55e71d2952025b77258cea32f33cc88.
---
 .github/workflows/build_test.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index a85f483f0..dfaa9be28 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -13,7 +13,7 @@ jobs:
     name: Windows memory mapped
     uses: ./.github/workflows/windows.yml
     with:
-      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -24,7 +24,7 @@ jobs:
     name: Windows file based
     uses: ./.github/workflows/windows.yml
     with:
-      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -35,7 +35,7 @@ jobs:
     name: Linux memory mapped
     uses: ./.github/workflows/ubuntu.yml
     with:
-      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -46,7 +46,7 @@ jobs:
     name: Linux file based
     uses: ./.github/workflows/ubuntu.yml
     with:
-      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -57,7 +57,7 @@ jobs:
     name: MacOS memory mapped
     uses: ./.github/workflows/macos.yml
     with:
-      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -68,7 +68,7 @@ jobs:
     name: MacOS file based
     uses: ./.github/workflows/macos.yml
     with:
-      VCPKG_SHA: 4415a0f31b5a012ca2efba13cc18e16adefd89c0
+      VCPKG_SHA: f6af75acc923c833a5620943e3fc7d5e4930f0df
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'

From a963ae5ea6fda7b47ff27a29d3a17f53475773e7 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Tue, 12 Apr 2022 20:51:52 +0200
Subject: [PATCH 5/5] [CI] trigger