CVS commit: pkgsrc/geography/proj

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May  3 13:16:21 UTC 2025

Modified Files:
        pkgsrc/geography/proj: Makefile distinfo
Added Files:
        pkgsrc/geography/proj/patches: patch-CMakeLists.txt

Log Message:
geography/proj: Cherry-pick upstream fix to not probe C23

on compilers that are "too old", apparently defined as gcc < 15.
Likely to resolve build failure on NetBSD 9.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/geography/proj/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/geography/proj/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/geography/proj/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/proj/Makefile
diff -u pkgsrc/geography/proj/Makefile:1.51 pkgsrc/geography/proj/Makefile:1.52
--- pkgsrc/geography/proj/Makefile:1.51 Sun Apr 27 11:49:17 2025
+++ pkgsrc/geography/proj/Makefile      Sat May  3 13:16:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2025/04/27 11:49:17 gdt Exp $
+# $NetBSD: Makefile,v 1.52 2025/05/03 13:16:21 gdt Exp $
 
 VERSION_BASE=  9.6.0
 # Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
@@ -7,6 +7,7 @@ VERSION=        ${VERSION_BASE}${VERSION_RC}
 WRKFINAL=      proj-${VERSION_BASE}
 WRKSRC=                ${WRKDIR}/${WRKFINAL}
 DISTNAME=      proj-${VERSION}
+PKGREVISION=   1
 #PKGREVISION=  0
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/proj/
@@ -31,6 +32,9 @@ USE_TOOLS+=           gmake pkg-config
 TOOL_DEPENDS+=         sqlite3>=3.10.0:../../databases/sqlite3
 
 CMAKE_CONFIGURE_ARGS+= -DRUN_NETWORK_DEPENDENT_TESTS=OFF
+# Probably default, but hang back until everyone else deals with the
+# difficulties.
+CMAKE_CONFIGURE_ARGS+= -DEMBED_RESOURCE_FILES=OFF
 
 .include "../../devel/cmake/build.mk"
 

Index: pkgsrc/geography/proj/distinfo
diff -u pkgsrc/geography/proj/distinfo:1.26 pkgsrc/geography/proj/distinfo:1.27
--- pkgsrc/geography/proj/distinfo:1.26 Sun Apr 27 00:23:07 2025
+++ pkgsrc/geography/proj/distinfo      Sat May  3 13:16:21 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2025/04/27 00:23:07 gdt Exp $
+$NetBSD: distinfo,v 1.27 2025/05/03 13:16:21 gdt Exp $
 
 BLAKE2s (proj-9.6.0.tar.gz) = 525865aa36ebcf758875ec37b27f5b6a053eef4f0c189eed2e9ae67d0993efa4
 SHA512 (proj-9.6.0.tar.gz) = c152fc0400f073fe6c980aca00905421f65e8b515adea173c56103279c1af232968781479010e1609ad826f087a5448f7a7b37de8a7a2c7ea671b04c63578988
 Size (proj-9.6.0.tar.gz) = 5830688 bytes
+SHA1 (patch-CMakeLists.txt) = 98c2653487aba3e86bebbba9c5fef7348c4eb543
 SHA1 (patch-src_projections_robin.cpp) = 42e91b7ae6e5ce3ba83d7f135c64135ef97df76d

Added files:

Index: pkgsrc/geography/proj/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/geography/proj/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Sat May  3 13:16:21 2025
+++ pkgsrc/geography/proj/patches/patch-CMakeLists.txt  Sat May  3 13:16:21 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/05/03 13:16:21 gdt Exp $
+
+Avoid cmake erroring out with gcc7 at least.
+
+Cherry-picked from https://github.com/OSGeo/PROJ/pull/4462/ which will
+be in proj 9.6.1.
+
+--- CMakeLists.txt.orig        2025-05-03 13:06:51.107368234 +0000
++++ CMakeLists.txt
+@@ -355,7 +355,8 @@ endif()
+ 
+ function (is_sharp_embed_available res)
+     if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21 AND
+-        ((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR (CMAKE_C_COMPILER_ID STREQUAL "Clang")))
++         ((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0) OR
++         (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0)))
+         # CMAKE_C_STANDARD=23 only supported since CMake 3.21
+         set(TEST_SHARP_EMBED
+           "static const unsigned char embedded[] = {\n#embed __FILE__\n};\nint main() { (void)embedded; return 0;}"