[arch-commits] Commit in gdal/repos/community-i686 (7 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Mon Dec 22 15:05:27 UTC 2014


    Date: Monday, December 22, 2014 @ 16:05:27
  Author: jlichtblau
Revision: 124363

archrelease: copy trunk to community-i686

Added:
  gdal/repos/community-i686/PKGBUILD
    (from rev 124362, gdal/trunk/PKGBUILD)
  gdal/repos/community-i686/gdal-1.5.1-python-install.patch
    (from rev 124362, gdal/trunk/gdal-1.5.1-python-install.patch)
  gdal/repos/community-i686/gdal-sqlite-3.8.7.patch
    (from rev 124362, gdal/trunk/gdal-sqlite-3.8.7.patch)
  gdal/repos/community-i686/gdal.changelog
    (from rev 124362, gdal/trunk/gdal.changelog)
Deleted:
  gdal/repos/community-i686/PKGBUILD
  gdal/repos/community-i686/gdal-1.5.1-python-install.patch
  gdal/repos/community-i686/gdal.changelog

---------------------------------+
 PKGBUILD                        |  151 +++++++++++++++++++-------------------
 gdal-1.5.1-python-install.patch |   20 ++---
 gdal-sqlite-3.8.7.patch         |   17 ++++
 gdal.changelog                  |   79 ++++++++++---------
 4 files changed, 145 insertions(+), 122 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-22 14:35:38 UTC (rev 124362)
+++ PKGBUILD	2014-12-22 15:05:27 UTC (rev 124363)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=gdal
-pkgver=1.11.1
-pkgrel=4
-pkgdesc="A translator library for raster geospatial data formats"
-arch=('i686' 'x86_64')
-url="http://www.gdal.org/"
-license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
-makedepends=('perl' 'swig' 'chrpath' 'doxygen')
-optdepends=('postgresql: postgresql database support'
-            'mariadb: mariadb database support'
-            'perl:  perl binding support')
-changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        gdal-1.5.1-python-install.patch)
-sha256sums=('f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340'
-            '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
-
-prepare() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch"
-
-# python2 fixes
-  sed -i 's_python python1.5_python2 python python1.5_' configure
-  for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
-      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-
-# Fix mandir
-  sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
-}
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-# bug #23654
-  export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
-
-  ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
-              --with-geotiff --with-mysql --with-python --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png --with-poppler --with-spatialite
-
-# 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
-}
-
-package () {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" install-man
-
-# install license
-  install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-#FS15477 clean up junks
-  rm -f "${pkgdir}"/usr/bin/*.dox
-  rm -f "${pkgdir}"/usr/share/man/man1/_build_gdal_src_gdal-${pkgver}_apps_.1
-
-# Remove RPATH
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/Const/Const.so
-}

Copied: gdal/repos/community-i686/PKGBUILD (from rev 124362, gdal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-12-22 15:05:27 UTC (rev 124363)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=gdal
+pkgver=1.11.1
+pkgrel=5
+pkgdesc="A translator library for raster geospatial data formats"
+arch=('i686' 'x86_64')
+url="http://www.gdal.org/"
+license=('custom')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+makedepends=('perl' 'swig' 'chrpath' 'doxygen')
+optdepends=('postgresql: postgresql database support'
+            'mariadb: mariadb database support'
+            'perl:  perl binding support')
+changelog=$pkgname.changelog
+source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        gdal-1.5.1-python-install.patch gdal-sqlite-3.8.7.patch)
+sha256sums=('f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340'
+            '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
+            '2c1546f3303c27b5b9476192fd1f75fad0824380e711699ab09c2dd2f42d53c0')
+
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
+#FS#43193
+  patch -Np2 -i "${srcdir}"/gdal-sqlite-3.8.7.patch
+
+# python2 fixes
+  sed -i 's_python python1.5_python2 python python1.5_' configure
+  for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
+      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+  done
+
+# Fix mandir
+  sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+# bug #23654
+  export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
+
+  ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
+              --with-geotiff --with-mysql --with-python --with-curl \
+              --with-hdf5 --with-perl --with-geos --with-png --with-poppler --with-spatialite
+
+# 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
+}
+
+package () {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install-man
+
+# install license
+  install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+#FS15477 clean up junks
+  rm -f "${pkgdir}"/usr/bin/*.dox
+  rm -f "${pkgdir}"/usr/share/man/man1/_build_gdal_src_gdal-${pkgver}_apps_.1
+
+# Remove RPATH
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/Const/Const.so
+}

Deleted: gdal-1.5.1-python-install.patch
===================================================================
--- gdal-1.5.1-python-install.patch	2014-12-22 14:35:38 UTC (rev 124362)
+++ gdal-1.5.1-python-install.patch	2014-12-22 15:05:27 UTC (rev 124363)
@@ -1,10 +0,0 @@
---- swig/python/GNUmakefile.orig	2010-04-24 01:22:07.000000000 +0200
-+++ swig/python/GNUmakefile	2010-05-05 19:14:58.000000000 +0200
-@@ -72,5 +72,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif

Copied: gdal/repos/community-i686/gdal-1.5.1-python-install.patch (from rev 124362, gdal/trunk/gdal-1.5.1-python-install.patch)
===================================================================
--- gdal-1.5.1-python-install.patch	                        (rev 0)
+++ gdal-1.5.1-python-install.patch	2014-12-22 15:05:27 UTC (rev 124363)
@@ -0,0 +1,10 @@
+--- swig/python/GNUmakefile.orig	2010-04-24 01:22:07.000000000 +0200
++++ swig/python/GNUmakefile	2010-05-05 19:14:58.000000000 +0200
+@@ -72,5 +72,5 @@
+ ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
++	$(PYTHON) setup.py install --root=$(DESTDIR) 
+ else
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
++	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
+ endif

Copied: gdal/repos/community-i686/gdal-sqlite-3.8.7.patch (from rev 124362, gdal/trunk/gdal-sqlite-3.8.7.patch)
===================================================================
--- gdal-sqlite-3.8.7.patch	                        (rev 0)
+++ gdal-sqlite-3.8.7.patch	2014-12-22 15:05:27 UTC (rev 124363)
@@ -0,0 +1,17 @@
+diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+index a30b452..d45f3ff 100644
+--- a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
++++ b/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+@@ -2451,6 +2451,12 @@ int OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg,
+ /*                           OGR2SQLITE_Register()                      */
+ /************************************************************************/
+ 
++#ifdef sqlite3_auto_extension
++// Sqlite 3.8.7 defines sqlite3_auto_extension via sqlite3_api
++// which is not initialized at this moment
++#undef sqlite3_auto_extension
++#endif
++
+ /* We call this function so that each time a db is created, */
+ /* OGR2SQLITE_static_register is called, to initialize the sqlite3_api */
+ /* structure with the right pointers. */

Deleted: gdal.changelog
===================================================================
--- gdal.changelog	2014-12-22 14:35:38 UTC (rev 124362)
+++ gdal.changelog	2014-12-22 15:05:27 UTC (rev 124363)
@@ -1,38 +0,0 @@
-2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
-	* gdal 1.11.1-4 poppler 0.29.0 rebuild
-
-2014-11-25 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.11.1-3 hdf5 1.8.14 rebuild
-
-2014-10-03 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.11.1-1
-
-2014-07-28 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.11.0-4 libspatialite soname rebuild
-
-2014-05-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.11.0-2 giflib soname rebuild
-
-2014-04-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.11.0-1
-
-2013-11-11 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.10.1-1
-
-2013-09-29 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.10.0-4 FS#36328 fix
-
-2013-05-18 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.10.0-1
-
-2011-02-19 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Update to major release 1.7.2

Copied: gdal/repos/community-i686/gdal.changelog (from rev 124362, gdal/trunk/gdal.changelog)
===================================================================
--- gdal.changelog	                        (rev 0)
+++ gdal.changelog	2014-12-22 15:05:27 UTC (rev 124363)
@@ -0,0 +1,41 @@
+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