subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sci\-libs\/gdal\/files\/, sci\-libs\/gdal\/"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2023-11-21 Thread Andreas Sturmlechner

commit: 34ed053b36d0d8f3985ff95d1052bbe9eed3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 21 20:22:07 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 21 22:19:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ed053b

sci-libs/gdal: Fix build with dev-libs/libxml2-2.12.0

Closes: https://bugs.gentoo.org/917564
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gdal/files/gdal-3.8.0-libxml2-2.12-1.patch | 22 ++
 .../gdal/files/gdal-3.8.0-libxml2-2.12-2.patch | 27 ++
 sci-libs/gdal/gdal-3.8.0.ebuild|  1 +
 3 files changed, 50 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch 
b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch
new file mode 100644
index ..606dc3e05089
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch
@@ -0,0 +1,22 @@
+From cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Sat, 18 Nov 2023 15:38:46 +0100
+Subject: [PATCH] Fix build error with libxml2 2.12
+
+---
+ port/cpl_xml_validate.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp
+index 7eb49ff40c90..29070d957b65 100644
+--- a/port/cpl_xml_validate.cpp
 b/port/cpl_xml_validate.cpp
+@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const 
char *msg, ...)
+ 
+ if (strstr(pszStr, "since this namespace was already imported") == 
nullptr)
+ {
+-xmlErrorPtr pErrorPtr = xmlGetLastError();
++const xmlError *pErrorPtr = xmlGetLastError();
+ const char *pszFilename = static_cast(ctx);
+ char *pszStrDup = CPLStrdup(pszStr);
+ int nLen = static_cast(strlen(pszStrDup));

diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch 
b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch
new file mode 100644
index ..410b79e2ec15
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch
@@ -0,0 +1,27 @@
+From ec33f6d6dfe944f59dc5454d01b4d000d9479c02 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Sat, 18 Nov 2023 16:33:25 +0100
+Subject: [PATCH] Fix build error with libxml2 2.12 (cont'd)
+
+---
+ gcore/gdaljp2metadatagenerator.cpp | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gcore/gdaljp2metadatagenerator.cpp 
b/gcore/gdaljp2metadatagenerator.cpp
+index b6caa2db9def..751fa3d5e9dd 100644
+--- a/gcore/gdaljp2metadatagenerator.cpp
 b/gcore/gdaljp2metadatagenerator.cpp
+@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString 
,
+ //
+ 
+ static void GDALGMLJP2XPathErrorHandler(void * /* userData */,
+-xmlErrorPtr error)
++#if LIBXML_VERSION >= 21200
++const xmlError *error
++#else
++xmlErrorPtr error
++#endif
++)
+ {
+ if (error->domain == XML_FROM_XPATH && error->str1 != nullptr &&
+ error->int1 < static_cast(strlen(error->str1)))

diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild b/sci-libs/gdal/gdal-3.8.0.ebuild
index 8c8c20bcd12e..97cfa8eb4057 100644
--- a/sci-libs/gdal/gdal-3.8.0.ebuild
+++ b/sci-libs/gdal/gdal-3.8.0.ebuild
@@ -101,6 +101,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
+   "${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2022-10-09 Thread Andreas Sturmlechner

commit: 659e0cd464257436e25d3a9ec6cdfed30ccda2cb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  7 13:38:39 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  9 18:29:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659e0cd4

sci-libs/gdal: drop 3.4.1, 3.4.2-r2, 3.4.3-r1, 3.5.0-r3, 3.5.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest |   5 -
 sci-libs/gdal/files/gdal-2.2.3-soname.patch|  54 ---
 sci-libs/gdal/files/gdal-2.3.0-curl.patch  |  15 -
 sci-libs/gdal/files/gdal-3.3.0-libdir.patch| 392 -
 .../files/gdal-3.4.1-poppler-22.01.0-c++17.patch   |  23 --
 .../gdal/files/gdal-3.4.1-poppler-22.03.0.patch|  54 ---
 sci-libs/gdal/gdal-3.4.1.ebuild| 324 -
 sci-libs/gdal/gdal-3.4.2-r2.ebuild | 329 -
 sci-libs/gdal/gdal-3.4.3-r1.ebuild | 328 -
 sci-libs/gdal/gdal-3.5.0-r3.ebuild | 237 -
 sci-libs/gdal/gdal-3.5.1.ebuild| 238 -
 sci-libs/gdal/metadata.xml |   2 -
 12 files changed, 2001 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 81bf883857e0..b5eee757eae7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,10 +1,5 @@
-DIST gdal-3.4.1.tar.xz 13257288 BLAKE2B 
3b01e8345579c9d46fb3d4ff240f5b97cf13eb4b580ecc93044e0ca3d99e2d19fa2a2a52a2342b3158d67525a1de18a9ba77a2033ad891f73fee682b2c10cade
 SHA512 
a66362996f255cb75116693b4ee398337ec8b9699b5cd7fed90105f72832faa20750b77ebbc3e8d59ab72a23b35c4e4e78513cc803bd93e1b7846711ccfb5bff
-DIST gdal-3.4.2.tar.xz 13273280 BLAKE2B 
b40e2978d0841386b52de1ad08cec862c52aab8c015aecd58983bb8c5bbf8d86ca8e4ef5d2bbae39f421b3c78eecd0df1b3cd83d6bf25b1469563b4f9f37d8ca
 SHA512 
7b7e2800b2c23ffe6b7739fbf77748e3be2db9e34b061753da5e175f6ad6ed7f9f91856d3838f071a17a6afab96c258d37a15502e254d2008310d3061031af73
-DIST gdal-3.4.3.tar.xz 13275504 BLAKE2B 
5b1cc2be9c2af7a326dc532d547b1e7d2f9c4af32d8f16998f09332a88a53305243313711cc24fe5d028b8edc131ebccda6daf08b5c67d9a2c55fd4e04fe9cee
 SHA512 
2b97e44b9bd84eb43b4c4894b7b6e748522b2f5e8b6cbecc8247fe5ea862795dd44ba2b52934a83688a949805cee4eef9f1aa66360fb831fea3eae956ab0bef3
 DIST gdal-3.5.0-build-fixes-no-deps.patch.xz 5016 BLAKE2B 
0d0ef0ccae73f8a903b0ccbf992fa775b394df85a89d86f86ad60187bfce6a87eb8b23a573bd65c0173c0e7cffe3df447cef0fd5aebfcedfbed3e6a7716e
 SHA512 
e32c97e3fef948f2fa9c0f4b7116ccb231554e962380d7bebb433083926fb4e1902b0a3bc243f747c81c95813651153ce2751d8c2de4e8abb096778ffe589a2e
 DIST gdal-3.5.0.tar.xz 8826500 BLAKE2B 
7123ff4a7270b309d458e4a7bd32241cdef53953c305c5027873424794f4ed27d2a4838f86c42f9f84b5174ff499ee5539694c41e906509d21d899ccfe38ff99
 SHA512 
15d9675ffe5e76fdcb431bef1dce0ed8c23695f418186f37c63f4c7274322924095662bbbc95232d5b4d700704c1c4922d52b419cef5bb67f3bb64ee59654d8b
-DIST gdal-3.5.1.tar.xz 8844808 BLAKE2B 
38efbc69a386607b10fbe9d0add14716fec68a48c6df60f618c306a25d824b499c8dab6cc3d9f614b57e2e69352be860fbba683c58b5d82970a346aa9699f111
 SHA512 
d731b2b2bd5d300786e2e0eca296d302fda8bc9c76b41d7e78b728f82bb857c55a0d0ba65ae0ccd3b03c6b5812d0afee07940e4133b4b2c852a384c9fe00a8bc
 DIST gdal-3.5.2.tar.xz 8863680 BLAKE2B 
6d3277bde363abb202d8caa715af4d1b4b6d184c961502c9ee6d8367ac722329dc941def8b060c9ecd4f48e9561b60cc14a9cc633ba39ace8d02a2245ae2c5a4
 SHA512 
9515b6709bf3a32f800b38ebba41f1a475946aa7249f072ebe37af0aea896e2b834c9156151f94261366afa400870944fc394637b02e2fd69136af5171715d70
 DIST gdalautotest-3.5.0.tar 50442240 BLAKE2B 
15005f16530690e584e39b036881c339f147e525e3e0dc39b57d027c493ab89027baa2ea3a0ed148c8fa3ebb7cd53cdb4cf4d53c96d068b5a89caf28165e213b
 SHA512 
723c57425dd5f8acd61795be98b450844b5664b9940d47823829d510b8fb84d1d6db9ca880200d7732a83e7b0f1ae6e33269d8ebd91bf0e7d99e887b5f79aad0
-DIST gdalautotest-3.5.1.tar 51005440 BLAKE2B 
b6c927f35598a406c186fb834befb6941d3665f924dae77e69191e1190a74ba20153ddf14a5e9e9e0b65e70f3496a67ec9ab60fcfce5a62d8b71f5ed54fecc35
 SHA512 
50bcaf7dc63c8dc7209b3e6915f5cfd0e6fd6721bc741ac13ef13d485ac7ae4fbf2b59c0e856cbe73b5d9fd787da2859037bf9c3264953bb6fbc8dbbe3662308
 DIST gdalautotest-3.5.2.tar 51046400 BLAKE2B 
bd6f73b98548998d00b5631025abd2dc800c61a8afd16b63505cadd7fa46621c59f7be4eaee43d6cca9dd55684d17fc0e7e08c8540988f48af9e74c649f32dab
 SHA512 
92017d76dc9523b7e24c50dc54b1b1d8856cb4be8a3c8d4fc23bd8a5abaad46c758d606a743cfc30aa4c74a876f203ae105f7e06b66b2873d06de70c2edd1cc2

diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch 
b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
deleted file mode 100644
index 1fee41daeafc..
--- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Set SONAME and unbreak compilation on Darwin
-
-Author: Fabian Groffen 
-Author: Dennis Schridde 
-
 a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -97,6 +97,14 @@
- GDAL_SLIB

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2022-03-12 Thread Andreas Sturmlechner

commit: 6399fdc2f4348d9e14cf983fa1c3b24e7ec324ee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  7 16:41:08 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 12 15:52:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6399fdc2

sci-libs/gdal: Fix build with >=app-text/poppler-22.03.0

Closes: https://bugs.gentoo.org/834536
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gdal/files/gdal-3.4.1-poppler-22.03.0.patch| 54 ++
 sci-libs/gdal/gdal-3.4.1.ebuild|  4 +-
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch 
b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch
new file mode 100644
index ..94640e046a1b
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.03.0.patch
@@ -0,0 +1,54 @@
+From 17e98757e78969a199d1d6318f53d088da192191 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Fri, 18 Feb 2022 22:47:01 +0100
+Subject: [PATCH] PDF: fix build against Poppler > 22.2
+
+---
+ frmts/pdf/pdfdataset.cpp | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 22238bd74822..08f8e31c86a7 100644
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -4241,8 +4241,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+   if(bUseLib.test(PDFLIB_POPPLER))
+   {
+-GooString* poUserPwd = nullptr;
+-
+ static bool globalParamsCreatedByGDAL = false;
+ {
+ CPLMutexHolderD();
+@@ -4310,9 +4308,6 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ while( true )
+ {
+ VSIFSeekL(fp, 0, SEEK_SET);
+-if (pszUserPwd)
+-poUserPwd = new GooString(pszUserPwd);
+-
+ g_nPopplerErrors = 0;
+ if( globalParamsCreatedByGDAL )
+ registerErrorCallback();
+@@ -4322,10 +4317,20 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * 
poOpenInfo )
+ oObj.getObj()->initNull();
+ auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
+ #endif
++#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && 
POPPLER_MINOR_VERSION > 2)
++std::optional osUserPwd;
++if (pszUserPwd)
++osUserPwd = std::optional(pszUserPwd);
++poDocPoppler = new PDFDoc(poStream, std::optional(), 
osUserPwd);
++#else
++GooString* poUserPwd = nullptr;
++if (pszUserPwd)
++poUserPwd = new GooString(pszUserPwd);
+ poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
++delete poUserPwd;
++#endif
+ if( globalParamsCreatedByGDAL )
+ registerErrorCallback();
+-delete poUserPwd;
+ if( g_nPopplerErrors >= MAX_POPPLER_ERRORS )
+ {
+ PDFFreeDoc(poDocPoppler);

diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild
index d78b7ddda904..904b9e2d0280 100644
--- a/sci-libs/gdal/gdal-3.4.1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -12,9 +12,8 @@ DESCRIPTION="Translator library for raster geospatial data 
formats (includes OGR
 HOMEPAGE="https://gdal.org/;
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
 
-# subslot is libgdal.so.
-SLOT="0/30"
 LICENSE="BSD Info-ZIP MIT"
+SLOT="0/30" # subslot is libgdal.so.
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux 
~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse 
cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma 
mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python 
spatialite sqlite threads webp xls zstd"
 
@@ -92,6 +91,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-3.3.0-libdir.patch"
"${FILESDIR}/${P}-poppler-22.01.0-c++17.patch"
+   "${FILESDIR}/${P}-poppler-22.03.0.patch" # bug 834536
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2022-01-10 Thread Sam James

commit: 5f490d3e5588fb52ccf6fd5ccc57630be75dc1e4
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 10 23:18:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 10 23:18:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f490d3e

sci-libs/gdal: fix build with Poppler 22.01.0 (build with C++ 17)

Closes: https://bugs.gentoo.org/830883
Signed-off-by: Sam James  gentoo.org>

 .../files/gdal-3.4.1-poppler-22.01.0-c++17.patch   | 23 ++
 sci-libs/gdal/gdal-3.4.1.ebuild|  1 +
 2 files changed, 24 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch 
b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch
new file mode 100644
index ..dac3bd3776d9
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/830883
+https://github.com/OSGeo/gdal/commit/3f528f2b5f9244698c89d31b74155765538ef362
+
+From: Even Rouault 
+Date: Sat, 8 Jan 2022 14:25:09 +0100
+Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes
+ #5071)
+
+--- a/frmts/pdf/GNUmakefile
 b/frmts/pdf/GNUmakefile
+@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle
+ endif
+ 
+ ifeq ($(HAVE_POPPLER),yes)
++# Poppler 2022.1 requires c++17
++ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0)
++CXX := $(subst -std=c++11,,${CXX})
++CXX := $(subst -std=c++14,,${CXX})
++CXX := ${CXX} -std=c++17
++endif
+ CPPFLAGS +=  -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) 
-DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION)
+ endif
+ 

diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild
index 4967e5533a3b..56d451eed723 100644
--- a/sci-libs/gdal/gdal-3.4.1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+   "${FILESDIR}/${P}-poppler-22.01.0-c++17.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2021-10-02 Thread Andreas Sturmlechner

commit: 916960e6b70b9d89d19cd9602a4b610d8597c3a5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct  2 12:32:46 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct  2 12:58:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916960e6

sci-libs/gdal: Fix build with app-text/poppler-21.10.0

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gdal/files/gdal-3.3.2-poppler-21.10.0.patch| 32 ++
 sci-libs/gdal/gdal-3.3.2.ebuild|  1 +
 2 files changed, 33 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch 
b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
new file mode 100644
index 000..a727d21dab6
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
@@ -0,0 +1,32 @@
+From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Sun, 26 Sep 2021 22:49:52 +0200
+Subject: [PATCH] Fix build against Poppler master
+
+---
+ frmts/pdf/pdfdataset.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 9c4c28a6572..50a8154c756 100644
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+   if (bUseLib.test(PDFLIB_POPPLER))
+   {
+-GooString* poMetadata = poCatalogPoppler->readMetadata();
++auto poMetadata = poCatalogPoppler->readMetadata();
+ if (poMetadata)
+ {
+ #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ const char * const apszMDList[2] = { pszContent, nullptr };
+ poDS->SetMetadata(const_cast(apszMDList), "xml:XMP");
+ }
++#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && 
POPPLER_MINOR_VERSION <= 9))
+ delete poMetadata;
++#endif
+ }
+ 
+ /* Read Info object */

