[geos] Update to 3.11.2 (#35433)

ports/geos/disable-warning-4996.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e758b5dc8..074986f38 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,7 +187,7 @@ 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>"
-+	$<$<CXX_COMPILER_ID:MSVC>:/fp:precise /wd4996>
- 	)
- 
- # Use -ffloat-store for 32-bit builds (needed to make some tests pass)

ports/geos/gcc-13-fix-backport.patch

@@ -1,12 +0,0 @@
-diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h
-index 61c0010d4..eba5bba8f 100644
---- a/include/geos/shape/fractal/HilbertEncoder.h
-+++ b/include/geos/shape/fractal/HilbertEncoder.h
-@@ -18,6 +18,7 @@
- #include <geos/export.h>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {

ports/geos/portfile.cmake

@@ -1,17 +1,14 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
     FILENAME "geos-${VERSION}.tar.bz2"
-    SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
+    SHA512 bbca43c1eb9c4001d2e3c29d054b597bfb2c1d4860784246dd20fec21882b54bc2a8a8f0f09b8816aec7a85b621d3d1645adca15318838d2b4f4b5c4c4a58a94
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
     PATCHES
-        disable-warning-4996.patch
+        win32.patch
         fix-exported-config.patch
-        fix-dll-builds.patch
-        gcc-13-fix-backport.patch
 )
 
 vcpkg_cmake_configure(

ports/geos/vcpkg.json

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

ports/geos/win32.patch

@@ -1,17 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 074986f..bb5ab3a 100644
+index e758b5d..beda887 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -187,7 +187,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
+@@ -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 /wd4996>
-+  "$<$<BOOL:${MSVC}>:/fp:precise /wd4996>"
+-	"$<$<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 +227,10 @@ target_compile_definitions(geos_cxx_flags
+@@ -227,10 +228,10 @@ target_compile_definitions(geos_cxx_flags
  
  target_compile_definitions(geos_developer_cxx_flags
    INTERFACE
@@ -26,7 +27,7 @@ index 074986f..bb5ab3a 100644
  
  target_compile_options(geos_developer_cxx_flags
    INTERFACE
-@@ -269,7 +269,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries"
+@@ -269,7 +270,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries"
  
  if(BUILD_SHARED_LIBS)
    target_compile_definitions(geos
@@ -35,7 +36,7 @@ index 074986f..bb5ab3a 100644
  
    set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
    set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
-@@ -287,7 +287,7 @@ target_link_libraries(geos_c PRIVATE geos)
+@@ -287,7 +288,7 @@ target_link_libraries(geos_c PRIVATE geos)
  
  if(BUILD_SHARED_LIBS)
    target_compile_definitions(geos_c

versions/baseline.json

@@ -2909,7 +2909,7 @@
       "port-version": 1
     },
     "geos": {
-      "baseline": "3.11.2",
+      "baseline": "3.11.3",
       "port-version": 0
     },
     "geotrans": {

versions/g-/geos.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "74ed7ac2ba209cbd984174705b2e3fc7fcf99e9a",
+      "version": "3.11.3",
+      "port-version": 0
+    },
     {
       "git-tree": "6e3173bfbaacdb8fee9ac698f0b6dc668136ed9b",
       "version": "3.11.2",