From 1718c2ba6a4db1461b2490aa42ca4f0a2112adae Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 13 Nov 2022 13:09:14 +0300 Subject: [PATCH] package/postgis: bump version to 3.3.2 All patches are merged into upstream, so drop them. https://git.osgeo.org/gitea/postgis/postgis/src/tag/3.3.2/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- ...e-forced-static-linking-of-liblwgeom.patch | 31 ---------------- ...kefile.in-do-not-force-static-linkin.patch | 35 ------------------- package/postgis/postgis.hash | 2 +- package/postgis/postgis.mk | 2 +- 4 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch delete mode 100644 package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch diff --git a/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch b/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch deleted file mode 100644 index 4329c9cd80..0000000000 --- a/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 845c18c1288b7a96592901baadb198f96dd71c46 Mon Sep 17 00:00:00 2001 -From: fidomax -Date: Tue, 26 Jan 2021 09:49:19 +0300 -Subject: [PATCH] Disable forced static linking of liblwgeom - -In case of shared libs build fails: -ld: cannot find -lgeos_c -ld: attempted static link of dynamic object `/usr/lib/libproj.so' - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b.patch ---- - loader/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 9aebfe07f..9a0c90d3a 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -44,7 +44,7 @@ ICONV_CFLAGS=@ICONV_CFLAGS@ - - # liblwgeom - LIBLWGEOM=../liblwgeom/liblwgeom.la --LDFLAGS += -static $(LIBLWGEOM) -+LDFLAGS += $(LIBLWGEOM) - - # GTK includes and libraries - GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@ --- -2.30.0 - diff --git a/package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch b/package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch deleted file mode 100644 index 756a7c10dd..0000000000 --- a/package/postgis/0002-raster-loader-Makefile.in-do-not-force-static-linkin.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 29c33c483e22a4445d870739187d128df0f11f60 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 27 Jul 2022 15:12:40 +0200 -Subject: [PATCH] raster/loader/Makefile.in: do not force static linking - -This is similar to commit -https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b, -but applied to raster/loader. It ensures that if only shared variants -of the libraries are available, the link still works. If you force --static and only shared variants of some of the libraries are -available, the link fails with "d: attempted static link of dynamic -object XYZ". - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/postgis/postgis/pull/702 ---- - raster/loader/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in -index 3df47a96f..d0a408333 100644 ---- a/raster/loader/Makefile.in -+++ b/raster/loader/Makefile.in -@@ -36,7 +36,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@ - - RT_CORE=../rt_core - --LIBLWGEOM_LDFLAGS= -static ../../liblwgeom/liblwgeom.la -+LIBLWGEOM_LDFLAGS= ../../liblwgeom/liblwgeom.la - LIBLWGEOM_CFLAGS=-I../../liblwgeom - LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@ - LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@ --- -2.37.1 - diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 9569ca71dd..8550a57939 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 18cf3d013f45b1aa8ed59d78bc707e9e125e250d8f0615396ae9bfe3dd7c3d7c postgis-3.2.2.tar.gz +sha256 9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068 postgis-3.3.2.tar.gz sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index e6ea52bf7a..4148180adf 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.2.2 +POSTGIS_VERSION = 3.3.2 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1)