diff options
| author |   Marco Genasci <fedeliallalinea@gmail.com> | 2019-05-16 11:57:43 +0200 |
|---|---|---|
| committer |   Amy Liffey <amynka@gentoo.org> | 2019-05-26 10:54:04 +0200 |
| commit | 738cb929ab90549b8def4e7ac04ae99df141a298 (patch) | |
| tree | a4c9b3b03cb145d83cef188787c04d14bfb9e066 /sci-geosciences/mapserver/files | |
| parent | sys-boot/yaboot: disable ld.gold, bug #678710 (diff) | |
| download | gentoo-738cb929ab90549b8def4e7ac04ae99df141a298.tar.gz gentoo-738cb929ab90549b8def4e7ac04ae99df141a298.tar.bz2 gentoo-738cb929ab90549b8def4e7ac04ae99df141a298.zip | |
sci-geosciences/mapserver: bump to version 7.0.7
- apache support not mandatory
- add oracle support
- fix compilation with proj-6.0.0
Bug: https://bugs.gentoo.org/674480
Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
Signed-off-by: Amy Liffey <amynka@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'sci-geosciences/mapserver/files')
| -rw-r--r-- | sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch | 13 | ||||
| -rw-r--r-- | sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch | 19 |
2 files changed, 32 insertions, 0 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 new file mode 100644 index 000000000000..a22fcf4de6aa --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch @@ -0,0 +1,13 @@ +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.7-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch new file mode 100644 index 000000000000..daf5ab1ebc7c --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch @@ -0,0 +1,19 @@ +diff --git a/mapserver.h b/mapserver.h +index df7eeb9..9516a6c 100644 +--- a/mapserver.h ++++ b/mapserver.h +@@ -55,6 +55,14 @@ + #include <unistd.h> + #endif + ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ ++#ifndef FALSE ++#define FALSE 0 ++#endif ++ + #if defined(_WIN32) && !defined(__CYGWIN__) + # define MS_DLL_EXPORT __declspec(dllexport) + #define USE_MSFREE |