[Git][debian-gis-team/mapserver][master] 2 commits: Add patch with changes from PR#5674 for CMake 3.12.
Bas Couwenberg
gitlab at salsa.debian.org
Tue Oct 23 11:33:31 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / mapserver
Commits:
010cde44 by Bas Couwenberg at 2018-10-06T14:48:45Z
Add patch with changes from PR#5674 for CMake 3.12.
- - - - -
c26ab2cd by Bas Couwenberg at 2018-10-23T10:33:18Z
Add Build-Depends-Package field to symbols file.
- - - - -
4 changed files:
- debian/changelog
- debian/libmapserver2.symbols
- + debian/patches/pr5674_Use-generator-expressions-in-MapScript-CMakeLists.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mapserver (7.2.1-2) UNRELEASED; urgency=medium
+
+ * Add patch with changes from PR#5674 for CMake 3.12.
+ * Add Build-Depends-Package field to symbols file.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 05 Oct 2018 09:46:56 +0200
+
mapserver (7.2.1-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/libmapserver2.symbols
=====================================
@@ -1,5 +1,6 @@
# SymbolsHelper-Confirmed: 7.2.0 amd64 arm64 armel armhf i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el riscv64 s390x sh4 sparc64
libmapserver.so.2 #PACKAGE# #MINVER#
+* Build-Depends-Package: libmapserver-dev
BuildExpressionTree at Base 6.2.1
CleanVSIDir at Base 6.2.1
CompareEllipseRegion at Base 6.2.1
=====================================
debian/patches/pr5674_Use-generator-expressions-in-MapScript-CMakeLists.patch
=====================================
@@ -0,0 +1,102 @@
+From a2d9b0f0a9416bd2d1bd6e38445388e3d9adff32 Mon Sep 17 00:00:00 2001
+From: Seth G <geographika at gmail.com>
+Date: Fri, 5 Oct 2018 00:29:03 +0200
+Subject: [PATCH 1/3] Use generator expressions in CMake
+
+See #5646
+Also standardise commands in lower-case
+---
+ mapscript/perl/CMakeLists.txt | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+--- a/mapscript/perl/CMakeLists.txt
++++ b/mapscript/perl/CMakeLists.txt
+@@ -9,7 +9,12 @@ include_directories(${PROJECT_SOURCE_DIR
+ add_definitions(${PERL_EXTRA_C_FLAGS})
+ SET(CMAKE_SWIG_FLAGS -shadow -w314)
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/perl)
+-SWIG_ADD_MODULE(perlmapscript perl5 ../mapscript.i)
++
++if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
++ swig_add_library(perlmapscript TYPE MODULE LANGUAGE perl5 SOURCES ../mapscript.i)
++else ()
++ swig_add_module(perlmapscript perl5 ../mapscript.i)
++endif ()
+
+ SWIG_LINK_LIBRARIES(perlmapscript ${PERL_LIBRARIES} ${MAPSERVER_LIBMAPSERVER})
+ set_target_properties(perlmapscript PROPERTIES OUTPUT_NAME mapscript)
+@@ -18,8 +23,5 @@ if(APPLE)
+ set_target_properties(perlmapscript PROPERTIES SUFFIX ".bundle")
+ endif(APPLE)
+
+-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)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR})
+-
++install(FILES $<TARGET_FILE:${SWIG_MODULE_perlmapscript_REAL_NAME}> DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript)
++install(FILES $<TARGET_FILE_DIR:${SWIG_MODULE_perlmapscript_REAL_NAME}>/mapscript.pm DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR})
+--- a/mapscript/java/CMakeLists.txt
++++ b/mapscript/java/CMakeLists.txt
+@@ -13,7 +13,6 @@ include_directories(${PROJECT_SOURCE_DIR
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/java)
+ SET (CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/edu/umn/gis/mapscript")
+ SET(CMAKE_SWIG_FLAGS -package edu.umn.gis.mapscript)
+-SWIG_ADD_MODULE(javamapscript java ../mapscript.i)
+
+ # Java mapscript fails to build with -Werror=format-security
+
+@@ -32,6 +31,12 @@ if(${CMAKE_CPP_FLAGS} MATCHES "-Werror=f
+ set(CMAKE_CPP_FLAGS "${TMP}")
+ endif(${CMAKE_CPP_FLAGS} MATCHES "-Werror=format-security")
+
++if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
++ swig_add_library(javamapscript TYPE MODULE LANGUAGE java SOURCES ../mapscript.i)
++else ()
++ swig_add_module(javamapscript java ../mapscript.i)
++endif ()
++
+ SWIG_LINK_LIBRARIES(javamapscript ${MAPSERVER_LIBMAPSERVER})
+
+ ADD_CUSTOM_COMMAND(TARGET javamapscript
+@@ -42,6 +47,6 @@ ADD_CUSTOM_COMMAND(TARGET javamapscript
+ COMMENT "Compiling java source files, creating mapscript.jar"
+ )
+
+-get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_javamapscript_REAL_NAME} LOCATION)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION lib/jni)
++set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_javamapscript_REAL_NAME}>)
++install(FILES ${mapscript_files} DESTINATION lib/jni)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.jar DESTINATION share/java)
+--- a/mapscript/ruby/CMakeLists.txt
++++ b/mapscript/ruby/CMakeLists.txt
+@@ -5,7 +5,6 @@ INCLUDE_DIRECTORIES(${RUBY_INCLUDE_DIRS}
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/swiginc)
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/)
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/ruby)
+-SWIG_ADD_MODULE(rubymapscript ruby ../mapscript.i)
+
+ # Ruby mapscript fails to build with -Werror=format-security
+
+@@ -24,6 +23,12 @@ if(${CMAKE_CPP_FLAGS} MATCHES "-Werror=f
+ set(CMAKE_CPP_FLAGS "${TMP}")
+ endif(${CMAKE_CPP_FLAGS} MATCHES "-Werror=format-security")
+
++if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
++ swig_add_library(rubymapscript TYPE MODULE LANGUAGE ruby SOURCES ../mapscript.i)
++else ()
++ SWIG_ADD_MODULE(rubymapscript ruby ../mapscript.i)
++endif ()
++
+ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY_LIBRARY} ${MAPSERVER_LIBMAPSERVER})
+
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES PREFIX "")
+@@ -32,6 +37,6 @@ if(APPLE)
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES SUFFIX ".bundle")
+ endif(APPLE)
+
+-get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} LOCATION)
++set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_rubymapscript_REAL_NAME}>)
+ 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})
++install(FILES ${mapscript_files} DESTINATION ${RUBY_VENDORARCHDIR})
=====================================
debian/patches/series
=====================================
@@ -2,4 +2,5 @@ hardening.patch
perl-mapscript-install.patch
ruby-mapscript-install.patch
java-hardening.patch
-cmake-3.12.patch
+#cmake-3.12.patch
+pr5674_Use-generator-expressions-in-MapScript-CMakeLists.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/cefacf8d4285453a630cc3bc081a14ff662ddee5...c26ab2cd55f9269bb202af8a27343396fa47583e
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/cefacf8d4285453a630cc3bc081a14ff662ddee5...c26ab2cd55f9269bb202af8a27343396fa47583e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181023/8eca24d4/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list