[arch-commits] Commit in gdal/repos (5 files)

Felix Yan felixonmars at archlinux.org
Fri Mar 22 09:38:37 UTC 2019


    Date: Friday, March 22, 2019 @ 09:38:37
  Author: felixonmars
Revision: 443130

archrelease: copy trunk to community-staging-x86_64

Added:
  gdal/repos/community-staging-x86_64/
  gdal/repos/community-staging-x86_64/PKGBUILD
    (from rev 443129, gdal/trunk/PKGBUILD)
  gdal/repos/community-staging-x86_64/gdal-perl-vendor.patch
    (from rev 443129, gdal/trunk/gdal-perl-vendor.patch)
  gdal/repos/community-staging-x86_64/gdal-poppler-0.75.patch
    (from rev 443129, gdal/trunk/gdal-poppler-0.75.patch)
  gdal/repos/community-staging-x86_64/gdal.changelog
    (from rev 443129, gdal/trunk/gdal.changelog)

-------------------------+
 PKGBUILD                |  127 ++++++++++++++++++++++++++++++++++++++++++++++
 gdal-perl-vendor.patch  |   28 ++++++++++
 gdal-poppler-0.75.patch |   22 +++++++
 gdal.changelog          |  105 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 282 insertions(+)

Copied: gdal/repos/community-staging-x86_64/PKGBUILD (from rev 443129, gdal/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-03-22 09:38:37 UTC (rev 443130)
@@ -0,0 +1,127 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=gdal
+pkgname=('gdal' 'python-gdal' 'python2-gdal')
+pkgver=2.3.2
+pkgrel=11
+pkgdesc="A translator library for raster geospatial data formats"
+arch=('x86_64')
+url="http://www.gdal.org/"
+license=('custom')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg-turbo' 'libpng' 'libspatialite' 'libtiff' 'netcdf'
+         'openjpeg2' 'poppler' 'cfitsio' 'sqlite' 'mariadb-libs' 'postgresql-libs' 'xerces-c' 'json-c')
+makedepends=('perl' 'swig' 'chrpath' 'doxygen' 'python-numpy' 'python2-numpy')
+optdepends=('postgresql: postgresql database support'
+            'mariadb: mariadb database support'
+            'perl:  perl binding support')
+options=('!emptydirs')
+changelog=$pkgbase.changelog
+source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
+        gdal-poppler-0.69.0.patch::https://github.com/OSGeo/gdal/commit/69e0701253.patch
+        gdal-perl-vendor.patch
+        gdal-poppler-0.75.patch)
+sha256sums=('3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4'
+            'cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5'
+            'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3'
+            '099c95f63863cc8b2c606f146fb145f14599e9f4525fb62d965a5b9bc174a0a2')
+
+prepare() {
+  cd "${srcdir}"/$pkgbase-$pkgver
+
+# Fix build with poppler >= 0.69.0
+  patch -Np2 -i ../gdal-poppler-0.69.0.patch
+# Fix build with poppler 0.72
+  find frmts/pdf -type f | xargs sed -e 's|GBool|bool|g' -e 's|gFalse|false|g' -e 's|getCString|c_str|g' -i
+# Fix build with poppler 0.73
+  sed -e 's|#include <goo/gtypes.h>|typedef unsigned char Guchar;|' -i frmts/pdf/pdfsdk_headers.h
+# Fix build with poppler 0.75
+  patch -p2 -i ../gdal-poppler-0.75.patch
+
+# Fix mandir
+  sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
+
+# Fix Perl bindings installation path
+  patch -Np1 -i ../gdal-perl-vendor.patch
+}
+
+build() {
+  cd "${srcdir}"/$pkgbase-$pkgver
+  export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+# Ignore const-related errors (remove once fixed upstream)
+  CXXFLAGS+=' -fpermissive'
+
+# bug #23654
+  export LDFLAGS="$LDFLAGS -Wl,--as-needed"
+
+  ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 --with-geotiff \
+              --with-mysql --with-curl --with-hdf5 --with-perl --with-geos \
+              --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
+
+  make
+  make man
+
+  cd "${srcdir}"/$pkgbase-$pkgver/swig/python
+  python2 setup.py build
+  python3 setup.py build
+}
+
+package_gdal () {
+  cd "${srcdir}"/$pkgbase-$pkgver
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install-man
+
+# 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
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OGR/OGR.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/GDAL.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/Const/Const.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GNM/GNM.so
+}
+
+package_python-gdal () {
+  pkgdesc="Python bindings for GDAL"
+  depends=("gdal=$pkgver" 'python-numpy')
+  optdepends=()
+
+  cd "${srcdir}"/$pkgbase-$pkgver/swig/python
+  python3 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
+
+  install -dm755 "${pkgdir}"/usr/share/licenses
+  ln -s $pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
+}
+
+package_python2-gdal () {
+  pkgdesc="Python 2 bindings for GDAL"
+  depends=("gdal=$pkgver" 'python2-numpy')
+  optdepends=()
+
+  cd "${srcdir}"/$pkgbase-$pkgver/swig/python
+
+# python2 fixes
+  for file in {,osgeo/,samples/,scripts/}*.py; do
+      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+  done
+
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
+  for file in "${pkgdir}"/usr/bin/*; do mv "${file}" "${file%.py}2.py"; done
+
+  install -dm755 "${pkgdir}"/usr/share/licenses
+  ln -s $pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
+}

Copied: gdal/repos/community-staging-x86_64/gdal-perl-vendor.patch (from rev 443129, gdal/trunk/gdal-perl-vendor.patch)
===================================================================
--- community-staging-x86_64/gdal-perl-vendor.patch	                        (rev 0)
+++ community-staging-x86_64/gdal-perl-vendor.patch	2019-03-22 09:38:37 UTC (rev 443130)
@@ -0,0 +1,28 @@
+Description: pass INSTALLDIRS=vendor to Makefile.PL to get stuff into the right place
+Origin: vendor
+Forwarded: not-needed
+Author: gregor herrmann <gregoa at 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:
+-	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
+ gdal_wrap.cc: generate
+ 
+ Makefile_Geo__GDAL: gdal_wrap.cc
+-	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
++	perl Makefile.PL INSTALLDIRS=vendor
+ 
+ test: build
+ 	$(MAKE) -f Makefile_Geo__GDAL test

Copied: gdal/repos/community-staging-x86_64/gdal-poppler-0.75.patch (from rev 443129, gdal/trunk/gdal-poppler-0.75.patch)
===================================================================
--- community-staging-x86_64/gdal-poppler-0.75.patch	                        (rev 0)
+++ community-staging-x86_64/gdal-poppler-0.75.patch	2019-03-22 09:38:37 UTC (rev 443130)
@@ -0,0 +1,22 @@
+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;
+ 
+ #ifdef POPPLER_0_58_OR_LATER
+-    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];
+ 
+ #ifdef POPPLER_0_58_OR_LATER
+-    Object o = m_poArray->getNF(nIndex);
++    Object o = m_poArray->getNF(nIndex).copy();
+     if( !o.isNull() )
+     {
+         int nRefNum = 0;

Copied: gdal/repos/community-staging-x86_64/gdal.changelog (from rev 443129, gdal/trunk/gdal.changelog)
===================================================================
--- community-staging-x86_64/gdal.changelog	                        (rev 0)
+++ community-staging-x86_64/gdal.changelog	2019-03-22 09:38:37 UTC (rev 443130)
@@ -0,0 +1,105 @@
+2018-09-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.3.2-1
+
+2018-07-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.3.1-1
+
+2018-05-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.3.0-1
+
+2018-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.2.4-1
+
+2017-11-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.2.3-1
+
+2017-10-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.2.2-1
+
+2017-08-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.2.1-1
+
+2017-07-10 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.2.0-1
+	* hdf5 1.10.1 rebuild
+
+2017-01-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.1.2-1
+
+2016-08-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild
+
+2016-06-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.1.0-2 cfitsio 3.390 rebuild
+
+2016-05-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.1.0-1
+
+2016-04-12 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.0.2-5
+	* hdf5 1.10.0 rebuild
+
+2016-02-08 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.0.2-1
+
+2016-01-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.0.0-7
+	* postgresql-libs 9.5 rebuild
+	* openjpeg2 added as dependency
+
+2015-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.0.1-2 FS#46581 fix
+
+2015-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 2.0.0-1
+
+2015-03-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.2-2 poppler 0.31.0 rebuild
+
+2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.2-1
+
+2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.1-6 poppler 0.30.0 rebuild
+
+2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.1-5 FS#43193 fix
+
+2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
+	* gdal 1.11.1-4 poppler 0.29.0 rebuild
+
+2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.1-3 hdf5 1.8.14 rebuild
+
+2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.1-1
+
+2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.0-4 libspatialite soname rebuild
+
+2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.0-2 giflib soname rebuild
+
+2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.11.0-1
+
+2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.10.1-1
+
+2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.10.0-4 FS#36328 fix
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.10.0-1
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* gdal 1.8.0-1
+
+2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Update to major release 1.7.3
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* FS#19946 fixed in 1.7.2-2
+
+2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Update to major release 1.7.2


More information about the arch-commits mailing list