[Git][debian-gis-team/mapserver][experimental] 5 commits: New upstream version 7.6.0~beta2

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver


Commits:
32ce5896 by Bas Couwenberg at 2020-03-29T08:41:28+02:00
New upstream version 7.6.0~beta2
- - - - -
6e4e55d4 by Bas Couwenberg at 2020-03-29T08:41:45+02:00
Update upstream source from tag 'upstream/7.6.0_beta2'

Update to upstream version '7.6.0~beta2'
with Debian dir 1f06df08bccef91f9020564f52d26c3e6e6a9b3f
- - - - -
be468adb by Bas Couwenberg at 2020-03-29T08:42:49+02:00
New upstream beta release.

- - - - -
54541c4d by Bas Couwenberg at 2020-03-29T08:43:54+02:00
Drop -D_GNU_SOURCE, fixed upstream.

Revert "Add -D_GNU_SOURCE to CPPFLAGS."

This reverts commit 2d901140edf76de121d70586496dc45fe6fc9426.

- - - - -
f326d05a by Bas Couwenberg at 2020-03-29T08:46:31+02:00
Set distribution to experimental.

- - - - -


6 changed files:

- CMakeLists.txt
- HISTORY.TXT
- debian/changelog
- debian/rules
- mapdraw.c
- mapscript/mapscript.i


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 7)
 set (MapServer_VERSION_MINOR 6)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-beta1")
+set (MapServer_VERSION_SUFFIX "-beta2")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,13 @@ 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.6.0-beta2 release (2020-03-28)
+--------------------------------
+
+- fixed build with PHPNG + gnu_source (#6015)
+
+- fixed rendermode with geomtransform (#6021)
+
 7.6.0-beta1 release (2020-03-22)
 --------------------------------
 
@@ -19,7 +26,7 @@ http://mapserver.org/development/changelog/
 
 - Enable PointZM data support (X,Y,Z,M coordinates) by default
 
-- SLD support enhancements (RFC 124)
+- SLD support enhancements (RFC 124) except PR#5832
 
 - CONNECTIONOPTIONS support in mapfile LAYER (RFC 125)
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mapserver (7.6.0~beta2-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Drop -D_GNU_SOURCE, fixed upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 29 Mar 2020 08:46:12 +0200
+
 mapserver (7.6.0~beta1-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.


=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ include /usr/share/dpkg/pkg-info.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -D_GNU_SOURCE
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 


=====================================
mapdraw.c
=====================================
@@ -1190,6 +1190,7 @@ int msDrawVectorLayer(mapObj *map, layerObj *layer, imageObj *image)
       // Coordinates stored in the shape must keep their original values for
       // the shape to be drawn multiple times.
       // Here the original shape is restored.
+      msFreeShape(&shape);
       msCopyShape(&savedShape, &shape);
       msFreeShape(&savedShape);
     }


=====================================
mapscript/mapscript.i
=====================================
@@ -33,6 +33,8 @@
 %begin %{
 #ifdef _MSC_VER
 #define SWIG_PYTHON_INTERPRETER_NO_DEBUG
+#else
+#define _GNU_SOURCE 1
 #endif
 %}
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/4cbc643ccbd2d6964bcfbdb3d305d35f851d89f3...f326d05ac4cad7f9f2c3b00eeef53fd804db5998

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/4cbc643ccbd2d6964bcfbdb3d305d35f851d89f3...f326d05ac4cad7f9f2c3b00eeef53fd804db5998
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/20200329/ee890921/attachment-0001.html>