[qgis] 03/03: Add patch to fix "error: 'QStringLiteral' was not declared in this scope".
Bas Couwenberg
sebastic at debian.org
Wed Jan 25 09:22:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qgis.
commit c6df15ec9c913971378b7ed7ce28abc4105e9e2c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 25 09:05:20 2017 +0100
Add patch to fix "error: 'QStringLiteral' was not declared in this scope".
---
debian/changelog | 1 +
debian/patches/0001-fix-6e1ec44b.patch | 43 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 45 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8f60922..8f201c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
qgis (2.14.11+dfsg-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
+ * Add patch to fix "error: 'QStringLiteral' was not declared in this scope".
-- Bas Couwenberg <sebastic at debian.org> Wed, 25 Jan 2017 07:42:42 +0100
diff --git a/debian/patches/0001-fix-6e1ec44b.patch b/debian/patches/0001-fix-6e1ec44b.patch
new file mode 100644
index 0000000..9c20d7d
--- /dev/null
+++ b/debian/patches/0001-fix-6e1ec44b.patch
@@ -0,0 +1,43 @@
+From 2d09b0b257b84ab667b0a9fcab4b7db5bca8a4b6 Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef at norbit.de>
+Date: Fri, 13 Jan 2017 15:54:27 +0100
+Subject: fix 6e1ec44b
+
+---
+ src/server/qgsserver.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/src/server/qgsserver.cpp
++++ b/src/server/qgsserver.cpp
+@@ -198,18 +198,18 @@ void QgsServer::printRequestParameters(
+ */
+ void QgsServer::printRequestInfos()
+ {
+- QgsMessageLog::logMessage( QStringLiteral( "******************** New request ***************" ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
++ QgsMessageLog::logMessage( "******************** New request ***************", "Server", QgsMessageLog::INFO );
+ if ( getenv( "REMOTE_ADDR" ) )
+ {
+- QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
++ QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), "Server", QgsMessageLog::INFO );
+ }
+ if ( getenv( "REMOTE_HOST" ) )
+ {
+- QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
++ QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), "Server", QgsMessageLog::INFO );
+ }
+ if ( getenv( "REMOTE_USER" ) )
+ {
+- QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
++ QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), "Server", QgsMessageLog::INFO );
+ }
+ if ( getenv( "REMOTE_IDENT" ) )
+ {
+@@ -241,7 +241,7 @@ void QgsServer::printRequestInfos()
+ }
+ if ( getenv( "HTTP_AUTHORIZATION" ) )
+ {
+- QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
++ QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), "Server", QgsMessageLog::INFO );
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 24400d0..9929826 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ qtermwidget-kfreebsd.patch
qtermwidget-hurd.patch
qt4-without-qtwebkit.patch
columns-typo.patch
+0001-fix-6e1ec44b.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list