Re: [PR PATCH] [Updated] proj: update to 7.2.1

[ar-jan <ar-jan@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is an updated pull request by ar-jan against master on the void-packages repository

https://github.com/ar-jan/void-packages proj-721
https://github.com/void-linux/void-packages/pull/40347

proj: update to 7.2.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Followup to #31687.

A patch file from https://github.com/void-linux/void-packages/pull/40347.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-proj-721-40347.patch --]
[-- Type: text/x-diff, Size: 10201 bytes --]

From e1b2860966f0eba4ec9e47d4b28301ed3f0ee3ba Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 15:08:33 +0100
Subject: [PATCH 01/12] proj: update to 7.2.1.

---
 common/shlibs         |  2 +-
 srcpkgs/proj/template | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5136df346db0..fbee1be164fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3068,7 +3068,7 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1
 libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4
 libunshield.so.0 libunshield-0.6_1
 libMyGUIEngine.so.3.4.1 libmygui-3.4.1_1
-libproj.so.18 proj-6.3.0_1
+libproj.so.19 proj-7.2.1_1
 libnlopt.so.0 nlopt-2.4.2_1
 libeb.so.16 libeb-4.3.3_1
 libchipcard.so.6 libchipcard-5.0.4_1
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 51c4638234bd..2adf17d18d77 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,17 +1,17 @@
 # Template file for 'proj'
 pkgname=proj
-version=6.3.2
+version=7.2.1
 revision=1
 build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3"
-makedepends="sqlite-devel"
+makedepends="libcurl-devel sqlite-devel tiff-devel"
 short_desc="Cartographic Projections Library"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"
-homepage="https://proj4.org"
+homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311
+checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14
 
 post_install() {
 	vlicense COPYING
@@ -22,7 +22,6 @@ proj-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/man/man3
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}

From f620c52365f4c3c159c7ced7fc41a07e88c34915 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 15:40:25 +0100
Subject: [PATCH 02/12] libgdal: rebuild for proj 7.2.1

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f10280ce4f54..fde371e71338 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=1
+revision=2
 wrksrc="gdal-${version}"
 build_style=cmake
 build_helper=python3

From 57d5dc966f802bf62caa5976e250e693ec8fa095 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:12:34 +0100
Subject: [PATCH 03/12] libspatialite: rebuild for proj 7.2.1

---
 srcpkgs/libspatialite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 54885e5e8b8c..0333e6807d7b 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -1,9 +1,9 @@
 # Template file for 'libspatialite'
 pkgname=libspatialite
 version=5.0.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config geos-devel"
+hostmakedepends="pkg-config geos-devel librttopo"
 makedepends="sqlite-devel zlib-devel proj-devel freexl-devel
  geos-devel librttopo-devel libxml2-devel minizip-devel"
 short_desc="SQLite extension for Spatial SQL capabilities"

From 917091ad9e752c6644198873f2c56d921d66b22d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:21:32 +0100
Subject: [PATCH 04/12] postgis-postgresql14: rebuild for proj 7.2.1

---
 srcpkgs/postgis-postgresql14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index a58109d65246..6eee77d4c74f 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
 # Template file for 'postgis-postgresql14'
 pkgname=postgis-postgresql14
 version=3.2.1
-revision=3
+revision=5
 wrksrc="postgis-${version}"
 build_style=gnu-configure
 configure_args="

From 046caa4531c144298665a1ed2b24ca5f3aa1beaa Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:24:22 +0100
Subject: [PATCH 05/12] postgis-postgresql13: rebuild for proj 7.2.1

---
 srcpkgs/postgis-postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index ea024d3093a7..052654f674a7 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
 version=3.2.1
-revision=2
+revision=3
 wrksrc="postgis-${version}"
 build_style=gnu-configure
 configure_args="

From 01cd12a343c6d3d1da7f6cdc0808a341fc4b62df Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:25:01 +0100
Subject: [PATCH 06/12] grass: rebuild for proj 7.2.1

---
 srcpkgs/grass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 5863a61a300d..a8fc7640d869 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
 # Template file for 'grass'
 pkgname=grass
 version=7.6.1
-revision=5
+revision=6
 _binver=${version//./}
 _binver=${_binver:0:2}
 build_style=gnu-configure

From 2969d42902f164c031a9d71707e0fc9fcadcf4ad Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:25:40 +0100
Subject: [PATCH 07/12] merkaartor: rebuild for proj 7.2.1

---
 srcpkgs/merkaartor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index 6603376111f2..f1f4b270b4e7 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
 # Template file for 'merkaartor'
 pkgname=merkaartor
 version=0.19.0
-revision=2
+revision=3
 build_style=qmake
 configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
 hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"

From 5ebd02030142585066bb858a19a3d6980c2ccaf6 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:27:14 +0100
Subject: [PATCH 08/12] XyGrib: rebuild for proj 7.2.1

---
 srcpkgs/XyGrib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template
index e4aa3a2e0265..641dd730c786 100644
--- a/srcpkgs/XyGrib/template
+++ b/srcpkgs/XyGrib/template
@@ -1,7 +1,7 @@
 # Template file for 'XyGrib'
 pkgname=XyGrib
 version=1.2.6.1
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="qt5-devel pkg-config"
 makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel

From 383f2462c4447d89a336f307de7f396c3520a8e0 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:29:13 +0100
Subject: [PATCH 09/12] sumo: rebuild for proj 7.2.1

---
 srcpkgs/sumo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index dfc342f19a51..595a4d4e4c4e 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
 # Template file for 'sumo'
 pkgname=sumo
 version=1.12.0
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
 makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel

From a9414e450275eadad72e2a9fd77e2898849b3765 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:00 +0100
Subject: [PATCH 10/12] OpenOrienteering-Mapper: rebuild for proj 7.2.1

---
 srcpkgs/OpenOrienteering-Mapper/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fe114ce24e8e..42b976e1bdf2 100644
--- a/srcpkgs/OpenOrienteering-Mapper/template
+++ b/srcpkgs/OpenOrienteering-Mapper/template
@@ -1,14 +1,15 @@
 # Template file for 'OpenOrienteering-Mapper'
 pkgname=OpenOrienteering-Mapper
 version=0.9.5
-revision=2
+revision=3
 wrksrc="mapper-${version}"
 build_style=cmake
 hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
 makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
  qt5-tools-devel sqlite-devel cups-devel $(vopt_if location qt5-location-devel)
  $(vopt_if sensors qt5-sensors-devel)
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ tiff-devel libcurl-devel"
 short_desc="Orienteering mapmaking program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From 01b81237c4686a0ff98de94ad19c9793c32e8682 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:29 +0100
Subject: [PATCH 11/12] osg: rebuild for proj 7.2.1

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 6f2cb49b9cba..2a6bcad2b31e 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 386fff1e8d4bd2d42c196d99c82389070af4b946 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 12/12] vtk: rebuild for proj 7.2.1

---
 srcpkgs/vtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 553cf9198465..dfcc9dca8376 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=8
+revision=9
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"