dev-db/spatialite: validator patch added bug #571806

Package-Manager: portage-2.2.26

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 (file)
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 c1c2e2dd71483719de19c19ba7cffea02913d63e..a052891f6e67e3141253007f602dac001320282d 100644 (file)
--- 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) \