1 files changed, 0 insertions, 56 deletions
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
deleted file mode 100644
index 088e37b14c86..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ab2a6129435ca37d02730a6faf85593afa0daf9b Mon Sep 17 00:00:00 2001
-From: Thomas Bonfort <thomas.bonfort@gmail.com>
-Date: Mon, 16 Nov 2015 16:56:02 +0100
-Subject: [PATCH] Fix build issues with OGR disabled
-
----
- mapimageio.c   | 2 +-
- mapogcfilter.c | 1 +
- mapogr.cpp     | 2 ++
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/mapimageio.c b/mapimageio.c
-index 771188b..95feda2 100644
---- a/mapimageio.c
-+++ b/mapimageio.c
-@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
-       /* If the user doesn't provide a value for JPEGMEM, we want to be sure */
-       /* that at least the image size will be used before creating the temporary file */
-       cinfo.mem->max_memory_to_use =
--        MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
-+        MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
-     }
-   }
- 
-diff --git a/mapogcfilter.c b/mapogcfilter.c
-index 50e2e7b..05f017a 100644
---- a/mapogcfilter.c
-+++ b/mapogcfilter.c
-@@ -40,6 +40,7 @@
- #include "mapowscommon.h"
- #include "maptime.h"
- #include "mapows.h"
-+#include <ctype.h>
- 
- static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
- 
-diff --git a/mapogr.cpp b/mapogr.cpp
-index 07acdba..80f032b 100644
---- a/mapogr.cpp
-+++ b/mapogr.cpp
-@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
- 
-   return MS_SUCCESS;
- }
-+#endif /* USE_OGR */
- 
- /************************************************************************/
- /*                           msOGREscapeSQLParam                        */
-@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
- #endif /* USE_OGR */
- }
- 
-+#ifdef USE_OGR
- /**********************************************************************
-  *                     msOGRTranslateMsExpressionToOGRSQL()
-  *