[arch-commits] Commit in gdal1/trunk (PKGBUILD glibc.patch)

[Ray Rashif]

    Date: Tuesday, September 22, 2015 @ 23:29:21
  Author: schiv
Revision: 141495

upgpkg: gdal1 1.11.2-1

add backported glibc patch for recent breakage

Added:
  gdal1/trunk/glibc.patch
Modified:
  gdal1/trunk/PKGBUILD

-------------+
 PKGBUILD    |    7 +++++--
 glibc.patch |   14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-22 21:05:57 UTC (rev 141494)
+++ PKGBUILD	2015-09-22 21:29:21 UTC (rev 141495)
@@ -22,15 +22,18 @@
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz
         gdal-1.5.1-python-install.patch
-        poppler-0.31.patch)
+        poppler-0.31.patch
+		glibc.patch)
 sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
             '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
-            '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6')
+            '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6'
+            'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f')
 
 prepare() {
   cd "${srcdir}"/$_pkgname-$pkgver
   patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
   patch -Np1 -i "${srcdir}"/poppler-0.31.patch
+  patch -Np3 -i "${srcdir}"/glibc.patch
 
 # python2 fixes
   sed -i 's_python python1.5_python2 python python1.5_' configure

Added: glibc.patch
===================================================================
--- glibc.patch	                        (rev 0)
+++ glibc.patch	2015-09-22 21:29:21 UTC (rev 141495)
@@ -0,0 +1,14 @@
+Index: trunk/gdal/apps/gdalserver.c
+===================================================================
+--- a/trunk/gdal/apps/gdalserver.c
++++ b/trunk/gdal/apps/gdalserver.c
+@@ -28,7 +28,6 @@
+  ****************************************************************************/
+
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+
+ #include "cpl_port.h"