From 892a8848e5718e75f5d2c8ee3916421de173f023 Mon Sep 17 00:00:00 2001 From: Amy Winston Date: Mon, 29 Feb 2016 19:23:25 +0100 Subject: 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(-) create mode 100644 dev-db/spatialite/files/spatialite-4.1.1-validator.patch (limited to 'dev-db/spatialite') 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 000000000000..55b20689593d --- /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 c1c2e2dd7148..a052891f6e67 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) \ -- cgit v1.2.3-65-gdbad