[qmapshack] 03/03: Add patch to fix compatibility with Qt 5.3.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Sep 30 18:01:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qmapshack.
commit 12fb749abb1c7701d3fa9f39552e9ce92e09f0e7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 30 19:38:42 2015 +0200
Add patch to fix compatibility with Qt 5.3.
---
debian/changelog | 1 +
debian/patches/qt53-qFormatLogMessage.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 20 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b9b3932..8320a60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
qmapshack (1.3.1-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
+ * Add patch to fix compatibility with Qt 5.3.
-- Bas Couwenberg <sebastic at debian.org> Sat, 26 Sep 2015 21:35:25 +0200
diff --git a/debian/patches/qt53-qFormatLogMessage.patch b/debian/patches/qt53-qFormatLogMessage.patch
new file mode 100644
index 0000000..a56fee1
--- /dev/null
+++ b/debian/patches/qt53-qFormatLogMessage.patch
@@ -0,0 +1,18 @@
+Description: Fix code for outdated Qt libs
+Author: Oliver Eichler <oliver.eichler at gmx.de>
+Origin: https://bitbucket.org/maproom/qmapshack/commits/68afe765a818fa5ece75955cfe646784dcfd8383
+
+--- a/src/helpers/CAppSetup.cpp
++++ b/src/helpers/CAppSetup.cpp
+@@ -112,7 +112,11 @@ void CAppSetup::printToConsole(QtMsgType
+
+ void CAppSetup::consoleMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+ {
++#if QT_VERSION >= 0x050400
+ QString txt = qFormatLogMessage(type, context, msg);
++#else
++ QString txt = msg;
++#endif
+ CAppSetup::getPlattformInstance()->printToConsole(type, txt);
+ CAppSetup::getPlattformInstance()->appendToFile(type, txt);
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cb2ba5f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+qt53-qFormatLogMessage.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list