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 93bbf6f190fc8149efb9e170383ea96c140d0052..fa9ef60b81407cd0fcbb6ea7d40899da5c73e540 100644 (file)
--- a/gdal-pluginsdir.patch
+++ b/gdal-pluginsdir.patch
@@ -1,20 +1,3 @@
---- gdal-1.11.2/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp.orig  2015-02-10 13:11:16.000000000 +0100
-+++ gdal-1.11.2/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp       2015-03-01 21:09:07.960962291 +0100
-@@ -815,12 +815,12 @@
-     }
-     else
-     {
--#ifdef GDAL_PREFIX
-+#if 1
-         papszSearchPath = CSLAddString( papszSearchPath,
-     #ifdef MACOSX_FRAMEWORK
-                                         GDAL_PREFIX "/PlugIns");
-     #else
--                                        GDAL_PREFIX "/lib/gdalplugins" );
-+                                        GDAL_LIBDIR "/gdalplugins" );
-     #endif
- #else
-         char szExecPath[1024];
 --- gdal-1.11.2/gcore/gdaldrivermanager.cpp.orig       2015-02-10 13:12:08.000000000 +0100
 +++ gdal-1.11.2/gcore/gdaldrivermanager.cpp    2015-03-01 21:11:24.537623226 +0100
 @@ -686,12 +686,12 @@
@@ -23,7 +6,7 @@
      {
 -#ifdef GDAL_PREFIX
 +#if 1
-         papszSearchPath = CSLAddString( papszSearchPath, 
+         papszSearchPath = CSLAddString( papszSearchPath,
      #ifdef MACOSX_FRAMEWORK
                                          GDAL_PREFIX "/PlugIns");
      #else
@@ -32,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