forked from pool/mapserver
update, still has a build failure (ruby)
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=109
This commit is contained in:
Dirk Stoecker
Git OBS Bridge
parent
5426710b9a
commit
6acbb3f0b6
8836
5461.patch
8836
5461.patch
File diff suppressed because it is too large
Load Diff
@ -1,73 +0,0 @@
|
||||
Description: Fix errors with CMake 3.12 for get_target_property commands.
|
||||
Author: Bas Couwenberg <sebastic@debian.org>
|
||||
Bug: https://github.com/mapserver/mapserver/issues/5646
|
||||
Bug-Debian: https://bugs.debian.org/906605
|
||||
|
||||
--- a/mapscript/java/CMakeLists.txt
|
||||
+++ b/mapscript/java/CMakeLists.txt
|
||||
@@ -42,6 +42,14 @@ ADD_CUSTOM_COMMAND(TARGET javamapscript
|
||||
COMMENT "Compiling java source files, creating mapscript.jar"
|
||||
)
|
||||
|
||||
+# Workaround for CMake 3.12 error:
|
||||
+#
|
||||
+# The LOCATION property may not be read from target "foo". Use
|
||||
+# the target name directly with add_custom_command, or use the generator
|
||||
+# expression $<TARGET_FILE>, as appropriate.
|
||||
+
|
||||
+cmake_policy(SET CMP0026 OLD)
|
||||
+
|
||||
get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_javamapscript_REAL_NAME} LOCATION)
|
||||
install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION lib/jni)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.jar DESTINATION share/java)
|
||||
--- a/mapscript/perl/CMakeLists.txt
|
||||
+++ b/mapscript/perl/CMakeLists.txt
|
||||
@@ -18,6 +18,14 @@ if(APPLE)
|
||||
set_target_properties(perlmapscript PROPERTIES SUFFIX ".bundle")
|
||||
endif(APPLE)
|
||||
|
||||
+# Workaround for CMake 3.12 error:
|
||||
+#
|
||||
+# The LOCATION property may not be read from target "foo". Use
|
||||
+# the target name directly with add_custom_command, or use the generator
|
||||
+# expression $<TARGET_FILE>, as appropriate.
|
||||
+
|
||||
+cmake_policy(SET CMP0026 OLD)
|
||||
+
|
||||
get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_perlmapscript_REAL_NAME} LOCATION)
|
||||
set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm)
|
||||
install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript)
|
||||
--- a/mapscript/python/CMakeLists.txt
|
||||
+++ b/mapscript/python/CMakeLists.txt
|
||||
@@ -39,6 +39,14 @@ set_target_properties(${SWIG_MODULE_pyth
|
||||
|
||||
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
+# Workaround for CMake 3.12 error:
|
||||
+#
|
||||
+# The LOCATION property may not be read from target "foo". Use
|
||||
+# the target name directly with add_custom_command, or use the generator
|
||||
+# expression $<TARGET_FILE>, as appropriate.
|
||||
+
|
||||
+cmake_policy(SET CMP0026 OLD)
|
||||
+
|
||||
get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_pythonmapscript_REAL_NAME} LOCATION)
|
||||
set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
|
||||
install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
|
||||
--- a/mapscript/ruby/CMakeLists.txt
|
||||
+++ b/mapscript/ruby/CMakeLists.txt
|
||||
@@ -32,6 +32,14 @@ if(APPLE)
|
||||
set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES SUFFIX ".bundle")
|
||||
endif(APPLE)
|
||||
|
||||
+# Workaround for CMake 3.12 error:
|
||||
+#
|
||||
+# The LOCATION property may not be read from target "foo". Use
|
||||
+# the target name directly with add_custom_command, or use the generator
|
||||
+# expression $<TARGET_FILE>, as appropriate.
|
||||
+
|
||||
+cmake_policy(SET CMP0026 OLD)
|
||||
+
|
||||
get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} LOCATION)
|
||||
execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_VENDORARCHDIR})
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:806ee58421f1c6cceea65e4764524b68e9e3ff6d1ebfe6767b51718dbec43c73
|
||||
size 2676080
|
||||
3
mapserver-7.4.0.tar.gz
Normal file
3
mapserver-7.4.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fc714f5836023fd39005296665c562022fa294348ecc244b93647b3ba1e361f5
|
||||
size 2686054
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 17 09:05:04 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
|
||||
|
||||
- update to version 7.4.0
|
||||
* MS RFC 117: PHP 7 MapScript Support Through SWIG
|
||||
* native support for PHP 7 through mapscript (461f827)
|
||||
* Fix potential cross-site scripting (XSS) security issue with
|
||||
[layers] tag
|
||||
* enhanced support for Python 3 mapscript through SWIG
|
||||
* Allow compiling with PROJ 6, but full PROJ 6 support will be
|
||||
included in the future MapServer 8 release (#5766)
|
||||
- Drop 5461.patch and cmake-3.12.patch included upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 13 09:28:34 UTC 2018 - Dirk Stoecker <opensuse@dstoecker.de>
|
||||
|
||||
|
||||
@ -28,18 +28,13 @@
|
||||
%endif
|
||||
|
||||
Name: mapserver
|
||||
Version: 7.2.0
|
||||
Version: 7.4.0
|
||||
Release: 0
|
||||
Summary: Environment for building spatially-enabled internet applications
|
||||
License: MIT
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Url: https://www.mapserver.org/
|
||||
Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM Fix PHP7 support
|
||||
# https://patch-diff.githubusercontent.com/raw/mapserver/mapserver/pull/5461.patch
|
||||
Patch1: 5461.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/mapserver/mapserver/issues/5646
|
||||
Patch2: https://salsa.debian.org/debian-gis-team/mapserver/raw/a039ff238258e7c3b9206b4a55d5d46eb4289dbd/debian/patches/cmake-3.12.patch
|
||||
BuildRequires: FastCGI-devel
|
||||
BuildRequires: apache2-devel
|
||||
BuildRequires: autoconf
|
||||
@ -200,7 +195,6 @@ against the C Mapserver library.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%global _default_patch_fuzz 5
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
mkdir build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user