diff --git a/sci-libs/gdal/gdal-3.3.2.ebuild b/sci-libs/gdal/gdal-3.3.2.ebuild
index 5a7c010cdbf..216917c266d 100644
--- a/sci-libs/gdal/gdal-3.3.2.ebuild
+++ b/sci-libs/gdal/gdal-3.3.2.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+   "${FILESDIR}/${P}-poppler-21.10.0.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2021-05-27 Thread Sam James

commit: 7db9d431bcdf4ec1cf079d3d3f271dddbe68208a
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 03:44:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 28 03:47:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db9d431

sci-libs/gdal: add 3.3.0

Signed-off-by: Sam James  gentoo.org>

 sci-libs/gdal/Manifest |   1 +
 .../files/gdal-3.3.0-configure-geos-disable.patch  | 187 ++
 sci-libs/gdal/files/gdal-3.3.0-libdir.patch| 392 +
 sci-libs/gdal/gdal-3.3.0.ebuild| 317 +
 4 files changed, 897 insertions(+)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e23b24d8734..a5e15147c50 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,4 @@
 DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B 
b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6
 SHA512 
152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
 DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 
001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1
 SHA512 
d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5
 DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 
9f2ac15b7e9d2df0393d15734030ec4777579aa01fcf2700958228b24fd50d574f3bd438c03e767549614a699c362b31f38cbb0f32ceb8056c9b55fab11ecfec
 SHA512 
