[mapserver] 05/11: Drop patches applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Feb 25 22:00:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapserver.
commit a3c0e36e803011f63bed1e46eb139e38b9b9f918
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Feb 25 21:19:10 2016 +0100
Drop patches applied upstream.
---
debian/changelog | 1 +
.../0001-Fix-compilation-with-gif_lib-5.1.patch | 36 --
...apscript-to-be-compatible-with-newer-swig.patch | 29 --
debian/patches/cmake-mapserver-export.patch | 378 ---------------------
...-mapserver-target-for-static-libmapserver.patch | 107 ------
.../patches/dont-install-headers-in-usr-lib.patch | 37 --
debian/patches/fix-types.patch | 22 --
debian/patches/series | 8 -
debian/patches/should-typo.patch | 27 --
.../patches/windows-archive-install-target.patch | 16 -
10 files changed, 1 insertion(+), 660 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5dd4752..f689388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mapserver (7.0.1-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.7, no changes.
* Update watch file to use download.osgeo.org.
GitHub releases include msautotest which contains non-free CITE tests.
+ * Drop patches applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Thu, 25 Feb 2016 21:05:55 +0100
diff --git a/debian/patches/0001-Fix-compilation-with-gif_lib-5.1.patch b/debian/patches/0001-Fix-compilation-with-gif_lib-5.1.patch
deleted file mode 100644
index e6f959d..0000000
--- a/debian/patches/0001-Fix-compilation-with-gif_lib-5.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3e76491eafeb3f4d573f40fe7699656347882393 Mon Sep 17 00:00:00 2001
-From: Sander Jansen <s.jansen at gmail.com>
-Date: Wed, 19 Aug 2015 16:51:13 -0500
-Subject: Fix compilation with gif_lib 5.1
-Origin: https://github.com/mapserver/mapserver/commit/3e76491eafeb3f4d573f40fe7699656347882393
-Bug: https://github.com/mapserver/mapserver/pull/5144
-Bug-Debian: https://bugs.debian.org/803299
-
----
- mapimageio.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/mapimageio.c
-+++ b/mapimageio.c
-@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj
-
- } while (recordType != TERMINATE_RECORD_TYPE);
-
-+
-+#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5))
-+ if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
-+ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode));
-+ return MS_FAILURE;
-+ }
-+#else
- if (DGifCloseFile(image) == GIF_ERROR) {
- #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
- msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
-@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj
- #endif
- return MS_FAILURE;
- }
-+#endif
-
- return MS_SUCCESS;
- }
diff --git a/debian/patches/0001-Fix-java-mapscript-to-be-compatible-with-newer-swig.patch b/debian/patches/0001-Fix-java-mapscript-to-be-compatible-with-newer-swig.patch
deleted file mode 100644
index a5ac144..0000000
--- a/debian/patches/0001-Fix-java-mapscript-to-be-compatible-with-newer-swig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8399145191c4bf2065ba436a62ca76b776c5bb19 Mon Sep 17 00:00:00 2001
-From: Bruno Friedmann <bruno at ioda-net.ch>
-Date: Sun, 4 Oct 2015 11:32:22 +0200
-Subject: [PATCH] Fix java mapscript to be compatible with newer swig (#5174)
-Origin: https://github.com/mapserver/mapserver/commit/8399145191c4bf2065ba436a62ca76b776c5bb19
-
-closes #5174
-closes #5178
----
- mapscript/java/javamodule.i | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/mapscript/java/javamodule.i
-+++ b/mapscript/java/javamodule.i
-@@ -1,9 +1,11 @@
-
- %include arrays_java.i
-
--# Uncomment this if you wish to hace enums wrapped in an interface compatible
--# with that generated by swig 1.3.21 (tests wont compile, though)
--#%include enumsimple.swg
-+/*
-+ Uncomment this if you wish to hace enums wrapped in an interface compatible
-+ with that generated by swig 1.3.21 (tests wont compile, though)
-+ %include enumsimple.swg
-+*/
-
- /* Mapscript library loader */
-
diff --git a/debian/patches/cmake-mapserver-export.patch b/debian/patches/cmake-mapserver-export.patch
deleted file mode 100644
index 90db968..0000000
--- a/debian/patches/cmake-mapserver-export.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-Description: Install headers and export cmake package for outside projects.
-Author: Bas Couwenberg <sebastic at debian.org>
-Last-Update: 2013-10-21
-Forwarded: https://github.com/mapserver/mapserver/pull/5119
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/2549b439c325b37ec8d57a283e7b9601a338d48f
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,24 @@ if (APPLE)
- set(CMAKE_FIND_FRAMEWORK "LAST")
- endif (APPLE)
-
-+# Offer the user the choice of overriding the installation directories
-+set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
-+set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
-+set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
-+if(WIN32 AND NOT CYGWIN)
-+ set(DEF_INSTALL_CMAKE_DIR CMake)
-+else()
-+ set(DEF_INSTALL_CMAKE_DIR share/mapserver/cmake)
-+endif()
-+set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
-+
-+# Make relative paths absolute (needed later on)
-+foreach(p LIB BIN INCLUDE CMAKE)
-+ set(var INSTALL_${p}_DIR)
-+ if(NOT IS_ABSOLUTE "${${var}}")
-+ set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
-+ endif()
-+endforeach()
-
- macro (ms_link_libraries)
- if(BUILD_DYNAMIC)
-@@ -246,6 +264,15 @@ mapgeomtransform.c mapogroutput.c mapwfs
- mapgeomutil.cpp mapkmlrenderer.cpp fontcache.c textlayout.c maputfgrid.cpp
- mapogr.cpp mapcontour.c mapsmoothing.c mapv8.cpp ${REGEX_SOURCES} kerneldensity.c)
-
-+set(mapserver_HEADERS
-+cgiutil.h dejavu-sans-condensed.h dxfcolor.h fontcache.h hittest.h mapagg.h
-+mapaxisorder.h mapcopy.h mapentities.h maperror.h mapfile.h mapgml.h maphash.h
-+maphttp.h mapio.h mapkmlrenderer.h maplibxml2.h mapogcfilter.h mapogcsld.h
-+mapoglcontext.h mapoglrenderer.h mapowscommon.h mapows.h mapparser.h
-+mappostgis.h mapprimitive.h mapproject.h mapraster.h mapregex.h mapresample.h
-+mapserver-api.h mapserver.h mapserv.h mapshape.h mapsymbol.h maptemplate.h
-+mapthread.h maptile.h maptime.h maptree.h maputfgrid.h mapwcs.h uthash.h)
-+
- if(BUILD_DYNAMIC)
- add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES} ${v8_SOURCES})
- set_target_properties( mapserver PROPERTIES
-@@ -299,6 +326,7 @@ find_package(PNG)
- if(PNG_FOUND)
- include_directories(${PNG_INCLUDE_DIR})
- ms_link_libraries( ${PNG_LIBRARIES})
-+ list(APPEND ALL_INCLUDE_DIRS ${PNG_INCLUDE_DIR})
- set(USE_PNG 1)
- else(PNG_FOUND)
- report_mandatory_not_found(PNG)
-@@ -308,6 +336,7 @@ find_package(JPEG)
- if(JPEG_FOUND)
- include_directories(${JPEG_INCLUDE_DIR})
- ms_link_libraries( ${JPEG_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${JPEG_INCLUDE_DIR})
- set(USE_JPEG 1)
- else(JPEG_FOUND)
- report_mandatory_not_found(JPEG)
-@@ -319,6 +348,7 @@ if(NOT FREETYPE_FOUND)
- endif(NOT FREETYPE_FOUND)
- include_directories(${FREETYPE_INCLUDE_DIR})
- ms_link_libraries( ${FREETYPE_LIBRARY})
-+list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
-
-
- if(WITH_PROJ)
-@@ -328,6 +358,7 @@ if(WITH_PROJ)
- else(NOT PROJ_FOUND)
- include_directories(${PROJ_INCLUDE_DIR})
- ms_link_libraries( ${PROJ_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
- set (USE_PROJ 1)
- endif(NOT PROJ_FOUND)
- endif (WITH_PROJ)
-@@ -337,6 +368,7 @@ if(WITH_PIXMAN)
- if(PIXMAN_FOUND)
- include_directories(${PIXMAN_INCLUDE_DIR})
- ms_link_libraries(${PIXMAN_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${PIXMAN_INCLUDE_DIR})
- set (USE_PIXMAN 1)
- else(PIXMAN_FOUND)
- report_optional_not_found(PIXMAN)
-@@ -358,6 +390,7 @@ if(WITH_FRIBIDI)
- else(NOT FRIBIDI_FOUND)
- include_directories(${FRIBIDI_INCLUDE_DIR})
- ms_link_libraries( ${FRIBIDI_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
- set (USE_FRIBIDI 1)
- if(FRIBIDI_LEGACY)
- message(WARNING "Old Fribidi found, upgrade recommended")
-@@ -372,6 +405,7 @@ if(WITH_HARFBUZZ)
- else(NOT HARFBUZZ_FOUND)
- include_directories(${HARFBUZZ_INCLUDE_DIR})
- ms_link_libraries( ${HARFBUZZ_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
- set (USE_HARFBUZZ 1)
- endif(NOT HARFBUZZ_FOUND)
- endif (WITH_HARFBUZZ)
-@@ -389,6 +423,7 @@ if(WITH_ICONV)
- if(ICONV_FOUND)
- include_directories(${ICONV_INCLUDE_DIR})
- ms_link_libraries( ${ICONV_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${ICONV_INCLUDE_DIR})
- set (USE_ICONV 1)
- else(ICONV_FOUND)
- report_optional_not_found(ICONV)
-@@ -405,6 +440,7 @@ if(WITH_CAIRO)
- if(CAIRO_FOUND)
- include_directories(${CAIRO_INCLUDE_DIRS})
- ms_link_libraries( ${CAIRO_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${CAIRO_INCLUDE_DIR})
- set (USE_CAIRO 1)
- else(CAIRO_FOUND)
- report_optional_not_found(CAIRO)
-@@ -416,6 +452,7 @@ if(WITH_MYSQL)
- if(MYSQL_FOUND)
- include_directories(${MYSQL_INCLUDE_DIR})
- ms_link_libraries( ${MYSQL_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${MYSQL_INCLUDE_DIR})
- set (USE_MYSQL 1)
- else(MYSQL_FOUND)
- report_optional_not_found(MYSQL)
-@@ -433,6 +470,7 @@ if(WITH_ORACLESPATIAL OR WITH_ORACLE_PLU
- find_package(Oracle)
- if(ORACLE_FOUND)
- include_directories(${ORACLE_INCLUDE_DIR})
-+ list(APPEND ALL_INCLUDE_DIRS ${ORACLE_INCLUDE_DIR})
- else(ORACLE_FOUND)
- report_optional_not_found(ORACLESPATIAL)
- #FIXME: error message here could be misleading, only states ORACLESPATIAL whereas
-@@ -459,6 +497,7 @@ if(WITH_MSSQL2008)
- add_library(msplugin_mssql2008 MODULE mapmssql2008.c)
- target_link_libraries(msplugin_mssql2008 ${ODBC_LIBRARY} ${MAPSERVER_LIBMAPSERVER})
- set_target_properties(msplugin_mssql2008 PROPERTIES COMPILE_FLAGS "-DUSE_MSSQL2008_PLUGIN -DUSE_MSSQL2008")
-+ list(APPEND ALL_INCLUDE_DIRS ${ODBC_INCLUDE_DIR})
- set (USE_MSSQL2008 1)
- else(ODBC_FOUND)
- report_optional_not_found(ODBC)
-@@ -470,6 +509,7 @@ if(WITH_FCGI)
- if(FCGI_FOUND)
- include_directories(${FCGI_INCLUDE_DIR})
- target_link_libraries(mapserv ${FCGI_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
- set (USE_FASTCGI 1)
- else(FCGI_FOUND)
- report_optional_not_found(FCGI)
-@@ -481,6 +521,7 @@ if(WITH_GEOS)
- if(GEOS_FOUND)
- include_directories(${GEOS_INCLUDE_DIR})
- ms_link_libraries( ${GEOS_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${GEOS_INCLUDE_DIR})
- set (USE_GEOS 1)
- else(GEOS_FOUND)
- report_optional_not_found(GEOS)
-@@ -500,6 +541,7 @@ if(WITH_POSTGIS)
- include_directories(${POSTGRESQL_INCLUDE_DIR})
- ms_link_libraries( ${POSTGRESQL_LIBRARY})
- CHECK_LIBRARY_EXISTS(pq "PQserverVersion" POSTGRESQL_LIBRARY POSTGIS_HAS_SERVER_VERSION)
-+ list(APPEND ALL_INCLUDE_DIRS ${POSTGRESQL_INCLUDE_DIR})
- set (USE_POSTGIS 1)
- else(POSTGRESQL_FOUND)
- report_optional_not_found(POSTGIS)
-@@ -511,6 +553,7 @@ if(WITH_GDAL)
- if(GDAL_FOUND)
- include_directories(${GDAL_INCLUDE_DIR})
- ms_link_libraries( ${GDAL_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR})
- set (USE_GDAL 1)
- else(GDAL_FOUND)
- report_optional_not_found(GDAL)
-@@ -525,6 +568,7 @@ if(WITH_SVGCAIRO)
- if(SVGCAIRO_FOUND)
- include_directories(${SVG_INCLUDE_DIR} ${SVGCAIRO_INCLUDE_DIR})
- ms_link_libraries( ${SVG_LIBRARY} ${SVGCAIRO_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${SVG_INCLUDE_DIR} ${SVGCAIRO_INCLUDE_DIR})
- set (USE_SVG_CAIRO 1)
- else(SVGCAIRO_FOUND)
- report_optional_not_found(SVGCAIRO)
-@@ -539,8 +583,10 @@ if(WITH_RSVG)
- if(RSVG_FOUND AND GOBJECT_FOUND)
- include_directories(${RSVG_INCLUDE_DIRS})
- ms_link_libraries( ${RSVG_LIBRARY} )
-+ list(APPEND ALL_INCLUDE_DIRS ${RSVG_INCLUDE_DIRS})
- include_directories(${GOBJECT_INCLUDE_DIRS})
- ms_link_libraries( ${GOBJECT_LIBRARY} )
-+ list(APPEND ALL_INCLUDE_DIRS ${GOBJECT_INCLUDE_DIRS})
- set (USE_RSVG 1)
- else(RSVG_FOUND AND GOBJECT_FOUND)
- report_optional_not_found(RSVG)
-@@ -555,6 +601,7 @@ if(WITH_OGR)
- if(GDAL_FOUND)
- include_directories(${GDAL_INCLUDE_DIR})
- ms_link_libraries( ${GDAL_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR})
- set (USE_OGR 1)
- else(GDAL_FOUND)
- message(SEND_ERROR "GDAL library could not be found and is needed for OGR support.
-@@ -574,6 +621,7 @@ if(WITH_CURL)
- if(CURL_FOUND)
- include_directories(${CURL_INCLUDE_DIR})
- ms_link_libraries( ${CURL_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
- set(USE_CURL 1)
- else(CURL_FOUND)
- report_optional_not_found(CURL)
-@@ -652,6 +700,7 @@ if(WITH_LIBXML2)
- set(LIBXML2_LIBRARY ${LIBXML2_LIBRARIES})
- endif()
- ms_link_libraries( ${LIBXML2_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
- set (USE_LIBXML2 1)
- else(LIBXML2_FOUND)
- report_optional_not_found(LIBXML2)
-@@ -716,6 +765,7 @@ if(WITH_XMLMAPFILE)
- endif()
- include_directories(${LIBXSLT_INCLUDE_DIR})
- ms_link_libraries( ${LIBXSLT_LIBRARY} ${LIBXSLT_EXSLT_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${LIBXSLT_INCLUDE_DIR})
- set(USE_XMLMAPFILE 1)
- else(LIBXSLT_FOUND)
- message(SEND_ERROR "Xml Mapfile support requires XSLT support which was not found.
-@@ -731,6 +781,7 @@ if(WITH_GIF)
- if(GIF_FOUND)
- include_directories(${GIF_INCLUDE_DIR})
- ms_link_libraries( ${GIF_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${GIF_INCLUDE_DIR})
- set(USE_GIF 1)
- else(GIF_FOUND)
- report_optional_not_found(GIF)
-@@ -742,6 +793,7 @@ if(WITH_EXEMPI)
- if(LIBEXEMPI_FOUND)
- include_directories(${LIBEXEMPI_INCLUDE_DIR})
- ms_link_libraries( ${LIBEXEMPI_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${LIBEXEMPI_INCLUDE_DIR})
- set(USE_EXEMPI 1)
- else(LIBEXEMPI_FOUND)
- report_optional_not_found(EXEMPI)
-@@ -759,6 +811,7 @@ if(WITH_V8)
- SET(USE_V8_MAPSCRIPT 1)
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
- INCLUDE_DIRECTORIES(${V8_INCLUDE})
-+ list(APPEND ALL_INCLUDE_DIRS ${V8_INCLUDE})
- MS_LINK_LIBRARIES( ${V8_LIBS})
- ELSE(V8_FOUND)
- MESSAGE(SEND_ERROR "V8 JavaScript support requested but not found.
-@@ -817,7 +870,9 @@ configure_file (
- "${PROJECT_BINARY_DIR}/mapserver-version.h"
- )
-
--
-+set_target_properties(mapserver PROPERTIES
-+ PUBLIC_HEADER "${mapserver_HEADERS};${PROJECT_BINARY_DIR}/mapserver-config.h;${PROJECT_BINARY_DIR}/mapserver-version.h"
-+)
-
- macro(status_optional_component component enabled libpath)
- if("${enabled}" EQUAL "1")
-@@ -895,7 +950,7 @@ status_optional_feature("Apache Module (
-
- message(STATUS "")
- message(STATUS "Will install files to ${CMAKE_INSTALL_PREFIX}")
--message(STATUS "Will install libraries to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-+message(STATUS "Will install libraries to ${INSTALL_LIB_DIR}")
-
-
- include_directories("${PROJECT_BINARY_DIR}")
-@@ -908,20 +963,65 @@ endif(WIN32)
-
- #INSTALL(FILES mapserver-api.h ${PROJECT_BINARY_DIR}/mapserver-version.h DESTINATION include)
- if(USE_ORACLE_PLUGIN)
-- INSTALL(TARGETS msplugin_oracle DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ INSTALL(TARGETS msplugin_oracle DESTINATION ${INSTALL_LIB_DIR})
- endif(USE_ORACLE_PLUGIN)
-
- if(USE_MSSQL2008)
-- INSTALL(TARGETS msplugin_mssql2008 DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ INSTALL(TARGETS msplugin_mssql2008 DESTINATION ${INSTALL_LIB_DIR})
- endif(USE_MSSQL2008)
-
-
--INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv
-+ RUNTIME DESTINATION ${INSTALL_BIN_DIR} COMPONENT bin
-+)
-+INSTALL(TARGETS mapserver
-+ EXPORT mapserverTargets
-+ LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
-+ PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
-+)
-
- if(BUILD_STATIC)
-- INSTALL(TARGETS mapserver_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ INSTALL(TARGETS mapserver_static DESTINATION ${INSTALL_LIB_DIR})
- endif(BUILD_STATIC)
- if(BUILD_DYNAMIC)
-- INSTALL(TARGETS mapserver DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ INSTALL(TARGETS mapserver DESTINATION ${INSTALL_LIB_DIR})
- endif(BUILD_DYNAMIC)
-
-+# Add all targets to the build-tree export set
-+export(TARGETS mapserver
-+ FILE "${PROJECT_BINARY_DIR}/mapserverTargets.cmake"
-+)
-+
-+# Export the package for use from the build-tree
-+# (this registers the build-tree with a global CMake-registry)
-+export(PACKAGE mapserver)
-+
-+list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR})
-+list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR}/mapserver)
-+
-+list(REMOVE_DUPLICATES ALL_INCLUDE_DIRS)
-+
-+# Create the mapserver-config.cmake and mapserver-config-version files
-+file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${ALL_INCLUDE_DIRS}")
-+
-+# ... for the build tree
-+set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
-+configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config.cmake" @ONLY)
-+
-+# ... for the install tree
-+set(CONF_INCLUDE_DIRS "\${MAPSERVER_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-+configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake" @ONLY)
-+
-+# ... for both
-+configure_file(mapserver-config-version.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake" @ONLY)
-+
-+# Install the mapserver-config.cmake and mapserver-config-version.cmake
-+install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake"
-+ "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake"
-+ DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
-+)
-+
-+# Install the export set for use with the install-tree
-+install(EXPORT mapserverTargets
-+ DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
-+)
---- /dev/null
-+++ b/mapserver-config.cmake.in
-@@ -0,0 +1,18 @@
-+# - Config file for the mapserver package
-+# It defines the following variables
-+# MAPSERVER_INCLUDE_DIRS - include directories for mapserver
-+# MAPSERVER_LIBRARIES - libraries to link against
-+# MAPSERVER_EXECUTABLES - executables build for mapserver
-+
-+# Compute paths
-+get_filename_component(MAPSERVER_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+set(MAPSERVER_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
-+
-+# Our library dependencies (contains definitions for IMPORTED targets)
-+if(NOT TARGET mapserver AND NOT MapServer_BINARY_DIR)
-+ include("${MAPSERVER_CMAKE_DIR}/mapserverTargets.cmake")
-+endif()
-+
-+# These are IMPORTED targets created by mapserverTargets.cmake
-+set(MAPSERVER_LIBRARIES mapserver)
-+set(MAPSERVER_EXECUTABLES sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv)
---- /dev/null
-+++ b/mapserver-config-version.cmake.in
-@@ -0,0 +1,11 @@
-+set(PACKAGE_VERSION "@MapServer_VERSION_STRING@")
-+
-+# Check whether the requested PACKAGE_FIND_VERSION is compatible
-+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+else()
-+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
-+ if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-+ set(PACKAGE_VERSION_EXACT TRUE)
-+ endif()
-+endif()
diff --git a/debian/patches/dont-export-mapserver-target-for-static-libmapserver.patch b/debian/patches/dont-export-mapserver-target-for-static-libmapserver.patch
deleted file mode 100644
index 8c30983..0000000
--- a/debian/patches/dont-export-mapserver-target-for-static-libmapserver.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Don't export mapserver target for static libmapserver.
- The CMake exports are only relevant for the dynamically linked libmapserver.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/mapserver/mapserver/issues/5170
-Forwarded: https://github.com/mapserver/mapserver/pull/5171
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/d26278dfafd6db7ced6c2fd4e4380777fe888431
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -870,9 +870,11 @@ configure_file (
- "${PROJECT_BINARY_DIR}/mapserver-version.h"
- )
-
--set_target_properties(mapserver PROPERTIES
-- PUBLIC_HEADER "${mapserver_HEADERS};${PROJECT_BINARY_DIR}/mapserver-config.h;${PROJECT_BINARY_DIR}/mapserver-version.h"
--)
-+if(BUILD_DYNAMIC)
-+ set_target_properties(mapserver PROPERTIES
-+ PUBLIC_HEADER "${mapserver_HEADERS};${PROJECT_BINARY_DIR}/mapserver-config.h;${PROJECT_BINARY_DIR}/mapserver-version.h"
-+ )
-+endif(BUILD_DYNAMIC)
-
- macro(status_optional_component component enabled libpath)
- if("${enabled}" EQUAL "1")
-@@ -987,43 +989,43 @@ if(BUILD_DYNAMIC)
- LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
- PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
- )
--endif(BUILD_DYNAMIC)
--
--# Add all targets to the build-tree export set
--export(TARGETS mapserver
-- FILE "${PROJECT_BINARY_DIR}/mapserverTargets.cmake"
--)
--
--# Export the package for use from the build-tree
--# (this registers the build-tree with a global CMake-registry)
--export(PACKAGE mapserver)
--
--list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR})
--list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR}/mapserver)
--
--list(REMOVE_DUPLICATES ALL_INCLUDE_DIRS)
--
--# Create the mapserver-config.cmake and mapserver-config-version files
--file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${ALL_INCLUDE_DIRS}")
-
--# ... for the build tree
--set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
--configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config.cmake" @ONLY)
--
--# ... for the install tree
--set(CONF_INCLUDE_DIRS "\${MAPSERVER_CMAKE_DIR}/${REL_INCLUDE_DIR}")
--configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake" @ONLY)
--
--# ... for both
--configure_file(mapserver-config-version.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake" @ONLY)
--
--# Install the mapserver-config.cmake and mapserver-config-version.cmake
--install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake"
-- "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake"
-- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
--)
--
--# Install the export set for use with the install-tree
--install(EXPORT mapserverTargets
-- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
--)
-+ # Add all targets to the build-tree export set
-+ export(TARGETS mapserver
-+ FILE "${PROJECT_BINARY_DIR}/mapserverTargets.cmake"
-+ )
-+
-+ # Export the package for use from the build-tree
-+ # (this registers the build-tree with a global CMake-registry)
-+ export(PACKAGE mapserver)
-+
-+ list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR})
-+ list(APPEND ALL_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR}/mapserver)
-+
-+ list(REMOVE_DUPLICATES ALL_INCLUDE_DIRS)
-+
-+ # Create the mapserver-config.cmake and mapserver-config-version files
-+ file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${ALL_INCLUDE_DIRS}")
-+
-+ # ... for the build tree
-+ set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
-+ configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config.cmake" @ONLY)
-+
-+ # ... for the install tree
-+ set(CONF_INCLUDE_DIRS "\${MAPSERVER_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-+ configure_file(mapserver-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake" @ONLY)
-+
-+ # ... for both
-+ configure_file(mapserver-config-version.cmake.in "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake" @ONLY)
-+
-+ # Install the mapserver-config.cmake and mapserver-config-version.cmake
-+ install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/mapserver-config.cmake"
-+ "${PROJECT_BINARY_DIR}/mapserver-config-version.cmake"
-+ DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
-+ )
-+
-+ # Install the export set for use with the install-tree
-+ install(EXPORT mapserverTargets
-+ DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev
-+ )
-+endif(BUILD_DYNAMIC)
diff --git a/debian/patches/dont-install-headers-in-usr-lib.patch b/debian/patches/dont-install-headers-in-usr-lib.patch
deleted file mode 100644
index d45af14..0000000
--- a/debian/patches/dont-install-headers-in-usr-lib.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Don't install the headers in /usr/lib too.
- The mapserver target only needs to be installed when BUILD_DYNAMIC is true.
- Also add staticlib component for mapserver_static.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapserver/mapserver/pull/5166
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/3c10ad17cbd04998edf779c92f3be04a9bc3b460
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -974,18 +974,19 @@ endif(USE_MSSQL2008)
- INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv
- RUNTIME DESTINATION ${INSTALL_BIN_DIR} COMPONENT bin
- )
--INSTALL(TARGETS mapserver
-- EXPORT mapserverTargets
-- ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
-- LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
-- PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
--)
-
- if(BUILD_STATIC)
-- INSTALL(TARGETS mapserver_static DESTINATION ${INSTALL_LIB_DIR})
-+ INSTALL(TARGETS mapserver_static
-+ DESTINATION ${INSTALL_LIB_DIR} COMPONENT staticlib
-+ )
- endif(BUILD_STATIC)
- if(BUILD_DYNAMIC)
-- INSTALL(TARGETS mapserver DESTINATION ${INSTALL_LIB_DIR})
-+ INSTALL(TARGETS mapserver
-+ EXPORT mapserverTargets
-+ ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
-+ LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
-+ PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
-+ )
- endif(BUILD_DYNAMIC)
-
- # Add all targets to the build-tree export set
diff --git a/debian/patches/fix-types.patch b/debian/patches/fix-types.patch
deleted file mode 100644
index 76aafb8..0000000
--- a/debian/patches/fix-types.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix type inconsitencies.
- mapfile.c line 65: error: conflicting types for variable `msyystring_icase'
- old definition in module `maplexer' file maplexer.l line 51
- signed int
- new definition in module `mapfile' file mapfile.c line 65
- char
-Author: Michael Tautschnig <mt at debian.org>
-Bug-Debian: https://bugs.debian.org/812685
-Forwarded: https://github.com/mapserver/mapserver/pull/5227
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/278a280411130f2a0521afb222d7780d2581c816
-
---- a/mapfile.c
-+++ b/mapfile.c
-@@ -62,7 +62,7 @@ extern char *msyystring;
- extern char *msyybasepath;
- extern int msyyreturncomments;
- extern char *msyystring_buffer;
--extern char msyystring_icase;
-+extern int msyystring_icase;
-
- extern int loadSymbol(symbolObj *s, char *symbolpath); /* in mapsymbol.c */
- extern void writeSymbol(symbolObj *s, FILE *stream); /* in mapsymbol.c */
diff --git a/debian/patches/series b/debian/patches/series
index 4b660a8..78cc1a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,4 @@
hardening.patch
perl-mapscript-install.patch
ruby-mapscript-install.patch
-cmake-mapserver-export.patch
java-hardening.patch
-windows-archive-install-target.patch
-dont-install-headers-in-usr-lib.patch
-dont-export-mapserver-target-for-static-libmapserver.patch
-0001-Fix-compilation-with-gif_lib-5.1.patch
-0001-Fix-java-mapscript-to-be-compatible-with-newer-swig.patch
-fix-types.patch
-should-typo.patch
diff --git a/debian/patches/should-typo.patch b/debian/patches/should-typo.patch
deleted file mode 100644
index d6cb323..0000000
--- a/debian/patches/should-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix 'shoud' typo, replace with 'should'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapserver/mapserver/pull/5228
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/84c9d79a3d70c449d96689a10eb3ab6e13c2e769
-
---- a/mapproject.c
-+++ b/mapproject.c
-@@ -46,7 +46,7 @@ static int msTestNeedWrap( pointObj pt1,
-
- /************************************************************************/
- /* int msIsAxisInverted */
--/* Check to see if we shoud invert the axis. */
-+/* Check to see if we should invert the axis. */
- /* */
- /************************************************************************/
- int msIsAxisInverted(int epsg_code)
---- a/mapscript/php/map.c
-+++ b/mapscript/php/map.c
-@@ -907,7 +907,7 @@ PHP_METHOD(mapObj, getColorByIndex)
- color.green = palette.colors[index].green;
- color.blue = palette.colors[index].blue;
- } else {
-- mapscript_throw_mapserver_exception("Index shoud not be higher than %d\n" TSRMLS_CC, palette.numcolors-1);
-+ mapscript_throw_mapserver_exception("Index should not be higher than %d\n" TSRMLS_CC, palette.numcolors-1);
- return;
- }
-
diff --git a/debian/patches/windows-archive-install-target.patch b/debian/patches/windows-archive-install-target.patch
deleted file mode 100644
index 52ba5fd..0000000
--- a/debian/patches/windows-archive-install-target.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Add ARCHIVE install target for Windows builds.
-Author: Bas Couwenberg <sebastic at debian.org>
-Origin: https://github.com/sebastic/mapserver/commit/f86ccbd000a0672d9e29756db2a57b4d9290c5c3
-Forwarded: https://github.com/mapserver/mapserver/pull/5164
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/3c10ad17cbd04998edf779c92f3be04a9bc3b460
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -976,6 +976,7 @@ INSTALL(TARGETS sortshp shptree shptreev
- )
- INSTALL(TARGETS mapserver
- EXPORT mapserverTargets
-+ ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
- LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
- PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
- )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git
More information about the Pkg-grass-devel
mailing list