[Git][debian-gis-team/mapserver][experimental] 6 commits: New upstream version 7.4.0~rc1
Bas Couwenberg
gitlab at salsa.debian.org
Thu May 2 05:58:15 BST 2019
Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver
Commits:
317cd960 by Bas Couwenberg at 2019-05-02T04:25:20Z
New upstream version 7.4.0~rc1
- - - - -
220877dd by Bas Couwenberg at 2019-05-02T04:25:30Z
Merge tag 'upstream/7.4.0_rc1' into experimental
Upstream version 7.4.0~rc1
- - - - -
ac7ba898 by Bas Couwenberg at 2019-05-02T04:25:44Z
New upstream release candidate.
- - - - -
743fe7c1 by Bas Couwenberg at 2019-05-02T04:27:48Z
Update 7.4.0~beta2 symbols for other architectures.
- - - - -
9db9859e by Bas Couwenberg at 2019-05-02T04:42:23Z
Update 7.4.0~rc1 symbols for amd64.
- - - - -
073ca9d6 by Bas Couwenberg at 2019-05-02T04:42:23Z
Set distribution to experimental.
- - - - -
6 changed files:
- CMakeLists.txt
- HISTORY.TXT
- debian/changelog
- debian/libmapserver2.symbols
- mapgml.c
- mapscript/phpng/CMakeLists.txt
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
set (MapServer_VERSION_MAJOR 7)
set (MapServer_VERSION_MINOR 4)
set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-beta2")
+set (MapServer_VERSION_SUFFIX "-rc1")
set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})
=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments. For more
details about recent point releases, please see the online changelog at:
http://mapserver.org/development/changelog/
+7.4.0-rc1 release (2019-5-1)
+----------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
7.4.0-beta2 release (2019-4-17)
-------------------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mapserver (7.4.0~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update 7.4.0~beta2 symbols for other architectures.
+ * Update 7.4.0~rc1 symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 02 May 2019 06:27:49 +0200
+
mapserver (7.4.0~beta2-1~exp1) experimental; urgency=medium
* New upstream beta release.
=====================================
debian/libmapserver2.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 7.4.0~beta1 amd64 mips64el ppc64
+# SymbolsHelper-Confirmed: 7.4.0~rc1 amd64
libmapserver.so.2 #PACKAGE# #MINVER#
* Build-Depends-Package: libmapserver-dev
BuildExpressionTree at Base 6.2.1
@@ -592,7 +592,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
_ZNK9mapserver25font_engine_freetype_base9find_faceEPKc at Base 6.2.1
_ZNK9mapserver25font_engine_freetype_base9num_facesEv at Base 6.2.1
(optional=templinst|arch=!amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEj at Base 7.0.2
- (optional=templinst)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEm at Base 7.2.0
+ (optional=templinst)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEm at Base 7.4.0~rc1
(optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_default_appendEj at Base 7.0.2
(optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_default_appendEm at Base 7.0.2
(optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 7.0.7
@@ -605,11 +605,11 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EE9push_backERKS1_ at Base 7.0.5
(optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EEaSERKS3_ at Base 7.0.5
(optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEj at Base 7.2.0
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm at Base 7.2.0
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm at Base 7.4.0~rc1
(optional=templinst)_ZNSt6vectorIPN10ClipperLib5TEdgeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_ at Base 7.0.7
(optional=templinst)_ZNSt6vectorIPN10ClipperLib6OutRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_ at Base 7.0.7
(optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEj at Base 7.2.0
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEm at Base 7.2.0
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEm at Base 7.4.0~rc1
(optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_ at Base 7.2.0
(optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE17_M_default_appendEj at Base 7.0.2
(optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE17_M_default_appendEm at Base 7.0.2
=====================================
mapgml.c
=====================================
@@ -1455,7 +1455,7 @@ int msGMLWriteQuery(mapObj *map, char *filename, const char *namespaces)
value = (char *) msOWSLookupMetadata(&(lp->metadata), "OM", "title");
if (value) {
- msOWSPrintMetadata(stream, &(lp->metadata), namespaces, "title", OWS_NOERR, "\t<gml:name>%s</gml:name>\n", value);
+ msOWSPrintEncodeMetadata(stream, &(lp->metadata), namespaces, "title", OWS_NOERR, "\t<gml:name>%s</gml:name>\n", value);
}
geomtype = msOWSLookupMetadata(&(lp->metadata), "OFG", "geomtype");
=====================================
mapscript/phpng/CMakeLists.txt
=====================================
@@ -3,57 +3,69 @@ if(WIN32 AND (${CMAKE_VERSION} EQUAL "3.12.0") OR (${CMAKE_VERSION} EQUAL "3.12.
endif()
if(WIN32)
-FIND_PACKAGE(SWIG 3.0.11 REQUIRED)
-if(WITH_THREAD_SAFETY)
-FIND_PACKAGE(SWIG 4.0.0 REQUIRED)
-endif(WITH_THREAD_SAFETY)
+ FIND_PACKAGE(SWIG 3.0.11 REQUIRED)
+ if(WITH_THREAD_SAFETY)
+ FIND_PACKAGE(SWIG 4.0.0 REQUIRED)
+ endif(WITH_THREAD_SAFETY)
endif(WIN32)
FIND_PACKAGE(PHP REQUIRED)
INCLUDE(UseSWIG)
if(WIN32)
-add_definitions(/DWIN32 /DZEND_WIN32 /DPHP_WIN32 /DZEND_DEBUG=0)
-if(NOT CMAKE_CL_64)
-add_definitions(-D_USE_32BIT_TIME_T)
-endif(NOT CMAKE_CL_64)
-if(WITH_THREAD_SAFETY)
-add_definitions(-DZTS=1)
-endif(WITH_THREAD_SAFETY)
+ add_definitions(/DWIN32 /DZEND_WIN32 /DPHP_WIN32 /DZEND_DEBUG=0)
+ if(NOT CMAKE_CL_64)
+ add_definitions(-D_USE_32BIT_TIME_T)
+ endif(NOT CMAKE_CL_64)
+ if(WITH_THREAD_SAFETY)
+ add_definitions(-DZTS=1)
+ endif(WITH_THREAD_SAFETY)
endif(WIN32)
include_directories(${PHP_INCLUDE_PATH})
-include_directories(${PHP_INCLUDE_PATH}/main)
-include_directories(${PHP_INCLUDE_PATH}/Zend)
-include_directories(${PHP_INCLUDE_PATH}/TSRM)
+message(STATUS "PHP Include Path: ${PHP_INCLUDE_PATH}")
include_directories(${PROJECT_SOURCE_DIR}/mapscript/swiginc)
include_directories(${PROJECT_SOURCE_DIR}/mapscript/)
include_directories(${PROJECT_SOURCE_DIR}/mapscript/phpng)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}) # make sure mapscriptPHP7_wrap.c is found
if(WIN32)
-include_directories(${PHP_INCLUDE_PATH}/win32)
+ include_directories(${PHP_INCLUDE_PATH}/win32)
endif(WIN32)
IF(PHP_VERSION LESS 5)
-MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
+ MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
ENDIF(PHP_VERSION LESS 5)
+
IF(PHP_VERSION LESS 7)
-SWIG_ADD_LIBRARY(php_mapscriptng TYPE MODULE LANGUAGE php SOURCES ../mapscript.i)
-ELSE(PHP_VERSION LESS 7)
-SWIG_ADD_LIBRARY(php_mapscriptng TYPE MODULE LANGUAGE php7 SOURCES ../mapscript.i)
+ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
+ SWIG_ADD_LIBRARY(php_mapscriptng TYPE MODULE LANGUAGE php SOURCES ../mapscript.i)
+ else ()
+ swig_add_module(php_mapscriptng php ../mapscript.i)
+ endif ()
+ELSE()
+ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
+ SWIG_ADD_LIBRARY(php_mapscriptng TYPE MODULE LANGUAGE php7 SOURCES ../mapscript.i)
+ else ()
+ swig_add_module(php_mapscriptng php7 ../mapscript.i)
+ endif ()
ENDIF(PHP_VERSION LESS 7)
if(WIN32)
-target_compile_options(php_mapscriptng PRIVATE /DWIN32 /DZEND_WIN32 /DPHP_WIN32 /DZEND_DEBUG=0)
-if(WITH_THREAD_SAFETY)
-target_compile_options(php_mapscriptng PRIVATE /DZTS=1)
-endif(WITH_THREAD_SAFETY)
-SWIG_LINK_LIBRARIES(php_mapscriptng ${PHP_LIBRARY})
+ target_compile_options(php_mapscriptng PRIVATE /DWIN32 /DZEND_WIN32 /DPHP_WIN32 /DZEND_DEBUG=0)
+ if(WITH_THREAD_SAFETY)
+ target_compile_options(php_mapscriptng PRIVATE /DZTS=1)
+ endif(WITH_THREAD_SAFETY)
+ SWIG_LINK_LIBRARIES(php_mapscriptng ${PHP_LIBRARY})
endif(WIN32)
-target_link_libraries(php_mapscriptng mapserver)
+# hide "defined but not used" warnings
+target_compile_options(php_mapscriptng PRIVATE -Wno-unused-label)
+
+target_link_libraries(php_mapscriptng mapserver)
set_target_properties(${SWIG_MODULE_mapscript_REAL_NAME} PROPERTIES PREFIX "")
+
if(NOT WIN32)
-install(TARGETS php_mapscriptng DESTINATION ${PHP_EXTENSION_DIR})
+ install(TARGETS php_mapscriptng DESTINATION ${PHP_EXTENSION_DIR})
endif()
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/0af6d8774c5c18420163c158a11c5879245eb234...073ca9d6c20be29a1606f6b52f229a1e49f41cd8
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/0af6d8774c5c18420163c158a11c5879245eb234...073ca9d6c20be29a1606f6b52f229a1e49f41cd8
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/20190502/17f1619a/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list