Date: Sunday, June 16, 2019 @ 17:45:43
Author: jlichtblau
Revision: 481870
upgpkg: gdal 3.0.0-1 - new upstream release
Modified:
gdal/trunk/PKGBUILD
gdal/trunk/gdal-perl-vendor.patch
gdal/trunk/gdal.changelog
Deleted:
gdal/trunk/gdal-poppler-0.75.patch
gdal/trunk/gdal-poppler-0.76.patch
-------------------------+
PKGBUILD | 27 ++++++++-------------------
gdal-perl-vendor.patch | 22 ++++++----------------
gdal-poppler-0.75.patch | 22 ----------------------
gdal-poppler-0.76.patch | 34 ----------------------------------
gdal.changelog | 6 ++++++
5 files changed, 20 insertions(+), 91 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-16 17:36:05 UTC (rev 481869)
+++ PKGBUILD 2019-06-16 17:45:43 UTC (rev 481870)
@@ -4,8 +4,8 @@
pkgbase=gdal
pkgname=('gdal' 'python-gdal' 'python2-gdal')
-pkgver=2.4.1
-pkgrel=3
+pkgver=3.0.0
+pkgrel=1
pkgdesc="A translator library for raster geospatial data formats"
arch=('x86_64')
url="http://www.gdal.org/";
@@ -19,30 +19,22 @@
options=('!emptydirs')
changelog=$pkgbase.changelog
source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
- gdal-perl-vendor.patch gdal-poppler-0.75.patch gdal-poppler-0.76.patch)
-sha256sums=('fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad'
- '9aae00cdb8804dabc0d5d1921e874377daa2fc16677d743845e7b96f2901c1ea'
- 'adb5a5918a986beb5b506180619c63f2655e99d3561b94f998248419d612fd51'
- '43a5967fdb56c726a4865032c1d9e5771f7b21b4867e0ec05e37a259811fbca5')
+ gdal-perl-vendor.patch)
+sha256sums=('ad316fa052d94d9606e90b20a514b92b2dd64e3142dfdbd8f10981a5fcd5c43e'
+ '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
prepare() {
cd "${srcdir}"/$pkgbase-$pkgver
-# Fix build with poppler 0.75
- patch -p2 -i ../gdal-poppler-0.75.patch
-# Fix build with poppler 0.76
- patch -p2 -i ../gdal-poppler-0.76.patch
-
# Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
# Fix Perl bindings installation path
- patch -Np1 -i ../gdal-perl-vendor.patch
+ patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch
}
build() {
cd "${srcdir}"/$pkgbase-$pkgver
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3
--with-geotiff \
--with-mysql --with-curl --with-hdf5 --with-perl --with-geos \
@@ -49,8 +41,8 @@
--with-png --with-poppler --with-spatialite --with-openjpeg
# workaround for bug #13646
- sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
- sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
+# sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
+# sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
make
make man
@@ -69,9 +61,6 @@
# install license
install -Dm644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/$pkgbase/LICENSE
-#FS15477 clean up junks - still present in 2.2.1
-# rm -f "${pkgdir}"/usr/share/man/man1/_build_gdal_src_gdal-${pkgver}_apps_.1
-
# Remove RPATH
eval local $(perl -V:vendorarch)
chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OSR/OSR.so
Modified: gdal-perl-vendor.patch
===================================================================
--- gdal-perl-vendor.patch 2019-06-16 17:36:05 UTC (rev 481869)
+++ gdal-perl-vendor.patch 2019-06-16 17:45:43 UTC (rev 481870)
@@ -2,27 +2,17 @@
Origin: vendor
Forwarded: not-needed
Author: gregor herrmann <gre...@debian.org>
-Last-Update: 2014-07-08
---- a/swig/perl/Makefile
-+++ b/swig/perl/Makefile
-@@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL
- $(MAKE) -f Makefile_Geo__OSR
-
- Makefile_Geo__GDAL:
+--- swig/perl/Makefile.orig 2018-12-14 22:34:20.000000000 +0100
++++ swig/perl/Makefile 2018-12-25 17:52:06.053358428 +0100
+@@ -10 +10 @@
- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
+ perl Makefile.PL INSTALLDIRS=vendor
test: build
$(MAKE) -f Makefile_Geo__GDAL test
---- a/swig/perl/GNUmakefile
-+++ b/swig/perl/GNUmakefile
-@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
- if [ -f Makefile_Geo__GNM ]; then $(MAKE) -f Makefile_Geo__GNM; fi
-
- Makefile_Geo__GDAL: ${WRAPPERS} Makefile.PL
+--- swig/perl/GNUmakefile.orig 2018-12-14 22:34:20.000000000 +0100
++++ swig/perl/GNUmakefile 2018-12-25 17:52:28.636748048 +0100
+@@ -31 +31 @@
- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
+ perl Makefile.PL INSTALLDIRS=vendor
-
- test: build
- $(MAKE) -f Makefile_Geo__GDAL test
Deleted: gdal-poppler-0.75.patch
===================================================================
--- gdal-poppler-0.75.patch 2019-06-16 17:36:05 UTC (rev 481869)
+++ gdal-poppler-0.75.patch 2019-06-16 17:45:43 UTC (rev 481870)
@@ -1,22 +0,0 @@
-diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
-index e8929aa181..9e9a76a0d2 100644
---- a/gdal/frmts/pdf/pdfobject.cpp
-+++ b/gdal/frmts/pdf/pdfobject.cpp
-@@ -1190,7 +1190,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));
-+ Object o = m_poDict->lookupNF(((char*)pszKey)).copy();
- if (!o.isNull())
- {
- int nRefNum = 0;
-@@ -1324,7 +1324,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
- return m_v[nIndex];
-
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
-- Object o = m_poArray->getNF(nIndex);
-+ Object o = m_poArray->getNF(nIndex).copy();
- if( !o.isNull() )
- {
- int nRefNum = 0;
Deleted: gdal-poppler-0.76.patch
===================================================================
--- gdal-poppler-0.76.patch 2019-06-16 17:36:05 UTC (rev 481869)
+++ gdal-poppler-0.76.patch 2019-06-16 17:45:43 UTC (rev 481870)
@@ -1,34 +0,0 @@
-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
-index 6e8223e470..16651ee2a3 100644
---- a/gdal/frmts/pdf/pdfdataset.cpp
-+++ b/gdal/frmts/pdf/pdfdataset.cpp
-@@ -3452,7 +3452,7 @@ void PDFDataset::FindLayersPoppler()
- {
- auto ocg = refOCGPair.second.get();
- #else
-- GooList* ocgList = optContentConfig->getOCGs();
-+ std::vector<void*> ocgList = optContentConfig->getOCGs();
- for(int i=0;i<ocgList->getLength();i++)
- {
- OptionalContentGroup* ocg = (OptionalContentGroup*)
ocgList->get(i);
-@@ -3490,7 +3490,7 @@ void PDFDataset::TurnLayersOnOffPoppler()
- {
- auto ocg = refOCGPair.second.get();
- #else
-- GooList* ocgList = optContentConfig->getOCGs();
-+ std::vector<void*> ocgList = optContentConfig->getOCGs();
- for(i=0;i<ocgList->getLength();i++)
- {
- OptionalContentGroup* ocg = (OptionalContentGroup*)
ocgList->get(i);
-diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/gdal/frmts/pdf/pdfsdk_headers.h
-index 9150b0f410..1311636f7b 100644
---- a/gdal/frmts/pdf/pdfsdk_headers.h
-+++ b/gdal/frmts/pdf/pdfsdk_headers.h
-@@ -51,7 +51,6 @@
- #else
- typedef unsigned char Guchar;
- #endif
--#include <goo/GooList.h>
-
- /* begin of poppler xpdf includes */
- #include <poppler/Object.h>
Modified: gdal.changelog
===================================================================
--- gdal.changelog 2019-06-16 17:36:05 UTC (rev 481869)
+++ gdal.changelog 2019-06-16 17:45:43 UTC (rev 481870)
@@ -1,3 +1,9 @@
+2019-06-16 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+ * gdal 3.0.0-1
+
+2019-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+ * gdal 2.4.0-1
+
2018-09-30 Jaroslav Lichtblau <svetlemo...@archlinux.org>
* gdal 2.3.2-1
