From b9a9c215d006190ac8c080ebed5db0bb91b2683f Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Thu, 23 May 2024 15:55:12 -0400
Subject: [PATCH] PROJ: New version 9.4.0 (#8746)

* PROJ: New version 9.4.0

* PROJ: Use newer GCC version

* PROJ: Correct case of cmake variable
---
 P/PROJ/build_tarballs.jl | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/P/PROJ/build_tarballs.jl b/P/PROJ/build_tarballs.jl
index 32cc9aec50a..3b9424ec3d2 100644
--- a/P/PROJ/build_tarballs.jl
+++ b/P/PROJ/build_tarballs.jl
@@ -3,7 +3,7 @@
 using BinaryBuilder, Pkg
 
 name = "PROJ"
-upstream_version = v"9.3.0"
+upstream_version = v"9.4.0"
 version_offset = v"1.0.0"
 version = VersionNumber(upstream_version.major * 100 + version_offset.major,
                         upstream_version.minor * 100 + version_offset.minor,
@@ -12,7 +12,7 @@ version = VersionNumber(upstream_version.major * 100 + version_offset.major,
 # Collection of sources required to complete build
 sources = [
     ArchiveSource("https://download.osgeo.org/proj/proj-$upstream_version.tar.gz",
-        "91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d")
+        "3643b19b1622fe6b2e3113bdb623969f5117984b39f173b4e3fb19a8833bd216")
 ]
 
 # Bash recipe for building across all platforms
@@ -22,11 +22,11 @@ cd $WORKSPACE/srcdir/proj-*
 EXE_SQLITE3=${host_bindir}/sqlite3
 
 if [[ ${target} == *mingw* ]]; then
-    SQLITE3_LIBRARY=${libdir}/libsqlite3-0.dll
+    SQLite3_LIBRARY=${libdir}/libsqlite3-0.dll
     CURL_LIBRARY=${libdir}/libcurl-4.dll
     TIFF_LIBRARY_RELEASE=${libdir}/libtiff-6.dll
 else
-    SQLITE3_LIBRARY=${libdir}/libsqlite3.${dlext}
+    SQLite3_LIBRARY=${libdir}/libsqlite3.${dlext}
     CURL_LIBRARY=${libdir}/libcurl.${dlext}
     TIFF_LIBRARY_RELEASE=${libdir}/libtiff.${dlext}
 fi
@@ -45,11 +45,11 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_TESTING=OFF \
-    -DEXE_SQLITE3=$EXE_SQLITE3 \
-    -DSQLITE3_INCLUDE_DIR=${includedir} \
-    -DSQLITE3_LIBRARY=$SQLITE3_LIBRARY \
+    -DEXE_SQLITE3=${EXE_SQLITE3} \
+    -DSQLite3_INCLUDE_DIR=${includedir} \
+    -DSQLite3_LIBRARY=${SQLite3_LIBRARY} \
     -DCURL_INCLUDE_DIR=${includedir} \
-    -DCURL_LIBRARY=$CURL_LIBRARY \
+    -DCURL_LIBRARY=${CURL_LIBRARY} \
     -DTIFF_INCLUDE_DIR=${includedir} \
     -DTIFF_LIBRARY_RELEASE=$TIFF_LIBRARY_RELEASE \
     ..
@@ -99,6 +99,7 @@ dependencies = [
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
+               julia_compat="1.6", preferred_gcc_version=v"8")
 
 # Build trigger: 1