From 2c6040c23c69618377877cfa0b0c26660022b4e1 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 24 Oct 2024 04:39:29 +0200
Subject: [PATCH] [geos] Fix msvc 2017 (#41728)

---
 ports/geos/portfile.cmake |  6 ++++++
 ports/geos/usage          | 18 +++++++++++-------
 ports/geos/vcpkg.json     |  1 +
 versions/baseline.json    |  2 +-
 versions/g-/geos.json     |  5 +++++
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake
index 827ee7a76f..7d266271a3 100644
--- a/ports/geos/portfile.cmake
+++ b/ports/geos/portfile.cmake
@@ -3,11 +3,17 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "geos-${VERSION}.tar.bz2"
     SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28
 )
+vcpkg_download_distfile(msvc_2017_patch
+    URLS https://github.com/libgeos/geos/commit/46e9f158073ebf0d4ec8b7dde37c155d097bc0d7.diff?full_index=1
+    SHA512 9fa1ccc4c66e8268c59bcac218015c2b10ee594bece837e6d0fc78fe700233abd1b2df7aa396c00786ffb170fbfbb0ab530f5007ba10376a2366ee3472d8b02a
+    FILENAME geos-${VERSION}-msvc-2017.diff
+)
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
     PATCHES
         fix-exported-config.patch
+        "${msvc_2017_patch}"
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/geos/usage b/ports/geos/usage
index 139e40dd27..ef1fdf99f2 100644
--- a/ports/geos/usage
+++ b/ports/geos/usage
@@ -1,10 +1,14 @@
-The package geos provides CMake targets:
+geos provides CMake targets:
 
-    # C API (provides long-term ABI stability)
-    find_package(GEOS CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE GEOS::geos_c)
+  # C API (provides long-term ABI stability)
+  find_package(GEOS CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE GEOS::geos_c)
 
-    # C++ API (will likely change across versions)
-    find_package(GEOS CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE GEOS::geos)
+  # C++ API (will likely change across versions)
+  find_package(GEOS CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE GEOS::geos)
 
+geos provides pkg-config modules:
+
+  # Geometry Engine, Open Source - C API
+  geos
diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json
index 38a3984556..27dbaf5e65 100644
--- a/ports/geos/vcpkg.json
+++ b/ports/geos/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geos",
   "version": "3.13.0",
+  "port-version": 1,
   "description": "Geometry Engine Open Source",
   "homepage": "https://libgeos.org/",
   "license": "LGPL-2.1-only",
diff --git a/versions/baseline.json b/versions/baseline.json
index c454927e43..6fb60e313c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3046,7 +3046,7 @@
     },
     "geos": {
       "baseline": "3.13.0",
-      "port-version": 0
+      "port-version": 1
     },
     "geotrans": {
       "baseline": "3.9",
diff --git a/versions/g-/geos.json b/versions/g-/geos.json
index 570ff3b1ac..ffa38d2be9 100644
--- a/versions/g-/geos.json
+++ b/versions/g-/geos.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "331bb2a4ee2ca09a1d85f801bf3eb52a0ebb2acf",
+      "version": "3.13.0",
+      "port-version": 1
+    },
     {
       "git-tree": "0d124c642d54c1764b3d750e6e8800c0f830c51a",
       "version": "3.13.0",