[arch-commits] Commit in gdal/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Monday, October 22, 2018 @ 21:03:44
  Author: foutrelis
Revision: 398514

Fix build with latest poppler

Modified:
  gdal/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++++
 1 file changed, 8 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-22 21:02:29 UTC (rev 398513)
+++ PKGBUILD	2018-10-22 21:03:44 UTC (rev 398514)
@@ -19,13 +19,18 @@
 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)
 sha256sums=('3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4'
+            'cc63ee56e2c62c994a65723d4124171ce9b4e3499c0958be710c04bf82fd4cf5'
             'a41a0129a878a0d09b8ecf24b8a0b473856d929d52f535afdf4dca95ddd347d3')
 
 prepare() {
   cd "${srcdir}"/$pkgbase-$pkgver
 
+# Fix build with poppler >= 0.69.0
+  patch -Np2 -i ../gdal-poppler-0.69.0.patch
+
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 
@@ -37,6 +42,9 @@
   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"