commit: 2b24ca5a9e9050d5346033478c6e58f15219f87d Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com> AuthorDate: Mon Dec 5 08:26:16 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Mon Jan 30 09:50:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b24ca5a
sci-geosciences/mapserver: version bump to 8.0.0 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28544 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-geosciences/mapserver/Manifest | 1 + .../files/mapserver-8.0.0-wfs-paging.patch | 12 + sci-geosciences/mapserver/mapserver-8.0.0.ebuild | 291 +++++++++++++++++++++ 3 files changed, 304 insertions(+) diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index f71ac13a5ac5..2306a474faa7 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1 +1,2 @@ DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce +DIST mapserver-8.0.0.tar.gz 2945524 BLAKE2B b67fb10f62e3c8cf4ae6d69863ef841fd2dd4106de55fd08dfc8146191bed1f18f12003455462503afcdb49e45d1368d89be591c152dcabba2b18587d27efaef SHA512 b9275f5e3399efb3cb189472ed28d081055e79da9aa35f7c9b8567b2d2d3cfc425ea7750b36a40db9ab537261c099356dc923e7b91941919d79c38f740327b97 diff --git a/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch b/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch new file mode 100644 index 000000000000..ff78c7f2372e --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch @@ -0,0 +1,12 @@ +diff --git a/maporaclespatial.c b/maporaclespatial.c +index e7a50319e..5558f0231 100644 +--- a/maporaclespatial.c ++++ b/maporaclespatial.c +@@ -2086,6 +2086,7 @@ int msOracleSpatialLayerWhichShapes( layerObj *layer, rectObj rect, int isQuery) + msFree(tmp1_str); + + tmp_str = msStringConcatenate(tmp_str, query_str2); ++ memset(query_str,0,strlen(query_str)); + query_str = msStringConcatenate(query_str, tmp_str); + msFree(tmp_str); + } diff --git a/sci-geosciences/mapserver/mapserver-8.0.0.ebuild b/sci-geosciences/mapserver/mapserver-8.0.0.ebuild new file mode 100644 index 000000000000..fa0e3a656b30 --- /dev/null +++ b/sci-geosciences/mapserver/mapserver-8.0.0.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Variables for the miscellaneous bindings we provide +PHP_EXT_OPTIONAL_USE="php" +PHP_EXT_NAME="php_mapscriptng" +PHP_EXT_SKIP_PHPIZE="yes" +PHP_EXT_SKIP_PATCHES="yes" + +USE_PHP="php7-4" +PYTHON_COMPAT=( python3_{9..11} ) + +WEBAPP_MANUAL_SLOT=yes +WEBAPP_OPTIONAL=yes + +inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp + +DESCRIPTION="Development environment for building spatially enabled webapps" +HOMEPAGE="https://mapserver.org/"; +SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"; + +LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +# NOTE: opengl removed for now as no support for it in upstream CMake +IUSE="apache bidi cairo geos mysql oracle perl php postgis python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# Tests: +# Included tests (tests/*) are seriously outdated +# Upstream's main test suite (msautotest/*) is not in the release tarball, +# and upstream sets 'export-ignore' for that directory. +# +# The eclasses used normally try to run test suites themselves, +# or skip if nothing was found. +# However, because of the php-ext-* eclass usage, this fails and would +# cause errors running non-existent tests, so we have to restrict here. +RESTRICT="test" + +RDEPEND=" + >=dev-libs/expat-2.2.8 + dev-libs/libxml2:2= + dev-libs/libxslt[crypt] + >=dev-libs/protobuf-c-1.3.2:= + >=media-libs/freetype-2.9.1-r3 + >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] + >=media-libs/giflib-5.2.1:= + media-libs/libjpeg-turbo + >=media-libs/libpng-1.6.37:= + >=net-misc/curl-7.69.1 + >=sci-libs/gdal-3.0.4:=[oracle?] + >=sci-libs/proj-6.2.1:= + virtual/libiconv + >=x11-libs/agg-2.5-r3 + apache? ( + app-admin/webapp-config + dev-libs/fcgi + ) + bidi? ( + dev-libs/fribidi + media-libs/harfbuzz:= + ) + cairo? ( x11-libs/cairo ) + geos? ( sci-libs/geos ) + mysql? ( dev-db/mysql-connector-c:= ) + oracle? ( dev-db/oracle-instantclient:= ) + perl? ( dev-lang/perl:= ) + postgis? ( + dev-db/postgis + dev-db/postgresql:= + ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + perl? ( >=dev-lang/swig-4.0 ) + php? ( >=dev-lang/swig-4.0 ) + python? ( + >=dev-lang/swig-4.0 + >=dev-python/setuptools-44.1.0 + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-wfs-paging.patch +) + +want_apache2 apache + +pkg_setup() { + use apache && webapp_pkg_setup + use perl && perl_set_version +} + +src_prepare() { + cmake_src_prepare + + use php && php-ext-source-r3_src_prepare + use python && python_copy_sources +} + +_generate_cmake_args() { + # Provides a simple, bare config for bindings to build upon + # Need WITH_WMS=ON or build fails + local args=( + "-DCMAKE_SKIP_RPATH=ON" + "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DWITH_CAIRO=OFF" + "-DWITH_FCGI=OFF" + "-DWITH_FRIBIDI=OFF" + "-DWITH_GEOS=OFF" + "-DWITH_GIF=OFF" + "-DWITH_HARFBUZZ=OFF" + "-DWITH_ICONV=OFF" + "-DWITH_PROTOBUFC=OFF" + "-DWITH_POSTGIS=OFF" + "-DWITH_WMS=ON" + "-DWITH_WCS=OFF" + "-DWITH_WFS=OFF" + "-DWITH_OGCAPI=OFF" + ) + + echo "${args[@]}" +} + +src_configure() { + # NOTE: We could make this based on _generate_cmake_args, but + # then we wouldn't be as-explicit about what is enabled/not, + # and reliant on defaults not changing. + # Readability and maintainability is better this way. + local mycmakeargs=( + "-DCMAKE_SKIP_RPATH=ON" + "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DWITH_CLIENT_WMS=ON" + "-DWITH_CLIENT_WFS=ON" + "-DWITH_CURL=ON" + "-DWITH_GIF=ON" + "-DWITH_ICONV=ON" + "-DWITH_KML=ON" + "-DWITH_LIBXML2=ON" + "-DWITH_PHPNG=OFF" + "-DWITH_PROTOBUFC=ON" + "-DWITH_SOS=ON" + "-DWITH_WMS=ON" + "-DWITH_WFS=ON" + "-DWITH_WCS=ON" + "-DWITH_XMLMAPFILE=ON" + "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" + "-DWITH_CAIRO=$(usex cairo ON OFF)" + "-DWITH_FCGI=$(usex apache ON OFF)" + "-DWITH_GEOS=$(usex geos ON OFF)" + "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" + "-DWITH_MYSQL=$(usex mysql ON OFF)" + "-DWITH_FRIBIDI=$(usex bidi ON OFF)" + "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" + "-DWITH_POSTGIS=$(usex postgis ON OFF)" + "-DWITH_PERL=$(usex perl ON OFF)" + ) + + use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" ) + + # Configure the standard build first + cmake_src_configure + + # Minimal build for bindings + # Note that we use _generate_cmake_args to get a clean config each time, then add + # in options as appropriate. Otherwise we'd get contamination between bindings. + if use python ; then + mycmakeargs=( + $(_generate_cmake_args) + "-DWITH_PYTHON=ON" + ) + + python_foreach_impl cmake_src_configure + python_foreach_impl python_optimize + fi + + if use php ; then + local slot= + for slot in $(php_get_slots) ; do + # Switch to the slot's build dir + php_init_slot_env "${slot}" + + # Take a blank config each time + # Add in only *this* slot's PHP includes dir, etc + mycmakeargs=( + $(_generate_cmake_args) + "-DWITH_PHPNG=ON" + "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}" + "-DPHP_INCLUDES=${PHPPREFIX}" + ) + + BUILD_DIR="${S}/php${slot}" cmake_src_configure + + # Return to where we left off, in case we add more + # to this phase. + cd "${S}" || die + done + fi +} + +src_compile() { + cmake_src_compile + + if use python ; then + python_foreach_impl cmake_src_compile + fi + + if use php ; then + local slot= + for slot in $(php_get_slots) ; do + # Switch to the slot's build dir + php_init_slot_env "${slot}" + + # Force cmake to build in it + BUILD_DIR="${S}/php${slot}" cmake_src_compile + + # Return to where we left off, in case we add more + # to this phase. + cd "${S}" || die + done + fi +} + +src_install() { + # Needs to be first + use apache && webapp_src_preinst + + if use python ; then + python_foreach_impl cmake_src_install + python_foreach_impl python_optimize + fi + + if use php ; then + php-ext-source-r3_createinifiles + + local slot= + for slot in $(php_get_slots) ; do + php_init_slot_env "${slot}" + + BUILD_DIR="${S}/php${slot}" cmake_src_install + + cd "${S}" || die + done + fi + + # Install this last because this build is the most "fully-featured" + cmake_src_install + + if use apache ; then + # We need a mapserver symlink available in cgi-bin + dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv + webapp_src_install + fi +} + +pkg_preinst() { + # We need to cache the value here of HAD_PHP because we want the + # original package version, not the result of us installing a new one + HAD_PHP= + has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1 +} + +pkg_postinst() { + use apache && webapp_pkg_postinst + + # Let upgrading (from a pre-rewrite version) users know that the PHP module changed + local replacing_version= + for replacing_version in ${REPLACING_VERSIONS} ; do + if ver_test "7.6.0" -gt "${replacing_version}" ; then + if use php && [[ ${HAD_PHP} -eq 1 ]] ; then + elog "Note that MapServer has deprecated the old PHP extension" + elog "You can read more at: " + elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"; + elog "This may involve porting some of your PHP scripts to use the new module." + fi + + # Only show the message once + break + fi + done +} + +pkg_prerm() { + use apache && webapp_pkg_prerm +}
