[arch-commits] Commit in gdal/trunk (PKGBUILD gdal-sqlite-3.8.7.patch gdal.changelog)

[Jaroslav Lichtblau]

    Date: Monday, February 23, 2015 @ 22:20:12
  Author: jlichtblau
Revision: 128152

upgpkg: gdal 1.11.2-1

Modified:
  gdal/trunk/PKGBUILD
  gdal/trunk/gdal.changelog
Deleted:
  gdal/trunk/gdal-sqlite-3.8.7.patch

-------------------------+
 PKGBUILD                |   13 +++++--------
 gdal-sqlite-3.8.7.patch |   17 -----------------
 gdal.changelog          |    3 +++
 3 files changed, 8 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-23 20:35:15 UTC (rev 128151)
+++ PKGBUILD	2015-02-23 21:20:12 UTC (rev 128152)
@@ -4,8 +4,8 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=gdal
-pkgver=1.11.1
-pkgrel=6
+pkgver=1.11.2
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64')
 url="http://www.gdal.org/"
@@ -17,16 +17,13 @@
             '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')
+        gdal-1.5.1-python-install.patch)
+sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
+            '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
 
 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

Deleted: gdal-sqlite-3.8.7.patch
===================================================================
--- gdal-sqlite-3.8.7.patch	2015-02-23 20:35:15 UTC (rev 128151)
+++ gdal-sqlite-3.8.7.patch	2015-02-23 21:20:12 UTC (rev 128152)
@@ -1,17 +0,0 @@
-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	2015-02-23 20:35:15 UTC (rev 128151)
+++ gdal.changelog	2015-02-23 21:20:12 UTC (rev 128152)
@@ -1,3 +1,6 @@
+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