commit: d23b0782f055c419ca5b714be03134598cb7d752 Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com> AuthorDate: Wed Oct 20 16:12:05 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 21 04:18:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23b0782
sci-geosciences/mapserver: added patch to find oracle libnnz21 library Closes: https://bugs.gentoo.org/819042 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22647 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/mapserver/files/mapserver-oracle21.patch | 12 ++++++++++++ sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild | 1 + sci-geosciences/mapserver/mapserver-7.6.4.ebuild | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/sci-geosciences/mapserver/files/mapserver-oracle21.patch b/sci-geosciences/mapserver/files/mapserver-oracle21.patch new file mode 100644 index 00000000000..e77da3ee02a --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-oracle21.patch @@ -0,0 +1,12 @@ +diff -Naru a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake +--- a/cmake/FindOracle.cmake 2021-10-20 17:50:27.817205162 +0200 ++++ b/cmake/FindOracle.cmake 2021-10-20 17:52:04.977205742 +0200 +@@ -37,7 +37,7 @@ + ${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 nnz18 libnnz18 ociw32 nnz19 libnnz19) ++ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32 nnz19 libnnz19 nnz21 libnnz21) + set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12) + + set(ORACLE_LIB_DIR diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild index 090466afc3c..a9f1ea99c8a 100644 --- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild +++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild @@ -88,6 +88,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-proj8.patch + "${FILESDIR}"/${PN}-oracle21.patch ) want_apache2 apache diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild index 4a23194cd84..3c1b5cb396a 100644 --- a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild +++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild @@ -86,6 +86,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-oracle21.patch +) + want_apache2 apache pkg_setup() {
