adjusted upstream patch to fix build with poppler 0.69.0

[packages/gdal.git] / gdal-pluginsdir.patch

diff --git a/gdal-pluginsdir.patch b/gdal-pluginsdir.patch
index e2b061358484f28e7de3b59dc31ad825e7e279c8..fa9ef60b81407cd0fcbb6ea7d40899da5c73e540 100644 (file)
--- a/gdal-pluginsdir.patch
+++ b/gdal-pluginsdir.patch
@@ -6,7 +6,7 @@
      {
 -#ifdef GDAL_PREFIX
 +#if 1
-         papszSearchPath = CSLAddString( papszSearchPath, 
+         papszSearchPath = CSLAddString( papszSearchPath,
      #ifdef MACOSX_FRAMEWORK
                                          GDAL_PREFIX "/PlugIns");
      #else
@@ -15,8 +15,8 @@
      #endif
  #else
          char szExecPath[1024];
---- gdal-1.11.2/configure.in.orig      2015-03-01 09:07:33.069445871 +0100
-+++ gdal-1.11.2/configure.in   2015-03-01 21:13:55.727616880 +0100
+--- gdal-1.11.2/configure.ac.orig      2015-03-01 09:07:33.069445871 +0100
++++ gdal-1.11.2/configure.ac   2015-03-01 21:13:55.727616880 +0100
 @@ -3812,12 +3812,16 @@
  
  if test "$prefix" = "NONE" ; then