[geos] update to 3.12.2 (#40168)

ports/geos/portfile.cmake

@@ -1,13 +1,12 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
     FILENAME "geos-${VERSION}.tar.bz2"
-    SHA512 bbca43c1eb9c4001d2e3c29d054b597bfb2c1d4860784246dd20fec21882b54bc2a8a8f0f09b8816aec7a85b621d3d1645adca15318838d2b4f4b5c4c4a58a94
+    SHA512 af9b0eb2475c81407f0c7e2a61667bc4d90e862798b155ee40a59e7fde3d38488ef10f930e9cf309a83e436fb80e26e85e0f1d61b375b98110bbb1062645fb5d
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
     PATCHES
-        win32.patch
         fix-exported-config.patch
 )
 
@@ -51,4 +50,4 @@ endif()
 vcpkg_copy_pdbs()
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

ports/geos/vcpkg.json

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

ports/geos/win32.patch

@@ -1,73 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e758b5d..beda887 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,7 +187,8 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
- target_compile_options(geos_cxx_flags INTERFACE
- 	"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-contract=off>"
- 	"$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>"
--	"$<$<CXX_COMPILER_ID:MSVC>:/fp:precise>"
-+	"$<$<BOOL:${MSVC}>:/fp:precise>"
-+	"$<$<BOOL:${MSVC}>:/wd4996>"
- 	)
- 
- # Use -ffloat-store for 32-bit builds (needed to make some tests pass)
-@@ -227,10 +228,10 @@ target_compile_definitions(geos_cxx_flags
- 
- target_compile_definitions(geos_developer_cxx_flags
-   INTERFACE
--    $<$<CXX_COMPILER_ID:MSVC>:_CRT_NONSTDC_NO_DEPRECATE>
--    $<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_DEPRECATE>
--    $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
--    $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
-+    "$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>"
-+    "$<$<BOOL:${MSVC}>:_SCL_SECURE_NO_DEPRECATE>"
-+    "$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>"
-+    "$<$<BOOL:${WIN32}>:NOMINMAX>")
- 
- target_compile_options(geos_developer_cxx_flags
-   INTERFACE
-@@ -269,7 +270,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries"
- 
- if(BUILD_SHARED_LIBS)
-   target_compile_definitions(geos
--    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
-+    PRIVATE $<$<BOOL:${WIN32}>:GEOS_DLL_EXPORT>)
- 
-   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
-   set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
-@@ -287,7 +288,7 @@ target_link_libraries(geos_c PRIVATE geos)
- 
- if(BUILD_SHARED_LIBS)
-   target_compile_definitions(geos_c
--    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
-+    PRIVATE $<$<BOOL:${WIN32}>:GEOS_DLL_EXPORT>)
- 
-   set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
-   if(NOT WIN32 OR MINGW)
-diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-index 7a647e4..52a29c9 100644
---- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-+++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-@@ -51,7 +51,7 @@ namespace locate { // geos::algorithm::locate
-  * The index is lazy-loaded, which allows creating instances even if they are not used.
-  *
-  */
--class IndexedPointInAreaLocator : public PointOnGeometryLocator {
-+class GEOS_DLL IndexedPointInAreaLocator : public PointOnGeometryLocator {
- private:
-     struct SegmentView {
-         SegmentView(const geom::Coordinate* p_p0, const geom::Coordinate* p_p1) : m_p0(p_p0) {
-diff --git a/include/geos/export.h b/include/geos/export.h
-index 1a26f8c..997fb4c 100644
---- a/include/geos/export.h
-+++ b/include/geos/export.h
-@@ -19,7 +19,7 @@
- #  if defined(GEOS_DLL_EXPORT)
- #    define GEOS_DLL   __declspec(dllexport)
- #  elif defined(GEOS_DLL_IMPORT)
--#    define GEOS_DLL   __declspec(dllimport)
-+#    define GEOS_DLL   extern __declspec(dllimport)
- #  else
- #    define GEOS_DLL
- #  endif

versions/baseline.json

@@ -3009,8 +3009,8 @@
       "port-version": 0
     },
     "geos": {
-      "baseline": "3.11.3",
-      "port-version": 1
+      "baseline": "3.12.2",
+      "port-version": 0
     },
     "geotrans": {
       "baseline": "3.9",

versions/g-/geos.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7673b6100f8c6f31fc80a93e5a9efa6bb9f044a4",
+      "version": "3.12.2",
+      "port-version": 0
+    },
     {
       "git-tree": "41bb89a641e2fd76a21cdf259893ef3ab187aeaf",
       "version": "3.11.3",