[arch-commits] Commit in gdal/trunk (PKGBUILD gdal-sqlite-3.8.7.patch gdal.changelog)
Jaroslav Lichtblau
jlichtblau at archlinux.org
Mon Dec 22 13:55:12 UTC 2014
Date: Monday, December 22, 2014 @ 14:55:12
Author: jlichtblau
Revision: 124357
upgpkg: gdal 1.11.1-5
FS#43193 fix
Added:
gdal/trunk/gdal-sqlite-3.8.7.patch
Modified:
gdal/trunk/PKGBUILD
gdal/trunk/gdal.changelog
-------------------------+
PKGBUILD | 21 ++++++++++++---------
gdal-sqlite-3.8.7.patch | 17 +++++++++++++++++
gdal.changelog | 27 +++++++++++++++------------
3 files changed, 44 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-22 11:05:22 UTC (rev 124356)
+++ PKGBUILD 2014-12-22 13:55:12 UTC (rev 124357)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# 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=4
+pkgrel=5
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/"
@@ -17,13 +17,16 @@
'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-1.5.1-python-install.patch gdal-sqlite-3.8.7.patch)
sha256sums=('f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340'
- '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
+ '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
+ '2c1546f3303c27b5b9476192fd1f75fad0824380e711699ab09c2dd2f42d53c0')
prepare() {
- cd "${srcdir}/$pkgname-$pkgver"
- patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch"
+ 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
@@ -36,7 +39,7 @@
}
build() {
- cd "${srcdir}/$pkgname-$pkgver"
+ cd "${srcdir}"/$pkgname-$pkgver
export CFLAGS="$CFLAGS -fno-strict-aliasing"
# bug #23654
@@ -55,12 +58,12 @@
}
package () {
- cd "${srcdir}/$pkgname-$pkgver"
+ 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"
+ install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
#FS15477 clean up junks
rm -f "${pkgdir}"/usr/bin/*.dox
Added: gdal-sqlite-3.8.7.patch
===================================================================
--- gdal-sqlite-3.8.7.patch (rev 0)
+++ gdal-sqlite-3.8.7.patch 2014-12-22 13:55:12 UTC (rev 124357)
@@ -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. */
Modified: gdal.changelog
===================================================================
--- gdal.changelog 2014-12-22 11:05:22 UTC (rev 124356)
+++ gdal.changelog 2014-12-22 13:55:12 UTC (rev 124357)
@@ -1,38 +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 <dragonlord at aur.archlinux.org>
+2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.11.1-3 hdf5 1.8.14 rebuild
-2014-10-03 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.11.1-1
-2014-07-28 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.11.0-4 libspatialite soname rebuild
-2014-05-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.11.0-2 giflib soname rebuild
-2014-04-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.11.0-1
-2013-11-11 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.10.1-1
-2013-09-29 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.10.0-4 FS#36328 fix
-2013-05-18 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.10.0-1
-2011-02-19 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* gdal 1.8.0-1
-2010-11-20 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* Update to major release 1.7.3
-2010-06-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* FS#19946 fixed in 1.7.2-2
-2010-05-05 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
* Update to major release 1.7.2
More information about the arch-commits
mailing list