[qmapshack] 01/01: Add patch to fix build failure with Qt5 < 5.4.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qmapshack.

commit 557db2899e5f1f8bf0af5f2e266f32d85050229a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 8 20:16:05 2016 +0200

    Add patch to fix build failure with Qt5 < 5.4.
---
 debian/changelog          |  6 ++++++
 debian/patches/qt54.patch | 25 +++++++++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d6cdb01..056c713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qmapshack (1.6.1-3) UNRELEASED; urgency=medium
+
+  * Add patch to fix build failure with Qt5 < 5.4.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Apr 2016 19:42:01 +0200
+
 qmapshack (1.6.1-2) unstable; urgency=medium
 
   * Add patch for kFreeBSD support.
diff --git a/debian/patches/qt54.patch b/debian/patches/qt54.patch
new file mode 100644
index 0000000..14f9b31
--- /dev/null
+++ b/debian/patches/qt54.patch
@@ -0,0 +1,25 @@
+Description: Fix build with Qt < 5.4.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://bitbucket.org/maproom/qmapshack/pull-requests/96/fix-build-with-qt-54
+
+--- a/src/setup/CAppSetupMac.cpp
++++ b/src/setup/CAppSetupMac.cpp
+@@ -92,7 +92,11 @@ QString CAppSetupMac::defaultCachePath()
+ 
+ QString CAppSetupMac::userDataPath(QString subdir)
+ {
++#if QT_VERSION >= 0x050400
+     QString dataDir = QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation).first();
++#else
++    QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
++#endif
+     return IAppSetup::path(dataDir, subdir, false, 0);
+ }
+ 
+@@ -141,4 +145,4 @@ void CAppSetupMac::migrateDirContent(QSt
+             qDebug() << "error migrating directory" << dirSource;
+         }
+     }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 4ef6508..7d1b09a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 original-typo.patch
 kfreebsd.patch
 hurd.patch
+qt54.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git