[SCM] gammaray packaging branch, master, updated. debian/1.2.1-1-3-g6c91a4d

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=6c91a4d

The following commit has been merged in the master branch:
commit 6c91a4d7a4521e9af1ea75142521de3ea08cf6a0
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Sep 4 21:28:07 2012 +0200

    Fix build on GNU Hurd.
---
 debian/changelog                        |    1 +
 debian/patches/gnu-hurd-build-fix.patch |   21 +++++++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6213f32..f8b2d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gammaray (1.2.1-2) UNRELEASED; urgency=low
   * Build-depend on libgraphviz-dev instead of dummy transitional
     graphviz-dev.
   * Set Architecture to any-i386 any-amd64.
+  * Fix build on GNU Hurd.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 03 Sep 2012 08:53:49 +0200
 
diff --git a/debian/patches/gnu-hurd-build-fix.patch b/debian/patches/gnu-hurd-build-fix.patch
new file mode 100644
index 0000000..3f1a9c5
--- /dev/null
+++ b/debian/patches/gnu-hurd-build-fix.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Tue, 4 Sep 2012 21:25:27 +0200
+Subject: gnu-hurd-build-fix
+
+---
+ plugins/timertop/functioncalltimer.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/timertop/functioncalltimer.cpp b/plugins/timertop/functioncalltimer.cpp
+index 34be761..3940f64 100644
+--- a/plugins/timertop/functioncalltimer.cpp
++++ b/plugins/timertop/functioncalltimer.cpp
+@@ -26,7 +26,7 @@
+ #include <Windows.h>
+ #endif
+ 
+-#ifdef __MACH__
++#if defined(Q_OS_MAC) && defined(__MACH__)
+ #include <mach/clock.h>
+ #include <mach/mach.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index d08fd35..19d7a3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ widget-export-actions-location.patch
 harfbuzz-search-path.patch
 find-widget-export-actions-when-attaching.patch
 gammaray-probe-versioned-soname.patch
+gnu-hurd-build-fix.patch

-- 
gammaray packaging