[mapnik] update port (microsoft#20824)

* update mapnik * version
Hoikas · Oct 20, 2021 · a79d4a8 · a79d4a8
1 parent 0cdde69
commit a79d4a8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/ports/mapnik/cairo-find-fix.patch b/ports/mapnik/cairo-find-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47bbaa1..43f384d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -296,9 +296,14 @@ if(USE_WEBP)
+ endif()
+
+ if(USE_CAIRO)
+-    mapnik_find_package(Cairo REQUIRED)
++    if(WIN32)
++        mapnik_find_package(Cairo REQUIRED)
++        list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo)
++    else()
++        pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo)
++        list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::Cairo)
++    endif()
+     list(APPEND MAPNIK_COMPILE_DEFS HAVE_CAIRO)
+-    list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo)
+ endif()
+
+ if(USE_PROJ)
diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake
@@ -4,9 +4,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mapnik/mapnik
-    REF 0edb018465790cd156d6849557fa7fd568755ebb
-    SHA512 cd6180b96dbfbc1bafbc8f2a4ff2091a0e8c0c42b0569ef83640ad1f5766ff74ea95f8c6cef53f879396cbceebc6396c1a977676eca67c401b8e145a9ceae7e2
+    REF 4695c42b51bc633e10b15c30ba580093ca0dda4f
+    SHA512 c0e6c77b6c859ac03a2169d8f71ee2d68e6b76dd0295a0656f278f31ccf531b02f2a5bc5cce7e78177872fba2e5dda95dc00685d6157043fa3a246a072ab7075
     HEAD_REF master
+    PATCHES
+        cairo-find-fix.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mapnik",
-  "version-date": "2021-10-13",
+  "version-date": "2021-10-18",
   "description": "Mapnik is an open source toolkit for developing mapping applications.",
   "homepage": "https://github.com/mapnik/mapnik",
   "supports": "!(static & windows)",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4181,7 +4181,7 @@
       "port-version": 0
     },
     "mapnik": {
-      "baseline": "2021-10-13",
+      "baseline": "2021-10-18",
       "port-version": 0
     },
     "marble": {

diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1702be859d2d61c42ba67c3d4e2c474db6a2d874",
+      "version-date": "2021-10-18",
+      "port-version": 0
+    },
     {
       "git-tree": "b7f061c560ab0a4c5c137f88ab43826c05ece6ad",
       "version-date": "2021-10-13",