985a058a53f676f7d49a96d1a48d4f93c5da8548012bf81345afde03d8044022b210484290bca70c3d7a1ef3b0087d9e17c636b5badd1e0816c1f59b1bf21ee8
+DIST gdal-3.3.0.tar.gz 19572446 BLAKE2B 
afc7ce3c2191fb7607fdf3a01e7ed3e83c601fa063019015f666e0c550e4e42129b8782568f20f97422308f95b4e5c3dbd2311d562b7ec0830635e47e7c931b4
 SHA512 
39505c07aaf4dac587a189a979462101a7acba41e8732031540ebad02e089820658943ebb48c20f4ea56548363033b2db2f03f41c8a91ff5c5997a19b5eb999e

diff --git a/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch 
b/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
new file mode 100644
index 000..1671845707a
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
@@ -0,0 +1,187 @@
+https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6.patch
+https://github.com/OSGeo/gdal/issues/3782
+
+From b414b0a0594b3e9c175a001e8455819463039eb6 Mon Sep 17 00:00:00 2001
+From: Thomas Bonfort 
+Date: Tue, 4 May 2021 08:13:45 +0200
+Subject: [PATCH] configure: fix explicit disabling of geos/sfcgal
+--- a/configure
 b/configure
+@@ -38323,6 +38323,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" 
>&5
+ $as_echo "GEOS support disabled" >&6; }
+ GEOS_CONFIG=no
++HAVE_GEOS=no
+ 
+   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
+ 
+@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your 
system, but the library could
+ 
+   else
+ 
+-if test $ac_geos_config_auto = "no" ; then
++if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
+   as_fn_error $? "GEOS support explicitly enabled, but geos-config could 
not be found" "$LINENO" 5
+ fi
+ 
+   fi
+ 
+-HAVE_GEOS_RESULT="no"
+ if test "${HAVE_GEOS}" = "yes" ; then
+-
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS 
$GEOS_VERSION" >&5
+ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
+ 
+@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" 
>&6;}
+ 
+   GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
+   LIBS="${GEOS_LIBS} ${LIBS}"
+-  HAVE_GEOS_RESULT="yes"
+ fi
+ 
+ 
+@@ -38625,6 +38623,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" 
>&5
+ $as_echo "SFCGAL support disabled" >&6; }
++HAVE_SFCGAL=no
+ SFCGAL_CONFIG=no
+ 
+   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
+@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your 
system, but the library coul
+ 
+   else
+ 
+-if test $ac_sfcgal_config_auto = "no" ; then
++if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
+   as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config 
could not be found" "$LINENO" 5
+ fi
+ 
+   fi
+ 
+-HAVE_SFCGAL_RESULT="no"
+ if test "${HAVE_SFCGAL}" = "yes" ; then
+-
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL 
$SFCGAL_VERSION" >&5
+ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
+ 
+@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL 
$SFCGAL_VERSION" >&6;}
+ 
+   SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
+   LIBS="${SFCGAL_LIBS} ${LIBS}"
+-  HAVE_SFCGAL_RESULT="yes"
+ fi
+ 
+ 
+@@ -44998,7 +44994,7 @@ echo "  FreeXL support:${HAVE_FREEXL}"
+ echo "  GEORASTER support:

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2020-04-13 Thread Andreas Sturmlechner

commit: 7f343fdd68ff4def7e6083fa14258b14867e04e4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 12 21:38:48 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 13 09:21:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f343fdd

sci-libs/gdal: Drop 2.4.1-r1 and 2.4.3

Bug: https://bugs.gentoo.org/699838
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest |   2 -
 sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch |  12 -
 sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch  | 148 --
 sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch  |  24 --
 sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch  |  53 
 .../gdal/files/gdal-2.4.1-poppler-0.83-1.patch |  27 --
 .../gdal/files/gdal-2.4.1-poppler-0.83-2.patch |  42 ---
 sci-libs/gdal/files/gdal-2.4.1-swig-4.patch| 115 
 sci-libs/gdal/gdal-2.4.1-r1.ebuild | 322 -
 sci-libs/gdal/gdal-2.4.3.ebuild| 319 
 10 files changed, 1064 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 609a40b66c9..db4e5d1e319 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1 @@
-DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 
92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61
 SHA512 
b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 
104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5
 SHA512 
e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 
1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364
 SHA512 
bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9

diff --git a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch 
b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
deleted file mode 100644
index 620b05fecbd..000
--- a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fixes Gentoo-bug #641866
-
 a/scripts/GNUmakefile
-+++ b/scripts/GNUmakefile
-@@ -6,5 +6,5 @@
- install:
-   if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config 
--variable=compatdir bash-completion`" != "x"; then \
--  $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config 
--variable=compatdir bash-completion` ; \
--  cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config 
--variable=compatdir bash-completion`; \
-+  $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=completionsdir 
bash-completion` ; \
-+  cp gdal-bash-completion.sh $(DESTDIR)`pkg-config 
--variable=completionsdir bash-completion`/gdal.sh; \
-   fi

diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch 
b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
deleted file mode 100644
index 49824022b3b..000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 5c12d11614a325317ceaa7c0567070b3e4188275 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Tue, 26 Mar 2019 12:43:59 +0100
-Subject: [PATCH] Add support for Poppler 0.75.0 (fixes #1388)
-

- gdal/frmts/pdf/pdfio.h   |  5 ---
- gdal/frmts/pdf/pdfobject.cpp | 59 
- 2 files changed, 12 insertions(+), 52 deletions(-)
-
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index 7ae15c88aa3..ec13b8fe94c 100644
 a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public BaseStream
- virtual void   close() override;
- 
- private:
--/* getChars/hasGetChars added in poppler 0.15.0
-- * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
-- * This test will be wrong for poppler 0.15 or 0.16,
-- * but will still compile correctly.
-- */
- virtual GBool hasGetChars() override;
- virtual int getChars(int nChars, Guchar *buffer) override;
- 
-diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
 a/frmts/pdf/pdfobject.cpp
-+++ b/frmts/pdf/pdfobject.cpp
-@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* 
pszKey)
- return oIter->second;
- 
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
--Object o = m_poDict->lookupNF(((char*)pszKey));
-+auto&& o(m_poDict->lookupNF(((char*)pszKey)));
- if (!o.isNull())
- {
- int nRefNum = 0;
-@@

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2019-12-25 Thread Andreas Sturmlechner

commit: cafa6007bf77dd0cd210ed9aeecd9e47053a9223
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 25 20:42:13 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 25 20:46:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafa6007

sci-libs/gdal: Fix build with app-text/poppler-0.83.0

Closes: https://bugs.gentoo.org/703790
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gdal/files/gdal-2.4.1-poppler-0.83-1.patch | 27 ++
 .../gdal/files/gdal-2.4.1-poppler-0.83-2.patch | 42 ++
 sci-libs/gdal/gdal-2.4.1-r2.ebuild |  1 +
 3 files changed, 70 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch 
b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
new file mode 100644
index 000..f077f463238
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
@@ -0,0 +1,27 @@
+From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Wed, 13 Nov 2019 14:07:22 +0100
+Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 8f944c40d30..88017953de5 100644
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo 
)
+ CPLMutexHolderD();
+ /* poppler global variable */
+ if (globalParams == nullptr)
++{
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
++globalParams.reset(new GlobalParams());
++#else
+ globalParams = new GlobalParams();
++#endif
++}
+ 
+ globalParams->setPrintCommands(CPLTestBool(
+ CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));

diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch 
b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
new file mode 100644
index 000..74614e925f6
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
@@ -0,0 +1,42 @@
+From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Tue, 26 Nov 2019 14:33:32 +0100
+Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev)
+
+---
+ gdal/frmts/pdf/pdfio.cpp | 3 +++
+ gdal/frmts/pdf/pdfio.h   | 7 ++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
+index 917e92330ae..c0b9dad93cb 100644
+--- a/frmts/pdf/pdfio.cpp
 b/frmts/pdf/pdfio.cpp
+@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
+ //
+ 
+ StreamKind VSIPDFFileStream::getKind()
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
++const
++#endif
+ {
+ return strFile;
+ }
+diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
+index aa34ab7210d..23344d33f77 100644
+--- a/frmts/pdf/pdfio.h
 b/frmts/pdf/pdfio.h
+@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
+ virtual void   setPos(setPos_offset_type pos, int dir = 0) 
override;
+ virtual void   moveStart(moveStart_delta_type delta) override;
+ 
+-virtual StreamKind getKind() override;
++virtual StreamKind getKind()
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
++const
++#endif
++override;
++
+ virtual GooString *getFileName() override;
+ 
+ virtual intgetChar() override;

diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild 
b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
index fa26cc48e93..897a9cf41ae 100644
--- a/sci-libs/gdal/gdal-2.4.1-r2.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
"${FILESDIR}/${P}-poppler-0.76.patch"
"${FILESDIR}/${P}-swig-4.patch" # bug 689110
"${FILESDIR}/${P}-poppler-0.82.patch"
+   "${FILESDIR}"/${P}-poppler-0.83-{1,2}.patch # bug 703790
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2019-11-01 Thread Andreas Sturmlechner

