* [gentoo-commits] repo/gentoo:master commit in: dev-db/spatialite/, dev-db/spatialite/files/
@ 2016-02-29 18:25 Amy Winston
0 siblings, 0 replies; 3+ messages in thread
From: Amy Winston @ 2016-02-29 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 892a8848e5718e75f5d2c8ee3916421de173f023
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 18:23:25 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 18:24:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892a8848
dev-db/spatialite: validator patch added bug #571806
Package-Manager: portage-2.2.26
dev-db/spatialite/files/spatialite-4.1.1-validator.patch | 11 +++++++++++
dev-db/spatialite/spatialite-4.1.1.ebuild | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/dev-db/spatialite/files/spatialite-4.1.1-validator.patch b/dev-db/spatialite/files/spatialite-4.1.1-validator.patch
new file mode 100644
index 0000000..55b2068
--- /dev/null
+++ b/dev-db/spatialite/files/spatialite-4.1.1-validator.patch
@@ -0,0 +1,11 @@
+--- src/shapefiles/validator.c 2013-06-29 08:53:15.000000000 +0200
++++ src/shapefiles/validatornew.c 2016-02-29 18:38:11.879981893 +0100
+@@ -3510,7 +3510,7 @@
+
+ /* silencing stupid compiler warnings */
+ if (sqlite == NULL || table == NULL || geom == NULL ||
+- ||report_path == NULL || n_rows == NULL || n_invalids == NULL)
++ report_path == NULL || n_rows == NULL || n_invalids == NULL)
+ table = NULL;
+
+ if (err_msg == NULL)
diff --git a/dev-db/spatialite/spatialite-4.1.1.ebuild b/dev-db/spatialite/spatialite-4.1.1.ebuild
index c1c2e2d..a052891 100644
--- a/dev-db/spatialite/spatialite-4.1.1.ebuild
+++ b/dev-db/spatialite/spatialite-4.1.1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
MY_PN="lib${PN}"
MY_P="${MY_PN}-${PV}"
-inherit multilib
+inherit multilib eutils
DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
HOMEPAGE="http://www.gaia-gis.it/gaia-sins/"
@@ -27,11 +27,16 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ epatch "${FILESDIR}/${P}-validator.patch"
+}
+
src_configure() {
econf \
--disable-static \
--enable-geocallbacks \
--enable-epsg \
+ --disable-examples \ #broken in 4.1.1
$(use_enable geos) \
$(use_enable geos geosadvanced) \
$(use_enable iconv) \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/spatialite/, dev-db/spatialite/files/
@ 2017-02-19 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-02-19 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 115f53016f37b31e7885cd25d331331326f7873c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 19:29:21 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 21:15:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115f5301
dev-db/spatialite: Drop old
Package-Manager: portage-2.3.3
dev-db/spatialite/Manifest | 1 -
.../files/spatialite-4.1.1-validator.patch | 11 -----
dev-db/spatialite/spatialite-4.1.1.ebuild | 51 ----------------------
dev-db/spatialite/spatialite-4.3.0.ebuild | 47 --------------------
4 files changed, 110 deletions(-)
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index e1df2a1565..13fcf86333 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,4 @@
DIST libspatialite-2.4.0.tar.gz 865036 SHA256 a9c2a3d9277a6fed13561cf2c1580fef701cfd55336f34eea3f3d46389f7f2c2 SHA512 3e34b2eeedfb0f3a57f3ef33c564cc3bd9391c6f7cc6d7fa7b8e83f920c3a625cfbb33d15d9f2110c7821d964b7b26bb5c06aebd41c3f7ad2bf943d3dea795cf WHIRLPOOL fed91a8501c34a3e0e0a5920049165c081abd050c41b1ef9cb20a8f68571dc85275133d23f798b0b10d88fd6f8623984ee4e18131309d85e1c7512fa9fd3f9d7
DIST libspatialite-3.0.1.tar.gz 1849723 SHA256 4983d6584069fd5ff0cfcccccee1015088dab2db177c0dc7050ce8306b68f8e6 SHA512 604e5fcb3ac17eb3c69aff5dbf8c77660aecbddc81ab1faa63b0ce069253e3d1c5b6001bd2f2fde5d2f60de9c3758d0d871b9cbcaf1a6d18ceebc0788c166d94 WHIRLPOOL 48f8c84e828ec5e3504e9e347a1fe13c30e852f2127458e1b892ab422f4f0b2fd6857fd50fef51f72fb0851fe7827fac62fe1342e7deac2d7a511501c41321ab
-DIST libspatialite-4.1.1.tar.gz 3846758 SHA256 0481a20af952f4a38c9dbb10f37fd38c45f16c50397f8da0079e02435b9b910f SHA512 62e443bdf78234b9bf314cc60fbea62da7caa95054cdf5052d83703bf994240a1ffc7a3e804403dfbac65a18e00c5ab58568e66d05d1eb980fe08a52f1e8be05 WHIRLPOOL 1ba616b401f7d43a3afd0c62bc3a5835065560a8d5fa983af8da85f3d58ef32ab7b8e0b3ae07499bba2a3af4ff3b7d2b979de200768404750691421abe22d574
DIST libspatialite-4.3.0.tar.gz 4439538 SHA256 4acf2d2b891989e61351584fe28514a6561f8f6a1901b988990513be5fe1bdfe SHA512 b686766ed90711a41efbf219a8942ead8aefda8784a9cabc59233f107e0e10eda949d022152af1064a169975aa6a47515f6064589166418b853427dde5779ecc WHIRLPOOL ecb98596eae3468423de9921cc304c7299806d911be2bc10efdd38bb1d557cc6a5e70ad96e2268887b443879ca49fabd1b3ed747e440b464ac7f798f0ab2ae7c
DIST libspatialite-4.3.0a.tar.gz 4440660 SHA256 88900030a4762904a7880273f292e5e8ca6b15b7c6c3fb88ffa9e67ee8a5a499 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0 WHIRLPOOL 4d591b604d7f31a1cd52dbb8f375da0487404ec8f5bc4a38de8436134a126fae1028a0aef872cfd4ba6ce8a69aa1d4924768b2ceeed75a67999df4b3ddd4bda3
diff --git a/dev-db/spatialite/files/spatialite-4.1.1-validator.patch b/dev-db/spatialite/files/spatialite-4.1.1-validator.patch
deleted file mode 100644
index 55b2068959..0000000000
--- a/dev-db/spatialite/files/spatialite-4.1.1-validator.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/shapefiles/validator.c 2013-06-29 08:53:15.000000000 +0200
-+++ src/shapefiles/validatornew.c 2016-02-29 18:38:11.879981893 +0100
-@@ -3510,7 +3510,7 @@
-
- /* silencing stupid compiler warnings */
- if (sqlite == NULL || table == NULL || geom == NULL ||
-- ||report_path == NULL || n_rows == NULL || n_invalids == NULL)
-+ report_path == NULL || n_rows == NULL || n_invalids == NULL)
- table = NULL;
-
- if (err_msg == NULL)
diff --git a/dev-db/spatialite/spatialite-4.1.1.ebuild b/dev-db/spatialite/spatialite-4.1.1.ebuild
deleted file mode 100644
index 8e77a11fbc..0000000000
--- a/dev-db/spatialite/spatialite-4.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-inherit multilib eutils
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="http://www.gaia-gis.it/gaia-sins/"
-SRC_URI="http://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+geos iconv +proj +xls"
-
-RDEPEND=">=dev-db/sqlite-3.7.5:3[extensions(+)]
- geos? ( >=sci-libs/geos-3.3 )
- proj? ( sci-libs/proj )
- xls? ( dev-libs/freexl )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-validator.patch"
-}
-
-src_configure() {
- econf \
- --disable-static \
- --enable-geocallbacks \
- --enable-epsg \
- --disable-examples \
- $(use_enable geos) \
- $(use_enable geos geosadvanced) \
- $(use_enable iconv) \
- $(use_enable proj) \
- $(use_enable xls freexl)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/spatialite/spatialite-4.3.0.ebuild b/dev-db/spatialite/spatialite-4.3.0.ebuild
deleted file mode 100644
index 1dd7117b14..0000000000
--- a/dev-db/spatialite/spatialite-4.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-inherit multilib eutils
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="http://www.gaia-gis.it/gaia-sins/"
-SRC_URI="http://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+geos iconv +proj +xls"
-
-RDEPEND=">=dev-db/sqlite-3.7.5:3[extensions(+)]
- geos? ( >=sci-libs/geos-3.3 )
- proj? ( sci-libs/proj )
- xls? ( dev-libs/freexl )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- econf \
- --disable-static \
- --enable-geocallbacks \
- --enable-epsg \
- --disable-examples \
- $(use_enable geos) \
- $(use_enable geos geosadvanced) \
- $(use_enable iconv) \
- $(use_enable proj) \
- $(use_enable xls freexl)
-}
-
-src_install() {
- default
-
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/spatialite/, dev-db/spatialite/files/
@ 2025-02-10 9:14 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-02-10 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 1e5c143b1d6f57d4fc3c55bbe9aad3d2eb46c298
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Mon Jan 6 14:20:21 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 09:13:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5c143b
dev-db/spatialite: fix compile errors
Upstream forgot to:
1. remove usage of functions whose existence depends on USE=geos
2. add modern interfaces for PROJ.6+ in all places where fallback
to PROJ.4 existed.
Bug: https://bugs.gentoo.org/919177
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40009
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/spatialite-5.1.0-macro-surgery.patch | 80 ++++++++++++++++++++++
dev-db/spatialite/spatialite-5.1.0-r2.ebuild | 63 +++++++++++++++++
2 files changed, 143 insertions(+)
diff --git a/dev-db/spatialite/files/spatialite-5.1.0-macro-surgery.patch b/dev-db/spatialite/files/spatialite-5.1.0-macro-surgery.patch
new file mode 100644
index 000000000000..ea057f50bc8b
--- /dev/null
+++ b/dev-db/spatialite/files/spatialite-5.1.0-macro-surgery.patch
@@ -0,0 +1,80 @@
+https://bugs.gentoo.org/919177
+https://www.gaia-gis.it/fossil/libspatialite/tktview?name=d5c8f926be
+https://www.gaia-gis.it/fossil/libspatialite/tktview/af38159360a2e740b2339e279103bcdaf951498e
+Macro out things upstream forgot to conditionally exclude, macro in things upstream forgot
+In particular, functions that appear only when GEOM is enabled should not be used
+when GEOM is disabled, and having fallback for ancient version of PROJ is well and good;
+upstream forgot version for modern one in one place.
+--- a/src/gaiageo/gg_advanced.c
++++ b/src/gaiageo/gg_advanced.c
+@@ -2286,6 +2286,7 @@
+ / identifying toxic geometries
+ / i.e. geoms making GEOS to crash !!!
+ */
++#ifndef OMIT_GEOS /* don't do anything if there's no GEOS */
+ int ib;
+ gaiaPointPtr point;
+ gaiaLinestringPtr line;
+@@ -2350,6 +2351,7 @@
+ }
+ polyg = polyg->Next;
+ }
++#endif /* OMIT_GEOS */
+ return 0;
+ }
+
+@@ -2377,11 +2379,13 @@
+ return 0;
+ else
+ {
++#ifndef OMIT_GEOS /*can't report error if GEOS is not build, skipping */
+ if (cache != NULL)
+ gaiaSetGeosAuxErrorMsg_r (cache,
+ "gaia detected a not-closed Ring");
+ else
+ gaiaSetGeosAuxErrorMsg ("gaia detected a not-closed Ring");
++#endif
+ return 1;
+ }
+ }
+--- a/src/spatialite/spatialite.c
++++ b/src/spatialite/spatialite.c
+@@ -23472,9 +23472,11 @@
+ sqlite3_result_null (context);
+ else
+ {
++#ifndef OMIT_GEOS /* Only if GEOS enabled */
+ if (!gaiaInterpolatePoint (cache, line, point, &m_value))
+ sqlite3_result_null (context);
+ else
++#endif
+ sqlite3_result_double (context, m_value);
+ }
+ if (line != NULL)
+--- a/src/connection_cache/alloc_cache.c
++++ b/connection_cache/alloc_cache.c
+@@ -646,8 +646,12 @@
+ #endif
+
+ #else /* supporting old PROJ.4 */
++#ifdef PROJ_NEW /* PROJ.6* */
++ cache->PROJ_handle = proj_context_create ();
++#else
+ cache->PROJ_handle = pj_ctx_alloc ();
+ #endif
++#endif
+ #endif /* end PROJ.4 */
+
+ #ifdef ENABLE_RTTOPO /* initializing the RTTOPO context */
+@@ -706,7 +706,11 @@
+ #endif /* end GEOS */
+
+ #ifndef OMIT_PROJ /* initializing the PROJ.4 context */
++#ifndef PROJ_NEW /* Only in case where PROJ.5 not needed */
+ cache->PROJ_handle = pj_ctx_alloc ();
++#else /* PROJ.6* */
++ cache->PROJ_handle = proj_context_create ();
++#endif
+ #endif /* end PROJ.4 */
+
+ done:
diff --git a/dev-db/spatialite/spatialite-5.1.0-r2.ebuild b/dev-db/spatialite/spatialite-5.1.0-r2.ebuild
new file mode 100644
index 000000000000..edf57c760b1f
--- /dev/null
+++ b/dev-db/spatialite/spatialite-5.1.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool
+
+MY_PN="lib${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Complete Spatial DBMS in a nutshell built upon sqlite"
+HOMEPAGE="https://www.gaia-gis.it/gaia-sins/"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+geos iconv +proj rttopo test +xls"
+REQUIRED_USE="test? ( iconv )"
+# Further poking required
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-db/sqlite-3.7.5:3[extensions(+)]
+ dev-libs/libxml2
+ sys-libs/zlib[minizip]
+ geos? ( >=sci-libs/geos-3.11.0 )
+ proj? ( sci-libs/proj:= )
+ rttopo? ( sci-geosciences/librttopo )
+ xls? ( >=dev-libs/freexl-2.0.0[xml(+)] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-macro-surgery.patch" )
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+src_configure() {
+ # 1) gcp disabled for now to preserve MPL licence
+ econf \
+ --disable-gcp \
+ --disable-examples \
+ --disable-static \
+ --enable-epsg \
+ --enable-libxml2 \
+ $(use_enable geos) \
+ $(use_enable geos geosadvanced) \
+ $(use_enable geos geos3100) \
+ $(use_enable geos geos3110) \
+ $(use_enable iconv) \
+ $(use_enable proj) \
+ $(use_enable rttopo) \
+ $(use_enable xls freexl)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-10 9:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-10 9:14 [gentoo-commits] repo/gentoo:master commit in: dev-db/spatialite/, dev-db/spatialite/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 21:15 Andreas Sturmlechner
2016-02-29 18:25 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox