pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

proj: Update to 9.5.1RC1



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Nov 26 12:10:33 2024 -0500
Changeset:	bb34bb34e785a3c8df40745910623d8d366b62da

Modified Files:
	proj/COMMIT_MSG
	proj/Makefile
	proj/PLIST
	proj/distinfo
Added Files:
	proj/patches/patch-data_CMakeLists.txt

Log Message:
proj: Update to 9.5.1RC1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb34bb34e785a3c8df40745910623d8d366b62da

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

diffstat:
 proj/COMMIT_MSG                        |  7 ++++++-
 proj/Makefile                          |  4 ++--
 proj/PLIST                             |  4 ++--
 proj/distinfo                          |  7 ++++---
 proj/patches/patch-data_CMakeLists.txt | 16 ++++++++++++++++
 5 files changed, 30 insertions(+), 8 deletions(-)

diffs:
diff --git a/proj/COMMIT_MSG b/proj/COMMIT_MSG
index 25e6badace..1fe3d24518 100644
--- a/proj/COMMIT_MSG
+++ b/proj/COMMIT_MSG
@@ -1,5 +1,10 @@
-geography/proj: Update to ? (from 9.5.0)
+geography/proj: Update to 9.5.1
 
 Upstream NEWS, less normal updates (e.g. EPSG database) and other
 housekeeping, bugfixes, minor improvements follows.
 
+* Database: update to EPSG v11.021 (#4254, #4275, #4297)
+
+* Speed-up dramatically proj.db build time (#4280)
+
+* Database: ingest deprecated ESRI names to be able to better import old WKT ESRI (#4282)
diff --git a/proj/Makefile b/proj/Makefile
index 0a5eb9fa8b..e512d5e222 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.45 2024/11/14 22:20:02 wiz Exp $
 
-VERSION_BASE=	9.5.0
+VERSION_BASE=	9.5.1
 # Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
-VERSION_RC=
+VERSION_RC=	RC1
 VERSION=	${VERSION_BASE}${VERSION_RC}
 WRKFINAL=	proj-${VERSION_BASE}
 WRKSRC=		${WRKDIR}/${WRKFINAL}
diff --git a/proj/PLIST b/proj/PLIST
index 273a49625f..eb5fe64ecb 100644
--- a/proj/PLIST
+++ b/proj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2024/09/15 12:53:31 gdt Exp $
+@comment $NetBSD$
 bin/cct
 bin/cs2cs
 bin/geod
@@ -37,7 +37,7 @@ lib/cmake/proj4/proj4-targets-release.cmake
 lib/cmake/proj4/proj4-targets.cmake
 lib/libproj.so
 lib/libproj.so.25
-lib/libproj.so.25.9.5.0
+lib/libproj.so.25.9.5.1
 lib/pkgconfig/proj.pc
 man/man1/cct.1
 man/man1/cs2cs.1
diff --git a/proj/distinfo b/proj/distinfo
index 511b2b0672..4d7c786364 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.24 2024/09/15 12:53:31 gdt Exp $
 
-BLAKE2s (proj-9.5.0.tar.gz) = 4e1ae2f1df7c09b3084bbb8d04db9b02be876c6237a34dea3dbd884d4c62f1db
-SHA512 (proj-9.5.0.tar.gz) = 3d3276f6162aa3a8fa8f828bab871916f927d8bc43936539df93f475e888e4c58c2a4529748a5299657467959e0b6003bb9c2cce837d4e6859f975bbaf400f4d
-Size (proj-9.5.0.tar.gz) = 5694279 bytes
+BLAKE2s (proj-9.5.1RC1.tar.gz) = 458295e298a7bf8e5ec93e437f49a9e7d0c0a0ca35f80cd220da3c2362178234
+SHA512 (proj-9.5.1RC1.tar.gz) = 02c46e2e47dc65dd1dc52b7e02bbd9d9802915d4fb301dd187df846b110b3f7c55f8ac531b25962e657f81bbd0d16f1baf24508f6049692f2b1621b7e7d0ec65
+Size (proj-9.5.1RC1.tar.gz) = 5702389 bytes
+SHA1 (patch-data_CMakeLists.txt) = eeae6e976aeb5fa35efd99096a52253e788a8592
diff --git a/proj/patches/patch-data_CMakeLists.txt b/proj/patches/patch-data_CMakeLists.txt
new file mode 100644
index 0000000000..29c4ea1932
--- /dev/null
+++ b/proj/patches/patch-data_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix upstream bug, fix expected in RC2.
+https://salsa.debian.org/debian-gis-team/proj/-/raw/debian/9.5.1_rc1-1_exp1/debian/patches/generate_proj_db.patch?ref_type=tags
+
+--- data/CMakeLists.txt.orig	2024-11-26 16:57:37.313886158 +0000
++++ data/CMakeLists.txt
+@@ -45,7 +45,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_D
+ set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
+ include(sql_filelist.cmake)
+ 
+-set(PROJ_DB_SQL_EXPECTED_MD5 "79e88859b5e194b02d45edf80e80ada9")
++set(PROJ_DB_SQL_EXPECTED_MD5 "0491c73526276ee8e99fe8f4597f9565")
+ 
+ add_custom_command(
+   OUTPUT ${PROJ_DB}


Home | Main Index | Thread Index | Old Index