commit: 069b69a6097d8e2e6e9f62cd93efd9edcad725f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  1 18:52:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  1 18:52:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069b69a6

sci-libs/gdal: Fix build with poppler-0.82.0

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch | 53 +++
 sci-libs/gdal/gdal-2.4.1-r1.ebuild|  1 +
 2 files changed, 54 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch 
b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
new file mode 100644
index 000..740856814f8
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
@@ -0,0 +1,53 @@
+From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Tue, 22 Oct 2019 13:11:57 +0200
+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 15537ca7fd7..8f944c40d30 100644
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
+ virtual void drawChar(GfxState *state, double x, double y,
+   double dx, double dy,
+   double originX, double originY,
+-  CharCode code, int nBytes, Unicode *u, int 
uLen) override
++  CharCode code, int nBytes,
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
++  const
++#endif
++  Unicode *u, int uLen) override
+ {
+ if (bEnableText)
+ SplashOutputDev::drawChar(state, x, y, dx, dy,
+From 94daceefebd46485ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Sun, 29 Sep 2019 23:55:18 +0200
+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 3d68f92abe8..b3db5374227 100644
+--- a/frmts/pdf/pdfdataset.cpp
 b/frmts/pdf/pdfdataset.cpp
+@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
+ 
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+int width, int height, GfxImageColorMap 
*colorMap,
+-   GBool interpolate, int *maskColors, GBool 
inlineImg) override
++   GBool interpolate,
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
++   const
++#endif
++   int *maskColors,
++   GBool inlineImg) override
+ {
+ if (bEnableBitmap)
+ SplashOutputDev::drawImage(state, ref, str,

diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild 
b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
index 2c9beae3deb..db767c561b7 100644
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
"${FILESDIR}/${P}-poppler-0.75.patch"
"${FILESDIR}/${P}-poppler-0.76.patch"
"${FILESDIR}/${P}-swig-4.patch" # bug 689110
+   "${FILESDIR}/${P}-poppler-0.82.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2019-07-14 Thread Andreas Sturmlechner

commit: dd8c4c7ef1317f981fd118b9177de1d1aa31dcae
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sat Jul 13 19:06:25 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 15 05:36:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd8c4c7e

sci-libs/gdal: fix build with enabled python use flag

Closes: https://bugs.gentoo.org/689110
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Conrad Kostecki  kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12441
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/files/gdal-2.4.1-swig-4.patch | 115 ++
 sci-libs/gdal/gdal-2.4.1-r1.ebuild  | 321 
 2 files changed, 436 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch 
b/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
new file mode 100644
index 000..9d104e60f60
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
@@ -0,0 +1,115 @@
+From 7a2c9f9348e1bf6bd95033d0b4da09a243fd9e6d Mon Sep 17 00:00:00 2001
+From: Even Rouault 
+Date: Mon, 8 Jul 2019 14:34:55 +0200
+Subject: [PATCH] Python bindings: add compatibility with SWIG 4.0 (based on
+ patch by @perestoronin, fixes #1702)
+
+---
+ gdal/swig/include/gdal_array.i  |  6 ++
+ gdal/swig/include/python/typemaps_python.i  |  9 -
+ gdal/swig/python/extensions/gdal_array_wrap.cpp | 15 ++-
+ gdal/swig/python/extensions/gdal_wrap.cpp   |  9 -
+ 4 files changed, 36 insertions(+), 3 deletions(-)
+
+diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
+index c4f6f19b610..bf053eb2476 100644
+--- a/swig/include/gdal_array.i
 b/swig/include/gdal_array.i
+@@ -899,12 +899,18 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject 
*psArray)
+ }
+ 
+ /* Keep a reference to the VirtualMem object */
++%#if SWIGVERSION >= 0x04
++%#define obj0 swig_obj[0]
++%#endif
+ %#if NPY_API_VERSION >= 0x0007
+ PyArray_SetBaseObject(ar, obj0);
+ %#else
+ PyArray_BASE(ar) = obj0;
+ %#endif
+ Py_INCREF(obj0);
++%#if SWIGVERSION >= 0x04
++%#undef obj0
++%#endif
+ Py_DECREF($result);
+ $result = (PyObject*) ar;
+ }
+diff --git a/swig/include/python/typemaps_python.i 
b/swig/include/python/typemaps_python.i
+index 5c9f36ab278..9266422e9c4 100644
+--- a/swig/include/python/typemaps_python.i
 b/swig/include/python/typemaps_python.i
+@@ -2104,7 +2104,14 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int 
nCount, double *x, double *
+ %#if PY_VERSION_HEX >= 0x0207
+   /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, 
int* preadonly)*/
+   Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
+-  if (PyBuffer_FillInfo(buf,  obj0,  *($1), *($2), *($4), PyBUF_ND)) {
++
++  if (PyBuffer_FillInfo(buf,
++%#if SWIGVERSION >= 0x04
++swig_obj[0],
++%#else
++obj0,
++%#endif
++*($1), *($2), *($4), PyBUF_ND)) {
+ // error, handle
+   }
+   if( *($3) == GDT_Byte )
+diff --git a/swig/python/extensions/gdal_array_wrap.cpp 
b/swig/python/extensions/gdal_array_wrap.cpp
+index 807e12dd4a0..4435803e6d9 100644
+--- a/swig/python/extensions/gdal_array_wrap.cpp
 b/swig/python/extensions/gdal_array_wrap.cpp
+@@ -4598,7 +4598,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject 
*SWIGUNUSEDPARM(self), Py
+ #if PY_VERSION_HEX >= 0x0207
+ /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* 
pdatatype, int* preadonly)*/
+ Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
+-if (PyBuffer_FillInfo(buf,  obj0,  *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
++
++if (PyBuffer_FillInfo(buf,
++#if SWIGVERSION >= 0x04
++swig_obj[0],
++#else
++obj0,
++#endif
++*(arg2), *(arg3), *(arg5), PyBUF_ND)) {
+   // error, handle
+ }
+ if( *(arg4) == GDT_Byte )
+@@ -5597,12 +5604,18 @@ SWIGINTERN PyObject *_wrap_VirtualMemGetArray(PyObject 
*SWIGUNUSEDPARM(self), Py
+ }
+ 
+ /* Keep a reference to the VirtualMem object */
++#if SWIGVERSION >= 0x04
++#define obj0 swig_obj[0]
++#endif
+ #if NPY_API_VERSION >= 0x0007
+ PyArray_SetBaseObject(ar, obj0);
+ #else
+ PyArray_BASE(ar) = obj0;
+ #endif
+ Py_INCREF(obj0);
++#if SWIGVERSION >= 0x04
++#undef obj0
++#endif
+ Py_DECREF(resultobj);
+ resultobj = (PyObject*) ar;
+   }
+diff --git a/swig/python/extensions/gdal_wrap.cpp 
b/swig/python/extensions/gdal_wrap.cpp
+index 37cb635339e..f2f014fd0b5 100644
+--- a/swig/python/extensions/gdal_wrap.cpp
 b/swig/python/extensions/gdal_wrap.cpp
+@@ -15238,7 +15238,14 @@ SWIGINTERN PyObject 
*_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
+ #if PY_VERSION_HEX >= 0x0207
+ /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* 
pdatatype, int* preadonly)*/
+ Py_buffer

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2019-06-12 Thread Andreas Sturmlechner

commit: e0d7c6e5e8fa39d87e399460567bd8a405e400a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 12 10:00:09 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 12 10:02:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d7c6e5

sci-libs/gdal: Drop 2.4.0

Broken by current stable poppler.

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest |   1 -
 .../gdal/files/gdal-2.3.1-poppler-0.72.0.patch |  58 
 .../gdal/files/gdal-2.3.1-poppler-0.73.0.patch |  35 ---
 sci-libs/gdal/gdal-2.4.0.ebuild| 323 -
 4 files changed, 417 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 9c6acf61b8c..a20b22bcb90 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1 @@
-DIST gdal-2.4.0.tar.gz 14533664 BLAKE2B 
ec10a4a9ba438a758131c1b80286b27ee17f1f270e77af61d70ed4149d63b9224c98db9c55156075ebd86b5f0875c626d87df3779f0b981895ff1c00786f908e
 SHA512 
9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 
92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61
 SHA512 
b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483

diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch 
b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
deleted file mode 100644
index 3302df9100d..000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b471814ef406582f2b1bc0aabbe430c0026608c7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sat, 12 Jan 2019 17:21:54 +0100
-Subject: [PATCH] Fix build with poppler-0.72.0
-
-Non-upstreamable patch that breaks backward compatibility.

