summaryrefslogtreecommitdiff
path: root/sci-geosciences/mapserver/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /sci-geosciences/mapserver/files
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'sci-geosciences/mapserver/files')
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch13
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch34
2 files changed, 0 insertions, 47 deletions
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
deleted file mode 100644
index a22fcf4de6aa..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
-index 18055f7..2568b5e 100644
---- a/cmake/FindOracle.cmake
-+++ b/cmake/FindOracle.cmake
-@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
- ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
-
- set(ORACLE_OCI_NAMES clntsh libclntsh oci)
-- set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
-+ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32)
- set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
-
- set(ORACLE_LIB_DIR
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
deleted file mode 100644
index f438bec9f125..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/mapwfs11.c b/mapwfs11.c
-index 20ab164..4dc15fc 100755
---- a/mapwfs11.c
-+++ b/mapwfs11.c
-@@ -29,12 +29,12 @@
-
- #include "mapserver.h"
- #include "mapows.h"
-+#include "mapowscommon.h"
-
-
-
- #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
- #include "maplibxml2.h"
--#include "mapowscommon.h"
- #include "mapogcfilter.h"
-
- /************************************************************************/
-diff --git a/mapwfs20.c b/mapwfs20.c
-index 710d444..cf69ee3 100755
---- a/mapwfs20.c
-+++ b/mapwfs20.c
-@@ -29,10 +29,10 @@
-
- #include "mapserver.h"
- #include "mapows.h"
-+#include "mapowscommon.h"
-
- #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
- #include "maplibxml2.h"
--#include "mapowscommon.h"
- #include "mapogcfilter.h"
-
- #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX