From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A2E6A1388C0 for ; Mon, 29 Feb 2016 18:25:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0339E07A0; Mon, 29 Feb 2016 18:25:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61AFDE07A0 for ; Mon, 29 Feb 2016 18:25:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D1D9340862 for ; Mon, 29 Feb 2016 18:25:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82E2216C4 for ; Mon, 29 Feb 2016 18:25:47 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1456770257.892a8848e5718e75f5d2c8ee3916421de173f023.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/spatialite/, dev-db/spatialite/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/spatialite/files/spatialite-4.1.1-validator.patch dev-db/spatialite/spatialite-4.1.1.ebuild X-VCS-Directories: dev-db/spatialite/ dev-db/spatialite/files/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: 892a8848e5718e75f5d2c8ee3916421de173f023 X-VCS-Branch: master Date: Mon, 29 Feb 2016 18:25:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ab5df3a-23b0-4a91-a635-7f37a544577a X-Archives-Hash: bbdd38af8340463a887772b27f2fd5d0 commit: 892a8848e5718e75f5d2c8ee3916421de173f023 Author: Amy Winston gentoo org> AuthorDate: Mon Feb 29 18:23:25 2016 +0000 Commit: Amy Winston gentoo 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) \