- frmts/pdf/pdfdataset.cpp | 4 ++--
- frmts/pdf/pdfobject.cpp  | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 84fe1fe..38b8c30 100644
 a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -3459,7 +3459,7 @@ void PDFDataset::FindLayersPoppler()
- #endif
- if( ocg != nullptr && ocg->getName() != nullptr )
- {
--const char* pszLayerName = (const 
char*)ocg->getName()->getCString();
-+const char* pszLayerName = (const 
char*)ocg->getName()->c_str();
- AddLayer(pszLayerName);
- oLayerOCGMapPoppler[pszLayerName] = ocg;
- }
-@@ -4787,7 +4787,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo 
)
- GooString* poMetadata = poCatalogPoppler->readMetadata();
- if (poMetadata)
- {
--const char* pszContent = poMetadata->getCString();
-+const char* pszContent = poMetadata->c_str();
- if (pszContent != nullptr &&
- STARTS_WITH(pszContent, "getString();
- #endif
--return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast(gooString->getCString()),
-+return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast(gooString->c_str()),
-   
static_cast(gooString->getLength(;
- }
- else
-@@ -1422,7 +1422,7 @@ char* GDALPDFStreamPoppler::GetBytes()
- char* pszContent = (char*) VSIMalloc(m_nLength + 1);
- if (pszContent)
- {
--memcpy(pszContent, gstr->getCString(), m_nLength);
-+memcpy(pszContent, gstr->c_str(), m_nLength);
- pszContent[m_nLength] = '\0';
- }
- delete gstr;
--- 
-2.20.1
-

diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch 
b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
deleted file mode 100644
index 8529d99e735..000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 77ea05388924fcf2a8c9fd4a777c97e4d69f5e17 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Wed, 16 Jan 2019 20:52:59 +0100
-Subject: [PATCH] Fix build with poppler-0.73
-

- gdal/frmts/pdf/pdfsdk_headers.h | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
-index 9150b0f410..574943b41f 100644
 a/frmts/pdf/pdfsdk_headers.h
-+++ b/frmts/pdf/pdfsdk_headers.h
-@@ -50,7 +50,6 @@
- #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', 
possible loss of data */
- #endif
- 
--#include 
- #include 
- 
- /* begin of poppler xpdf includes */
-@@ -79,6 +78,10 @@
- 
- /* end of poppler xpdf includes */
- 
-+/* poppler-0.73 compatibility */
-+#define Guchar unsigned char
-+#define Guint unsigned int
-+
- #ifdef _MSC_VER

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2019-05-19 Thread Andreas Sturmlechner

commit: e1ee563d35d85e2ded85e14b200f45de464e7a29
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 19 20:11:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 19 20:55:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ee563d

sci-libs/gdal: Drop 2.3.1

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gdal/Manifest |   1 -
 .../gdal/files/gdal-2.3.1-poppler-0.69.0.patch | 301 ---
 .../gdal/files/gdal-2.3.1-poppler-0.71.0.patch |  82 --
 sci-libs/gdal/gdal-2.3.1.ebuild| 326 -
 4 files changed, 710 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e439b182d20..9c6acf61b8c 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,2 @@
-DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 
226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7
 SHA512 
0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 DIST gdal-2.4.0.tar.gz 14533664 BLAKE2B 
ec10a4a9ba438a758131c1b80286b27ee17f1f270e77af61d70ed4149d63b9224c98db9c55156075ebd86b5f0875c626d87df3779f0b981895ff1c00786f908e
 SHA512 
9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 
92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61
 SHA512 
b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483

diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch 
b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
deleted file mode 100644
index a89970074b0..000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Fri, 12 Oct 2018 19:02:40 +0200
-Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004)
-

- GDALmake.opt.in  |  1 +
- configure| 61 ++-
- configure.ac | 56 +++-
- frmts/pdf/GNUmakefile|  4 +++
- frmts/pdf/makefile.vc|  6 +++-
- frmts/pdf/pdfdataset.cpp | 12 +++
- nmake.opt|  2 ++
- 7 files changed, 111 insertions(+), 31 deletions(-)
-
-diff --git a/GDALmake.opt.in b/GDALmake.opt.in
-index 30749ae982a..f9ab41fd124 100644
 a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -481,6 +481,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS = 
@POPPLER_BASE_STREAM_HAS_TWO_ARGS@
- POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
- POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
- POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
-+POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
- POPPLER_INC = @POPPLER_INC@
- POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
- 
-diff --git a/configure b/configure
-index 050bc79ac97..a8472ba8c2d 100755
 a/configure
-+++ b/configure
-@@ -669,6 +669,7 @@ PODOFO_INC
- HAVE_PODOFO
- POPPLER_PLUGIN_LIB
- POPPLER_INC
-+POPPLER_0_69_OR_LATER
- POPPLER_0_58_OR_LATER
- POPPLER_0_23_OR_LATER
- POPPLER_0_20_OR_LATER
-@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
- POPPLER_0_20_OR_LATER=no
- POPPLER_0_23_OR_LATER=no
- POPPLER_0_58_OR_LATER=no
-+POPPLER_0_69_OR_LATER=no
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
- $as_echo_n "checking for poppler... " >&6; }
-@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; }
- 
- CHECK_OTHER_POPPLER_VERSION=yes
- 
--# And now we check if we have Poppler >= 0.58.0
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have 
new API (>= 0.58.0)" >&5
-+if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if 
OptionalContent has API >= 0.69.0" >&5
-+$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
-+rm -f testpoppler.*
-+echo '#include ' > testpoppler.cpp
-+echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
-+echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
-+echo 'ocg.getOCGs().size();' >> testpoppler.cpp
-+echo 'return 0; }' >> testpoppler.cpp
-+if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c 
${POPPLER_INC} 2>&1`" ; then
-+POPPLER_0_69_OR_LATER=yes
-+POPPLER_0_58_OR_LATER=yes
-+POPPLER_0_23_OR_LATER=yes
-+POPPLER_0_20_OR_LATER=yes
-+POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-+POPPLER_HAS_OPTCONTENT=yes
-+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2019-01-16 Thread Andreas Sturmlechner

commit: 1da4ee6b2a34b6802387a67583960a84f946ae53
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 16 20:00:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 16 20:01:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da4ee6b

sci-libs/gdal: Fix build with poppler-0.73

Closes: https://bugs.gentoo.org/675450
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gdal/files/gdal-2.3.1-poppler-0.73.0.patch | 35 ++
 sci-libs/gdal/gdal-2.3.1.ebuild|  2 ++
 2 files changed, 37 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch 
b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
new file mode 100644
index 000..8529d99e735
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
@@ -0,0 +1,35 @@
+From 77ea05388924fcf2a8c9fd4a777c97e4d69f5e17 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Wed, 16 Jan 2019 20:52:59 +0100
+Subject: [PATCH] Fix build with poppler-0.73
+
+---
+ gdal/frmts/pdf/pdfsdk_headers.h | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
+index 9150b0f410..574943b41f 100644
+--- a/frmts/pdf/pdfsdk_headers.h
 b/frmts/pdf/pdfsdk_headers.h
+@@ -50,7 +50,6 @@
+ #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', 
possible loss of data */
+ #endif
+ 
+-#include 
+ #include 
+ 
+ /* begin of poppler xpdf includes */
+@@ -79,6 +78,10 @@
+ 
+ /* end of poppler xpdf includes */
+ 
++/* poppler-0.73 compatibility */
++#define Guchar unsigned char
++#define Guint unsigned int
++
+ #ifdef _MSC_VER
+ #pragma warning( pop )
+ #endif
+-- 
+2.20.1
+

diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 7af0dee0851..9f81394be02 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -122,6 +122,8 @@ src_prepare() {
 
# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
has_version ">=app-text/poppler-0.72.0" && eapply 
"${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+   # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16:
+   has_version ">=app-text/poppler-0.73.0" && eapply 
"${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
 
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2018-01-16 Thread Andreas Sturmlechner

commit: 9c5c5ae1907d3c28ea98dc872bbd96935e8dd2ff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 20:23:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 20:24:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5c5ae1

sci-libs/gdal: Fix bash_completion install path

Closes: https://bugs.gentoo.org/641866
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch |  12 +
 sci-libs/gdal/gdal-2.2.3-r1.ebuild | 287 +
 2 files changed, 299 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch 
b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
new file mode 100644
index 000..620b05fecbd
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
@@ -0,0 +1,12 @@
+Fixes Gentoo-bug #641866
+
+--- a/scripts/GNUmakefile
 b/scripts/GNUmakefile
+@@ -6,5 +6,5 @@
+ install:
+   if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config 
--variable=compatdir bash-completion`" != "x"; then \
+-  $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config 
--variable=compatdir bash-completion` ; \
+-  cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config 
--variable=compatdir bash-completion`; \
++  $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=completionsdir 
bash-completion` ; \
++  cp gdal-bash-completion.sh $(DESTDIR)`pkg-config 
--variable=completionsdir bash-completion`/gdal.sh; \
+   fi

diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild 
b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
new file mode 100644
index 000..900a8c7a129
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic 
java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes 
OGR support)"
+HOMEPAGE="http://www.gdal.org/;
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
+
+SLOT="0/2.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg 
jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python 
spatialite sqlite threads webp xls"
+
+COMMON_DEPEND="
+   dev-libs/expat
+   dev-libs/json-c:=
+   dev-libs/libpcre
+   dev-libs/libxml2:=
+   media-libs/tiff:0=
+   sci-libs/libgeotiff
+   sys-libs/zlib:=[minizip(+)]
+   armadillo? ( sci-libs/armadillo:=[lapack] )
+   curl? ( net-misc/curl )
+   fits? ( sci-libs/cfitsio:= )
+   geos? ( >=sci-libs/geos-2.2.1 )
+   gif? ( media-libs/giflib:= )
+   gml? ( >=dev-libs/xerces-c-3.1 )
+   hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   mdb? ( dev-java/jackcess:1 )
+   mysql? ( virtual/mysql )
+   netcdf? ( sci-libs/netcdf:= )
+   odbc? ( dev-db/unixODBC )
+   ogdi? ( sci-libs/ogdi )
+   opencl? ( virtual/opencl )
+   oracle? ( dev-db/oracle-instantclient:= )
+   pdf? ( >=app-text/poppler-0.24.3:= )
+   perl? ( dev-lang/perl:= )
+   png? ( media-libs/libpng:0= )
+   postgres? ( >=dev-db/postgresql-8.4:= )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   spatialite? ( dev-db/spatialite )
+   sqlite? ( dev-db/sqlite:3 )
+   webp? ( media-libs/libwebp:= )
+   xls? ( dev-libs/freexl )"
+
+RDEPEND="${COMMON_DEPEND}
+   java? ( >=virtual/jre-1.7:* )"
+
+DEPEND="${COMMON_DEPEND}
+   app-shells/bash-completion
+   doc? ( app-doc/doxygen )
+   java? ( >=virtual/jdk-1.7:* )
+   perl? ( dev-lang/swig:0 )
+   python? (
+   dev-lang/swig:0
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )"
+
+REQUIRED_USE="
+   mdb? ( java )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   spatialite? ( sqlite )
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-soname.patch"
+   "${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
+   "${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
+)
+
+src_prepare() {
+   # fix datadir and docdir placement
+   sed -e "s:@datadir@:@datadir@/gdal:" \
+   -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+   -i "${S}"/GDALmake.opt.in || die
+
+   # the second sed expression should fix bug 371075
+   sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+   -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+   -i

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2017-12-20 Thread Andreas Sturmlechner

commit: 6c20ca938f7f64f9882ad152877ee209fcb5dc18
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 20 19:52:25 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 20 20:08:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c20ca93

sci-libs/gdal: Fix build w/ >=dev-libs/json-c-0.13

Thanks-to: Attila Tóth  atoth.sote.hu>
Closes: https://bugs.gentoo.org/641658
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch | 84 
 sci-libs/gdal/gdal-2.2.3.ebuild  |  1 +
 2 files changed, 85 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch 
b/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch
new file mode 100644
index 000..bbee77b51c7
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch
@@ -0,0 +1,84 @@
+Index: gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
+===
+--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp (revision 41042)
 b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp (revision 41043)
+@@ -28,4 +28,6 @@
+  /
+ 
++#define JSON_C_VER_013 (13 << 8)
++
+ #include "ogrgeojsonwriter.h"
+ #include "ogrgeojsonutils.h"
+@@ -33,5 +35,9 @@
+ #include "ogrgeojsonreader.h"
+ #include   // JSON-C
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ #include 
++#endif
++
+ #include 
+ #include 
+@@ -1382,11 +1388,15 @@
+ // TODO(schwehr): Explain this casting.
+ const int nPrecision =
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ static_cast(reinterpret_cast(jso->_userdata));
++#else
++
static_cast(reinterpret_cast(json_object_get_userdata(jso)));
++#endif
+ char szBuffer[75] = {};
+-OGRFormatDouble( szBuffer, sizeof(szBuffer), jso->o.c_double, '.',
++OGRFormatDouble( szBuffer, sizeof(szBuffer), json_object_get_double(jso), 
'.',
+  (nPrecision < 0) ? 15 : nPrecision );
+ if( szBuffer[0] == 't' /*oobig */ )
+ {
+-CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", jso->o.c_double);
++CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", 
json_object_get_double(jso));
+ }
+ return printbuf_memappend(pb, szBuffer, 
static_cast(strlen(szBuffer)));
+@@ -1418,9 +1428,9 @@
+ char szBuffer[75] = {};
+ int nSize = 0;
+-if( CPLIsNan(jso->o.c_double))
++if( CPLIsNan(json_object_get_double(jso)))
+ nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
+-else if( CPLIsInf(jso->o.c_double) )
+-{
+-if( jso->o.c_double > 0 )
++else if( CPLIsInf(json_object_get_double(jso)) )
++{
++if( json_object_get_double(jso) > 0 )
+ nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
+ else
+@@ -1430,5 +1440,9 @@
+ {
+ char szFormatting[32] = {};
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ const int nSignificantFigures = (int) (GUIntptr_t) jso->_userdata;
++#else
++const int nSignificantFigures = (int) (GUIntptr_t) 
json_object_get_userdata(jso);
++#endif
+ const int nInitialSignificantFigures =
+ nSignificantFigures >= 0 ? nSignificantFigures : 17;
+@@ -1436,5 +1450,5 @@
+ "%%.%dg", nInitialSignificantFigures);
+ nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
+-szFormatting, jso->o.c_double);
++szFormatting, json_object_get_double(jso));
+ const char* pszDot = NULL;
+ if( nSize+2 < static_cast(sizeof(szBuffer)) &&
+@@ -1458,5 +1472,5 @@
+ "%%.%dg", nInitialSignificantFigures- i);
+ nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
+-szFormatting, jso->o.c_double);
++szFormatting, 
json_object_get_double(jso));
+ pszDot = strchr(szBuffer, '.');
+ if( pszDot != NULL &&
+@@ -1473,5 +1487,5 @@
+ "%%.%dg", nInitialSignificantFigures);
+ nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
+-szFormatting, jso->o.c_double);
++szFormatting, 
json_object_get_double(jso));
+ if( nSize+2 < static_cast(sizeof(szBuffer)) &&
+ strchr(szBuffer, '.') == NULL )

diff --git a/sci-libs/gdal/gdal-2.2.3.ebuild b/sci-libs/gdal/gdal-2.2.3.ebuild
index 0ee11731348..d9baddecf2b 100644
--- a/sci-libs/gdal/gdal-2.2.3.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3.ebuild
@@ -71,6 +71,7 @@ REQUIRED_USE="mdb? ( java )
 
 PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
+   "${FILESDIR}/${PN}-2.2.3-json-c-0.13.patch" # bug

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2017-12-20 Thread Amy Liffey

commit: d16d04fc7bd9558d67e7b97fbab6f026e70a7ec2
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Dec 20 18:22:13 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Dec 20 18:23:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16d04fc

sci-libs/gdal: version bump 2.2.3

Closes: https://bugs.gentoo.org/615986
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/gdal/Manifest  |   1 +
 sci-libs/gdal/files/gdal-2.2.3-soname.patch |  54 ++
 sci-libs/gdal/gdal-2.2.3.ebuild | 288 
 3 files changed, 343 insertions(+)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e553d4a456e..0570d7e9127 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1,3 @@
 DIST gdal-2.0.2.tar.gz 11643726 BLAKE2B 
aac80990d800acb8b0881caf84229a3c73b57aad1acbd05adb911c9c2ca56fff145eae5a77dcaa934003a22188178883381db5a4c10e7fc082b8f4d98aa146c6
 SHA512 
b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
 DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 
2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d
 SHA512 
3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
+DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B 
d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42
 SHA512 
841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046

diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch 
b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
new file mode 100644
index 000..f2746bdf5e3
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
@@ -0,0 +1,54 @@
+Set SONAME and unbreak compilation on Darwin
+
+Author: Fabian Groffen 
+Author: Dennis Schridde 
+
+--- old/GDALmake.opt.in.orig   2008-02-02 18:25:48.0 -0800
 new/GDALmake.opt.in2008-02-02 18:54:53.0 -0800
+@@ -97,6 +97,14 @@
+ GDAL_SLIB =   $(GDAL_ROOT)/libgdal.$(SO_EXT)
+ GDAL_SLIB_LINK=   -L$(GDAL_ROOT) -lgdal
+ 
++# for building without libtool
++GDAL_SLIB_SO_VER =
$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
++ifeq ("$(shell uname -s)", "Darwin")
++GDAL_SLIB_SONAME =-install_name 
$(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
++else
++GDAL_SLIB_SONAME =-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
++endif
++
+ # Mac OS X Framework definition
+ MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
+ 
+--- gdal-2.0.3.old/GNUmakefile
 gdal-2.0.3/GNUmakefile
+@@ -208,7 +208,7 @@ else
+ 
+ ifeq ($(HAVE_LD_SHARED),yes)
+ 
+-GDAL_SLIB_B   =   $(notdir $(GDAL_SLIB))
++GDAL_SLIB_B   =   libgdal
+ 
+ install-lib:
+ 
+@@ -216,14 +216,14 @@ install-lib:
+ ifeq ($(MACOSX_FRAMEWORK),yes)
+   $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
+ else
+-  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
+-  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
+-  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+-  $(INSTALL_LIB) $(GDAL_SLIB) 
$(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
++  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(SO_EXT)
++  rm -f 
$(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT)
++  rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT)
++  $(INSTALL_LIB) $(GDAL_SLIB) 
$(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT)
+   (cd $(DESTDIR)$(INST_LIB) ; \
+-   ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
++   ln -s $(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT) 
$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT))
+   (cd $(DESTDIR)$(INST_LIB) ; \
+-   ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
++   ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT) 
$(GDAL_SLIB_B).$(SO_EXT))
+   $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/gdalplugins
+ endif
+ 

diff --git a/sci-libs/gdal/gdal-2.2.3.ebuild b/sci-libs/gdal/gdal-2.2.3.ebuild
new file mode 100644
index 000..0ee11731348
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.2.3.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic 
java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes 
OGR support)"
+HOMEPAGE="http://www.gdal.org/;
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
+
+SLOT="0/2.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2017-07-19 Thread Andreas Sturmlechner

commit: 9c20aad4922fb94a82abaf786056b8ac3d2add93
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 19 18:35:14 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 19 18:53:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c20aad4

sci-libs/gdal: Drop 1.11 versions

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 sci-libs/gdal/Manifest |   2 -
 .../gdal/files/gdal-1.10.0-ruby-makefile.patch |  47 ---
 sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch |  22 --
 .../files/gdal-1.11.1-poppler-0.31.0-support.patch | 119 ---
 sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch   | 161 --
 sci-libs/gdal/gdal-1.11.1-r4.ebuild| 352 -
 sci-libs/gdal/gdal-1.11.2-r1.ebuild| 349 
 7 files changed, 1052 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 109dfbf2dcb..d601fb10b32 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,4 +1,2 @@
-DIST gdal-1.11.1.tar.gz 10731242 SHA256 
f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340 SHA512 
17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3
 WHIRLPOOL 
1f07ee4acccf58552ddef6b5a306b9dbe832014f6890d353f195ab0d47dfc4e81164b7c8b9cefc9915035d113d2f28818f05e89918728eadb0e80e43e7220b5b
-DIST gdal-1.11.2.tar.gz 10746847 SHA256 
66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845 SHA512 
f1f025de5a618cc2458b6d1f066647341ad4ded1cc2a08e4b78756d96d38715ddd8ba34b7c263369bde66cb20c7919195e13b60a1ecadee25ef80db79f3eb7da
 WHIRLPOOL 
77274f6f9b9bb29fc21c6f274512bccebc7748420c31e3e626d26087194f69b9606354603b393b77903451b073d034f2508403193fdf738f5b099d7808771653
 DIST gdal-2.0.2.tar.gz 11643726 SHA256 
db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 SHA512 
b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
 WHIRLPOOL 
889b35d0c2d972681d30eb33b731498b58951ed64a37d0152b15f8d9c3e414703158498cc6eb1bc75a3cd598a567738e4e937fffa6a55cdff2b6cf87338e25e6
 DIST gdal-2.0.3.tar.gz 11589011 SHA256 
af661066a0bcac733521d66a73375dbe70b0e87d234a99af9f8f1d034c127914 SHA512 
3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
 WHIRLPOOL 
15bc985dc9a8543e3cc7caaca36e41bb9891558adaea2c3883af3d58d5059d01eacda9e8e79b6051c230dd84d08b93b9a8c778758b8fab14d146d42bfba22659

diff --git a/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch 
b/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch
deleted file mode 100644
index cc89200c526..000
--- a/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurw gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk 
gdal-1.10.0/swig/ruby/RubyMakefile.mk
 gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk 2013-04-24 18:55:26.0 
+
-+++ gdal-1.10.0/swig/ruby/RubyMakefile.mk  2013-06-25 23:58:06.464518830 
+
-@@ -37,13 +37,13 @@
- 
- ifeq ("$(shell uname -s)", "Darwin")
- RUBY_MODULES=$(RUBY_MODULES_MAC)
--LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
--RUBY_LIB := -l$(RUBY_SO_NAME)
- else
- RUBY_MODULES=$(RUBY_MODULES_LIN)
--LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
--RUBY_LIB := -l$(RUBY_SO_NAME)
- endif
-+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
-+RUBY_LIB := -l$(RUBY_SO_NAME)
- 
- build: $(RUBY_MODULES)
- 
-@@ -56,10 +56,10 @@
- veryclean: clean
-   rm -f *_wrap.cpp
- 
--$(INSTALL_DIR):
-+$(DESTDIR)$(INSTALL_DIR):
-   mkdir -p $(DESTDIR)$(INSTALL_DIR)
- 
--install: $(INSTALL_DIR)
-+install: $(DESTDIR)$(INSTALL_DIR) $(RUBY_MODULES)
-   for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; 
done
- 
- $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
-@@ -69,10 +69,10 @@
-   $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
- 
- %.o: %.cpp
--  $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
-+  $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
- 
- %.o: %.cxx
--  $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+  $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
- 
- %.o: %.c
-   $(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<

diff --git a/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch 
b/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
deleted file mode 100644
index 4f4e80b84f9..000
--- a/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 gdal/swig/include/python/ogr_python.i
-+++ gdal/swig/include/python/ogr_python.i
-@@ -67,7 +67,7 @@
- def __getitem__(self, value):
- """Support dictionary, list, and slice -like access to the datasource.
--ds[0] would return the first layer on the datasource.
--ds['aname'] would

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2016-12-03 Thread Amy Winston

commit: f6d0b15b0e40546b0cb66930e2cd8a95a4001d24
Author: Amy Winston  gentoo  org>
AuthorDate: Sat Dec  3 10:26:23 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sat Dec  3 10:26:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d0b15b

sci-libs/gdal: add jasper patch bug #599626

Package-Manager: portage-2.3.0

 sci-libs/gdal/files/gdal-2.0.2-jasper2.patch | 62 
 sci-libs/gdal/gdal-2.0.2-r3.ebuild   |  1 +
 2 files changed, 63 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch 
b/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch
new file mode 100644
index ..a418e41
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch
@@ -0,0 +1,62 @@
+diff -urN orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp 
dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+--- orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp   2016-01-26 16:21:48.0 
+0100
 dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp   2016-11-16 21:53:15.280302723 
+0100
+@@ -179,40 +179,25 @@
+ * Buffer initialization code.
+ 
\**/
+ 
+-static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int 
bufmode, char *buf,
+-  int bufsize)
++static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int 
bufmode)
+ {
+   /* If this function is being called, the buffer should not have been
+ initialized yet. */
+   assert(!stream->bufbase_);
+ 
+   if (bufmode != JAS_STREAM_UNBUF) {
+-  /* The full- or line-buffered mode is being employed. */
+-  if (!buf) {
+-  /* The caller has not specified a buffer to employ, so 
allocate
+-one. */
+-  if ((stream->bufbase_ = (unsigned 
char*)jas_malloc(JAS_STREAM_BUFSIZE +
+-JAS_STREAM_MAXPUTBACK))) {
+-  stream->bufmode_ |= JAS_STREAM_FREEBUF;
+-  stream->bufsize_ = JAS_STREAM_BUFSIZE;
+-  } else {
+-  /* The buffer allocation has failed.  Resort to 
unbuffered
+-operation. */
+-  stream->bufbase_ = stream->tinybuf_;
+-  stream->bufsize_ = 1;
+-  }
++  if ((stream->bufbase_ = (unsigned 
char*)jas_malloc(JAS_STREAM_BUFSIZE +
++JAS_STREAM_MAXPUTBACK))) {
++  stream->bufmode_ |= JAS_STREAM_FREEBUF;
++  stream->bufsize_ = JAS_STREAM_BUFSIZE;
+   } else {
+-  /* The caller has specified a buffer to employ. */
+-  /* The buffer must be large enough to accommodate 
maximum
+-putback. */
+-  assert(bufsize > JAS_STREAM_MAXPUTBACK);
+-  stream->bufbase_ = JAS_CAST(uchar *, buf);
+-  stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
++  /* The buffer allocation has failed.  Resort to 
unbuffered
++operation. */
++  stream->bufbase_ = stream->tinybuf_;
++  stream->bufsize_ = 1;
+   }
+   } else {
+   /* The unbuffered mode is being employed. */
+-  /* A buffer should not have been supplied by the caller. */
+-  assert(!buf);
+   /* Use a trivial one-character buffer. */
+   stream->bufbase_ = stream->tinybuf_;
+   stream->bufsize_ = 1;
+@@ -282,7 +267,7 @@
+   }
+ 
+   /* By default, use full buffering for this type of stream. */
+-  JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
++  JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);
+ 
+   return stream;
+ }

diff --git a/sci-libs/gdal/gdal-2.0.2-r3.ebuild 
b/sci-libs/gdal/gdal-2.0.2-r3.ebuild
index 2dae2cd..f8a672c 100644
--- a/sci-libs/gdal/gdal-2.0.2-r3.ebuild
+++ b/sci-libs/gdal/gdal-2.0.2-r3.ebuild
@@ -87,6 +87,7 @@ src_prepare() {
 
if use jpeg2k; then
epatch "${FILESDIR}"/${P}-jasper.patch
+   epatch "${FILESDIR}"/${P}-jasper2.patch #bug 599626
fi
 
# -soname is only accepted by GNU ld/ELF

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2016-11-07 Thread Amy Winston

commit: aaa9c7d2432d2eb89c7980d7d3ab933b71f8cdd7
Author: Amy Winston  gentoo  org>
AuthorDate: Mon Nov  7 13:49:14 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Mon Nov  7 13:55:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa9c7d2

sci-libs/gdal: remove old versions

Package-Manager: portage-2.3.0

 sci-libs/gdal/Manifest |   2 -
 .../files/gdal-2.0.0-glibc-2.22-backport.patch |  14 -
 sci-libs/gdal/gdal-2.0.0-r2.ebuild | 318 -
 sci-libs/gdal/gdal-2.0.1-r1.ebuild | 315 
 4 files changed, 649 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 1e86ee9..fbc1190 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,5 +1,3 @@
 DIST gdal-1.11.1.tar.gz 10731242 SHA256 
f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340 SHA512 
17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3
 WHIRLPOOL 
1f07ee4acccf58552ddef6b5a306b9dbe832014f6890d353f195ab0d47dfc4e81164b7c8b9cefc9915035d113d2f28818f05e89918728eadb0e80e43e7220b5b
 DIST gdal-1.11.2.tar.gz 10746847 SHA256 
66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845 SHA512 
f1f025de5a618cc2458b6d1f066647341ad4ded1cc2a08e4b78756d96d38715ddd8ba34b7c263369bde66cb20c7919195e13b60a1ecadee25ef80db79f3eb7da
 WHIRLPOOL 
77274f6f9b9bb29fc21c6f274512bccebc7748420c31e3e626d26087194f69b9606354603b393b77903451b073d034f2508403193fdf738f5b099d7808771653
-DIST gdal-2.0.0.tar.gz 11582325 SHA256 
53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6 SHA512 
74ae9d01a69652c92a16bc91f71b4c8416697d5f7aa137d385f58b7dc63c165c26330464c98891ac66b09475de24fbbff61f506ad1c9ecf64ffe08f1429fbad5
 WHIRLPOOL 
7d4a27e94e41ea53050ae3b8f1f06720e13626885455897caf6659a88c87bf61c087102963182b580e56a8840e3b57b6fbb8adadde64fd4679d5c37c3aa682c7
-DIST gdal-2.0.1.tar.gz 11592723 SHA256 
b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab SHA512 
b3b22e53b6e4b68911d84260d79ed382625f9d71722759a89f49fdd736d1f1ad183bda99e0f09d3f368fead89b509df58daa35a367473dfd5628855d331efa23
 WHIRLPOOL 
1b1218d5d6c84e41051475c38b412ebb49511c4a1ae948f56edb5939d9eb9599546b9bd89a3cb6b2517d205723201e77bde64955bb3eb0b5bccfda799d5bffe3
 DIST gdal-2.0.2.tar.gz 11643726 SHA256 
db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 SHA512 
b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
 WHIRLPOOL 
889b35d0c2d972681d30eb33b731498b58951ed64a37d0152b15f8d9c3e414703158498cc6eb1bc75a3cd598a567738e4e937fffa6a55cdff2b6cf87338e25e6

diff --git a/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch 
b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
deleted file mode 100644
index f23ff76..
--- a/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: /branches/2.0/gdal/apps/gdalserver.c
-===
 /branches/2.0/gdal/apps/gdalserver.c   (revision 29667)
-+++ /branches/2.0/gdal/apps/gdalserver.c   (revision 29668)
-@@ -28,7 +28,6 @@
-  /
- 
--#if defined(__STDC_VERSION__)
--#define _XOPEN_SOURCE
--#endif
-+// So that __USE_XOPEN2K is defined to have getaddrinfo
-+#define _XOPEN_SOURCE 600
- 
- #include "cpl_port.h"

diff --git a/sci-libs/gdal/gdal-2.0.0-r2.ebuild 
b/sci-libs/gdal/gdal-2.0.0-r2.ebuild
deleted file mode 100644
index 82224a5..
--- a/sci-libs/gdal/gdal-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 python-r1 
toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes 
OGR support)"
-HOMEPAGE="http://www.gdal.org/;
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz;
-
-SLOT="0/2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg 
jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python 
spatialite sqlite threads xls"
-
-RDEPEND="
-   dev-libs/expat
-   dev-libs/json-c
-   dev-libs/libpcre
-   dev-libs/libxml2
-   media-libs/tiff:0=
-   sci-libs/libgeotiff
-   sys-libs/zlib[minizip(+)]
-   armadillo? ( sci-libs/armadillo[lapack] )
-   curl? ( net-misc/curl )
-   fits? ( sci-libs/cfitsio )
-   geos?   ( >=sci-libs/geos-2.2.1 )
-   gif? ( media-libs/giflib

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

2016-07-18 Thread Sven Wegener

commit: 8091a2d1eef7b014d2aaee3d2c6906397bc970d0
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Jun 28 18:26:03 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Jul 18 20:39:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8091a2d1

sci-libs/gdal: Fix building with >=swig-3.0.6

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch | 22 ++
 sci-libs/gdal/gdal-1.11.1-r3.ebuild|  5 -
 sci-libs/gdal/gdal-1.11.2.ebuild   |  5 -
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch 
b/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
new file mode 100644
index 000..4f4e80b
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
@@ -0,0 +1,22 @@
+--- gdal/swig/include/python/ogr_python.i
 gdal/swig/include/python/ogr_python.i
+@@ -67,7 +67,7 @@
+ def __getitem__(self, value):
+ """Support dictionary, list, and slice -like access to the datasource.
+-ds[0] would return the first layer on the datasource.
+-ds['aname'] would return the layer named "aname".
+-ds[0:4] would return a list of the first four layers."""
++ds[0] would return the first layer on the datasource.
++ds['aname'] would return the layer named "aname".
++ds[0:4] would return a list of the first four layers."""
+ if isinstance(value, slice):
+ output = []
+@@ -135,6 +135,6 @@
+ def __getitem__(self, value):
+ """Support list and slice -like access to the layer.
+-layer[0] would return the first feature on the layer.
+-layer[0:4] would return a list of the first four features."""
++layer[0] would return the first feature on the layer.
++layer[0:4] would return a list of the first four features."""
+ if isinstance(value, slice):
+ import sys

diff --git a/sci-libs/gdal/gdal-1.11.1-r3.ebuild 
b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
index e244d27..8a55b2f 100644
--- a/sci-libs/gdal/gdal-1.11.1-r3.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
xls? ( dev-libs/freexl )
 "
 
-SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
+SWIG_DEP=">=dev-lang/swig-2.0.2"
 DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
java? ( >=virtual/jdk-1.6 )
@@ -122,6 +122,9 @@ src_prepare() {
# Fix swig-3.0.3 problem (bug #534168)
epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
 
+   # Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
+   epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
+
# bug 540132
epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
 

diff --git a/sci-libs/gdal/gdal-1.11.2.ebuild b/sci-libs/gdal/gdal-1.11.2.ebuild
index 3a3e22f..985f716 100644
--- a/sci-libs/gdal/gdal-1.11.2.ebuild
+++ b/sci-libs/gdal/gdal-1.11.2.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
xls? ( dev-libs/freexl )
 "
 
-SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
+SWIG_DEP=">=dev-lang/swig-2.0.2"
 DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
java? ( >=virtual/jdk-1.6 )
@@ -122,6 +122,9 @@ src_prepare() {
# bug 540132
epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
 
+   # Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
+   epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
+
tc-export AR RANLIB
 
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/

20 matches

Site Navigation

Mail list logo

Footer information