diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-geosciences/mapserver/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-geosciences/mapserver/files')
3 files changed, 68 insertions, 0 deletions
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 new file mode 100644 index 000000000000..f438bec9f125 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch @@ -0,0 +1,34 @@ +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 diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch new file mode 100644 index 000000000000..17016c66e67c --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch @@ -0,0 +1,13 @@ +diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c +index 7949ddf..c8dbde6 100644 +--- a/apache/mod_mapserver.c ++++ b/apache/mod_mapserver.c +@@ -40,7 +40,7 @@ static int + msIO_apacheError (void *cbData, void *data, int byteCount) + { + /* error reporting is done through the log file... */ +- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data); ++ ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data); + return strlen ((char*) data); + } + diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch new file mode 100644 index 000000000000..ee8da6ca1fe0 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch @@ -0,0 +1,21 @@ +commit 7e4be3d354053bca65838c2c481a61d4d5c24a3b +Author: Ettore Di Giacinto <mudler@gentoo.org> +Date: Tue May 23 20:12:20 2017 +0200 + + Fix mapserver to build when TRUE macro is not defined + +diff --git a/mapserver.h b/mapserver.h +index 32182fa0..19b1075c 100644 +--- a/mapserver.h ++++ b/mapserver.h +@@ -78,6 +78,10 @@ + #include <stdint.h> + #endif + ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ + #ifdef _WIN32 + #ifndef SIZE_MAX + #ifdef _WIN64 |