[geos] Update to 3.13.1 (#46308)

ports/geos/fix-exported-config.patch

@@ -2,19 +2,23 @@ diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
 index a8c034fb2..a5cd14c13 100644
 --- a/tools/CMakeLists.txt
 +++ b/tools/CMakeLists.txt
-@@ -61,11 +61,18 @@ function(configure_install_geos_pc)
+@@ -61,11 +61,22 @@ function(configure_install_geos_pc)
      set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}")
    endif()
    set(VERSION ${GEOS_VERSION})
 -  set(EXTRA_LIBS "-lstdc++")
-+  if(APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^c\\+\\+")
-+    set(EXTRA_LIBS "-lc++")
-+  elseif(UNIX OR MINGW)
-+    set(EXTRA_LIBS "-lstdc++")
-+  else()
-+    set(EXTRA_LIBS "")
-+  endif()
++  set(EXTRA_LIBS "")
++  foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
++    if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
++      continue()
++    elseif(EXISTS "${lib}")
++      list(APPEND EXTRA_LIBS "${lib}")
++    else()
++      list(APPEND EXTRA_LIBS "-l${lib}")
++    endif()
++  endforeach()
    if(HAVE_LIBM)
++    list(REMOVE_ITEM EXTRA_LIBS "-lm")
      list(APPEND EXTRA_LIBS "-lm")
    endif()
    list(JOIN EXTRA_LIBS " " EXTRA_LIBS)
@@ -22,7 +26,7 @@ index a8c034fb2..a5cd14c13 100644
  
    configure_file(
      ${CMAKE_CURRENT_SOURCE_DIR}/geos.pc.in
-@@ -77,9 +84,9 @@ function(configure_install_geos_pc)
+@@ -77,9 +88,9 @@ function(configure_install_geos_pc)
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
  endfunction()
  

ports/geos/portfile.cmake

@@ -1,19 +1,13 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
     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
+    SHA512 38a6d8bb05b374160c6e5eb82e5f601915ee44e75bdba0414bb7b1096a62f3cdfbb877389998bd3ff4c77c98927ce95a8d8298dd599a0fcb8ea0e83f174f1744
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
     PATCHES
         fix-exported-config.patch
-        "${msvc_2017_patch}"
 )
 
 vcpkg_cmake_configure(

ports/geos/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "geos",
-  "version": "3.13.0",
-  "port-version": 1,
+  "version": "3.13.1",
   "description": "Geometry Engine Open Source",
   "homepage": "https://libgeos.org/",
   "license": "LGPL-2.1-only",

versions/baseline.json

@@ -3181,8 +3181,8 @@
       "port-version": 0
     },
     "geos": {
-      "baseline": "3.13.0",
-      "port-version": 1
+      "baseline": "3.13.1",
+      "port-version": 0
     },
     "geotrans": {
       "baseline": "3.9",

versions/g-/geos.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8785de3a774e793fb7eafb7aa7163d3442a3bcbc",
+      "version": "3.13.1",
+      "port-version": 0
+    },
     {
       "git-tree": "331bb2a4ee2ca09a1d85f801bf3eb52a0ebb2acf",
       "version": "3.13.0",