From a8dcd1fc039eb29ed2c77765660b03038569401b Mon Sep 17 00:00:00 2001
From: rejbasket <39080670+rejbasket@users.noreply.github.com>
Date: Sun, 9 Jun 2024 13:10:57 +0200
Subject: [PATCH] Rejbasket/version geos update (#2979)

* update geos version for linux an win builds

* pinned pyinstaller version

* changed windows build runner to windows-2019

* changed build version for cmake geos build script

---------

Co-authored-by: rejbasket <rejbasket@users.noreply.github.com>
---
 .github/workflows/build.yml |  4 ++--
 bin/build-geos-win.cmd      | 10 +++++-----
 bin/build-linux-dist        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21b9fe124..77fd2f556 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
           name: inkstitch-linux
           path: artifacts
   windows32:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
         with:
@@ -149,7 +149,7 @@ jobs:
           name: inkstitch-windows32
           path: artifacts
   windows64:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/bin/build-geos-win.cmd b/bin/build-geos-win.cmd
index 9bd5f3a7f..a3b1ca5d9 100755
--- a/bin/build-geos-win.cmd
+++ b/bin/build-geos-win.cmd
@@ -5,13 +5,13 @@ SET GEOS_INSTALL=%CD%\geos-build
 if NOT DEFINED BUILD32 (SET BUILDFLAG="x64") else (SET BUILDFLAG="Win32")
 echo %BUILDFLAG%
 
-curl -L -O  https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2
+curl -L -O  https://github.com/libgeos/geos/releases/download/3.12.2/geos-3.12.2.tar.bz2
 
-7z x geos-3.12.1.tar.bz2
-7z x geos-3.12.1.tar
+7z x geos-3.12.2.tar.bz2
+7z x geos-3.12.2.tar
 
-cd geos-3.12.1
-cmake -S . -B _build -G "Visual Studio 17 2022" -A %BUILDFLAG% -DCMAKE_INSTALL_PREFIX=%GEOS_INSTALL% -DCMAKE_GENERATOR_TOOLSET=host=x64
+cd geos-3.12.2
+cmake -S . -B _build -G "Visual Studio 16 2019" -A %BUILDFLAG% -DCMAKE_INSTALL_PREFIX=%GEOS_INSTALL% -DCMAKE_GENERATOR_TOOLSET=host=x64
 
 cmake --build _build --config Release -j 16 --verbose
 cd _build
diff --git a/bin/build-linux-dist b/bin/build-linux-dist
index d4e89f104..aaa487b40 100755
--- a/bin/build-linux-dist
+++ b/bin/build-linux-dist
@@ -3,11 +3,11 @@
 mkdir $HOME/geos-build
 GEOS_PATH=$HOME/geos-build
 # Downloading geos
-curl -L -O  https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2
+curl -L -O  https://github.com/libgeos/geos/releases/download/3.12.2/geos-3.12.2.tar.bz2
 
 # uzipping geos 
-tar -xf geos-3.12.1.tar.bz2 
-cd geos-3.12.1
+tar -xf geos-3.12.2.tar.bz2 
+cd geos-3.12.2
 # Building geos
 mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=$GEOS_PATH -DCMAKE_BUILD_TYPE=Release ..
 make && make install