[Git][debian-gis-team/qgis][upstream-ltr] New upstream version 2.18.27+dfsg

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream-ltr at Debian GIS Project / qgis


Commits:
8dd86ed6 by Bas Couwenberg at 2018-12-21T12:33:32Z
New upstream version 2.18.27+dfsg
- - - - -


7 changed files:

- CMakeLists.txt
- ChangeLog
- debian/changelog
- python/plugins/processing/tools/dataobjects.py
- src/server/qgshttprequesthandler.cpp
- src/server/qgsowsserver.h
- src/server/qgswfsserver.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "26")
+SET(CPACK_PACKAGE_VERSION_PATCH "27")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Las Palmas")
 IF (POLICY CMP0048) # in CMake 3.0.0+


=====================================
ChangeLog
=====================================
@@ -1,3 +1,37 @@
+Marco Bernasocchi <marco at opengis.ch>	2018-12-14
+
+    allow building WITH_SERVER_PLUGINS=OFF (#8674)
+
+Radoslaw Guzinski <radosuav at op.pl>	2018-12-10
+
+    [Processing] Fix exception when using extent helper function.
+
+Merge: 1bb499ebb8 bdd2aa9c08
+rldhont <rldhont at gmail.com>	2018-12-03
+
+    Merge pull request #8580 from rldhont/server-wms-decode-sld-218
+
+    [BUGFIX][Server] WMS: Decode loaded SLD files from SLD parameter
+
+rldhont <rldhont at gmail.com>	2018-11-30
+
+    [BUGFIX][Server] WMS: Decode loaded SLD files from SLD parameter
+
+Merge: 83df334a9f a3a12048de
+rldhont <rldhont at gmail.com>	2018-11-23
+
+    Merge pull request #8536 from rldhont/server-wfs-format-gml-null-field-218
+
+    [Server] Null field value in GML has to be empty string 2.18
+
+rldhont <rldhont at gmail.com>	2018-11-23
+
+    [Server] Null field value in GML has to be empty string
+
+Juergen E. Fischer <jef at norbit.de>	2018-11-23
+
+    Release of 2.18.26
+
 rldhont <rldhont at gmail.com>	2018-11-16
 
     [Bugfix][Symbology] Fill to SLD does not export Stroke color


=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
-qgis (2.18.26) UNRELEASED; urgency=medium
+qgis (2.18.27) UNRELEASED; urgency=medium
+
+  * Release of 2.18.27
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 21 Dec 2018 13:00:42 +0100
+
+qgis (2.18.26) unstable; urgency=medium
 
   * Release of 2.18.26
 
- -- Jürgen E. Fischer <jef at norbit.de>  Fri, 23 Nov 2018 13:08:28 +0100
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 21 Dec 2018 13:00:42 +0100
 
 qgis (2.18.25) unstable; urgency=medium
 


=====================================
python/plugins/processing/tools/dataobjects.py
=====================================
@@ -129,7 +129,7 @@ def getTables(sorting=True):
 def extent(layers):
     first = True
     for layer in layers:
-        if not isinstance(layer, (QgsMapLayer.QgsRasterLayer, QgsMapLayer.QgsVectorLayer)):
+        if not isinstance(layer, (QgsRasterLayer, QgsVectorLayer)):
             layer = getObjectFromUri(layer)
             if layer is None:
                 continue


=====================================
src/server/qgshttprequesthandler.cpp
=====================================
@@ -27,6 +27,7 @@
 #include "qgsmapserviceexception.h"
 #include <QBuffer>
 #include <QByteArray>
+#include <QTextCodec>
 #include <QDomDocument>
 #include <QFile>
 #include <QImage>
@@ -602,7 +603,12 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,
       {
         continue; //only http and ftp supported at the moment
       }
-      value = QString( fileContents );
+      QTextCodec* codec = QTextCodec::codecForUtfText( fileContents, nullptr );
+      if ( !codec )
+      {
+        codec = QTextCodec::codecForName( "UTF-8" );
+      }
+      value = codec->toUnicode( fileContents );
 #else
       QgsMessageLog::logMessage( "http and ftp methods not supported with Qt5." );
       continue;


=====================================
src/server/qgsowsserver.h
=====================================
@@ -21,6 +21,8 @@
 #include "qgsrequesthandler.h"
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
 #include "qgsaccesscontrol.h"
+#else
+class QgsFeature;
 #endif
 
 #include "qgsfield.h"


=====================================
src/server/qgswfsserver.cpp
=====================================
@@ -2242,7 +2242,7 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
 QString QgsWFSServer::encodeValueToText( const QVariant& value )
 {
   if ( value.isNull() )
-    return "null";
+    return QString();
 
   switch ( value.type() )
   {



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/8dd86ed6497662fe29e1188686f2290b895f5a86

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/8dd86ed6497662fe29e1188686f2290b895f5a86
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/20181221/01a03af6/attachment-0001.html>