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

sebastic pushed a commit to branch master
in repository qmapshack.

commit 266fc1a445b7ea2e8fff357fae4e413fbf931aef
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Mar 8 12:13:57 2015 +0100

    Add patch to disable deviceWatcher on Hurd & kFreeBSD to fix FTBFS.
---
 debian/changelog                                 |  6 ++++++
 debian/patches/devicewatcher-hurd-kfreebsd.patch | 27 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3a4d48e..074ca38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qmapshack (1.0.0+ds1-1~exp2) UNRELEASED; urgency=medium
+
+  * Add patch to disable deviceWatcher on Hurd & kFreeBSD to fix FTBFS.
+
+ -- Bas Couwenberg <sebas...@debian.org>  Sun, 08 Mar 2015 12:13:32 +0100
+
 qmapshack (1.0.0+ds1-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/devicewatcher-hurd-kfreebsd.patch 
b/debian/patches/devicewatcher-hurd-kfreebsd.patch
new file mode 100644
index 0000000..e42a0d8
--- /dev/null
+++ b/debian/patches/devicewatcher-hurd-kfreebsd.patch
@@ -0,0 +1,27 @@
+Description: Disable deviceWatcher on Hurd & kFreeBSD.
+Origin: 
https://bitbucket.org/maproom/qmapshack/commits/c2658a9460b5ff4a50329381670c86627cdb4788
+Bug: 
https://bitbucket.org/maproom/qmapshack/issue/10/build-failure-on-hurd-kfreebsd
+Author: Oliver Eichler <oliver.eich...@gmx.de>
+
+--- a/src/gis/CGisListWks.cpp
++++ b/src/gis/CGisListWks.cpp
+@@ -155,16 +155,15 @@ CGisListWks::CGisListWks(QWidget *parent
+     {
+         QTimer::singleShot(saveEvery * 60000, this, 
SLOT(slotSaveWorkspace()));
+     }
++
+ #ifdef Q_OS_LINUX
+     deviceWatcher = new CDeviceWatcherLinux(this);
++    connect(deviceWatcher, SIGNAL(sigChanged()), SIGNAL(sigChanged()));
+ #endif
+ #ifdef Q_OS_WIN
+     deviceWatcher = new CDeviceWatcherWindows(this);
++    connect(deviceWatcher, SIGNAL(sigChanged()), SIGNAL(sigChanged()));
+ #endif
+-    if(deviceWatcher)
+-    {
+-        connect(deviceWatcher, SIGNAL(sigChanged()), SIGNAL(sigChanged()));
+-    }
+ 
+     QTimer::singleShot(500, this, SLOT(slotLoadWorkspace()));
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d466892
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+devicewatcher-hurd-kfreebsd.patch

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to