From 9132605216a4617313d01eac33f43dc76e2b38fa Mon Sep 17 00:00:00 2001
From: Sean Gillies <sean.gillies@gmail.com>
Date: Mon, 29 Jul 2024 13:09:56 -0600
Subject: [PATCH] Rel 1.10b2 (#44)

* Explicitly build and link pcre2

Upgrades: CURL 8.8.0, GDAL 3.9.1

* Build fiona main

* PCRE2 8.45

* It's PCRE2-8_LIBRARY

* Get pcre2 from github

* Explicitly specify library file path

* Generalize pcre2 library path

* Build tagged 1.10b2

* Update libjpeg to 6f
---
 .cirrus.yml                       |  2 +-
 .github/workflows/wheels.yaml     |  2 +-
 .github/workflows/win-wheels.yaml |  2 +-
 config.sh                         | 11 ++++++++++-
 env_vars.sh                       |  7 ++++---
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4e5d724..9f2cbfb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,7 +5,7 @@ wheel_build_task:
   env:
     BUILD_PREFIX: /private/tmp/local
     REPO_DIR: Fiona
-    BUILD_COMMIT: rel-1.10b1
+    BUILD_COMMIT: 1.10b2
     CIRRUS_CLONE_SUBMODULES: true
     PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
     PLAT: "arm64"
diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml
index 9316d83..38f54c2 100644
--- a/.github/workflows/wheels.yaml
+++ b/.github/workflows/wheels.yaml
@@ -27,7 +27,7 @@ jobs:
           - os: "ubuntu-20.04"
             os-name: "focal"
     env:
-      BUILD_COMMIT: rel-1.10b1
+      BUILD_COMMIT: 1.10b2
       PLAT: "${{ matrix.platform }}"
       MB_PYTHON_VERSION: "${{ matrix.python }}"
       MB_ML_VER: "2014"
diff --git a/.github/workflows/win-wheels.yaml b/.github/workflows/win-wheels.yaml
index c33377d..9998187 100644
--- a/.github/workflows/win-wheels.yaml
+++ b/.github/workflows/win-wheels.yaml
@@ -5,7 +5,7 @@ name: Windows wheels
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  REF: rel-1.10b1
+  REF: 1.10b2
 
 # cancel running jobs on new commit to PR
 concurrency:
diff --git a/config.sh b/config.sh
index 73cfba3..7b95440 100644
--- a/config.sh
+++ b/config.sh
@@ -186,6 +186,10 @@ function build_curl {
     touch curl-stamp
 }
 
+function build_pcre2 {
+    build_simple pcre2 $PCRE_VERSION https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}
+}
+
 
 function build_gdal {
     if [ -e gdal-stamp ]; then return; fi
@@ -199,14 +203,17 @@ function build_gdal {
     build_sqlite
     build_expat
     build_geos
+    build_pcre2
 
     CFLAGS="$CFLAGS -DPROJ_RENAME_SYMBOLS -g -O2"
     CXXFLAGS="$CXXFLAGS -DPROJ_RENAME_SYMBOLS -DPROJ_INTERNAL_CPP_NAMESPACE -g -O2"
 
     if [ -n "$IS_OSX" ]; then
         GEOS_CONFIG="-DGDAL_USE_GEOS=OFF"
+        PCRE2_LIB="$BUILD_PREFIX/lib/libpcre2-8.dylib"
     else
         GEOS_CONFIG="-DGDAL_USE_GEOS=ON"
+        PCRE2_LIB="$BUILD_PREFIX/lib/libpcre2-8.so"
     fi
 
     local cmake=cmake
@@ -245,7 +252,9 @@ function build_gdal {
         -DGDAL_USE_SFCGAL=OFF \
         -DGDAL_USE_XERCESC=OFF \
         -DGDAL_USE_LIBXML2=OFF \
-        -DGDAL_USE_PCRE2=OFF \
+        -DGDAL_USE_PCRE2=ON \
+        -DPCRE2_INCLUDE_DIR=$BUILD_PREFIX/include \
+        -DPCRE2-8_LIBRARY=$PCRE2_LIB \
         -DGDAL_USE_POSTGRESQL=OFF \
         -DGDAL_USE_ODBC=OFF \
         && $cmake --build . -j4 \
diff --git a/env_vars.sh b/env_vars.sh
index a4c4be0..27ae694 100644
--- a/env_vars.sh
+++ b/env_vars.sh
@@ -1,18 +1,19 @@
 LIBPNG_VERSION=1.6.35
 ZLIB_VERSION=1.2.11
-JPEG_VERSION=9c
+JPEG_VERSION=9f
 GEOS_VERSION=3.11.2
 JSONC_VERSION=0.15
 SQLITE_VERSION=3330000
 PROJ_VERSION=9.3.1
-GDAL_VERSION=3.8.4
-CURL_VERSION=8.4.0
+GDAL_VERSION=3.9.1
+CURL_VERSION=8.8.0
 NGHTTP2_VERSION=1.46.0
 EXPAT_VERSION=2.2.6
 TIFF_VERSION=4.3.0
 OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source/
 OPENSSL_ROOT=openssl-1.1.1w
 OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
+PCRE_VERSION=10.44
 export MACOSX_DEPLOYMENT_TARGET=10.15
 export GDAL_CONFIG=/usr/local/bin/gdal-config
 export PACKAGE_DATA=1