[SCM] gammaray packaging branch, master, updated. debian/2.0.2-1-12-gb9863e3

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit b9863e3fc54fc3d32ece9f93f0359aff992ab5da
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jul 16 15:31:54 2014 +0200

    Fix FTBFS on kFreeBSD, Hurd, mips, ppc, and s390x
---
 debian/changelog                            |  6 ++++
 debian/patches/debian-archs-fix-build.patch | 52 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 485f5e5..d99f6ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gammaray (2.1.0-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS on kFreeBSD, Hurd, mips, ppc, and s390x (Closes: #754986).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 16 Jul 2014 15:29:58 +0200
+
 gammaray (2.1.0-1) unstable; urgency=medium
 
   [ Felix Geyer ]
diff --git a/debian/patches/debian-archs-fix-build.patch b/debian/patches/debian-archs-fix-build.patch
new file mode 100644
index 0000000..977f179
--- /dev/null
+++ b/debian/patches/debian-archs-fix-build.patch
@@ -0,0 +1,52 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 16 Jul 2014 15:27:00 +0200
+Subject: debian-archs-fix-build
+
+---
+ cmake/GammaRayProbeABI.cmake    | 18 ++++++++++++++++++
+ common/probeabidetector_elf.cpp |  3 +++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/cmake/GammaRayProbeABI.cmake b/cmake/GammaRayProbeABI.cmake
+index e8519e9..5da6dee 100644
+--- a/cmake/GammaRayProbeABI.cmake
++++ b/cmake/GammaRayProbeABI.cmake
+@@ -56,6 +56,24 @@ elseif(APPLE)
+     set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
+   endif()
+ 
++# kFreeBSD reports i686 as i386 and x86_64 as amd64
++elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
++  if (CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-i686")
++  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-x86_64")
++  else()
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
++  endif()
++
++# Debian GNU/Hurd reports unknown CPU; assume i686
++elseif(CMAKE_SYSTEM_NAME MATCHES "GNU")
++  if (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-i686")
++  else()
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
++  endif()
++
+ else()
+   # uname reports different ARM versions, unlike ELF, so map all this to "arm"
+   if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+diff --git a/common/probeabidetector_elf.cpp b/common/probeabidetector_elf.cpp
+index b35954c..af43eaf 100644
+--- a/common/probeabidetector_elf.cpp
++++ b/common/probeabidetector_elf.cpp
+@@ -151,6 +151,9 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
+     case EM_386: return "i686";
+     case EM_X86_64: return "x86_64";
+     case EM_ARM: return "arm";
++    case EM_MIPS: return "mips";
++    case EM_PPC: return "ppc";
++    case EM_S390: return "s390x";
+   }
+ 
+   qWarning() << "Unsupported ELF machine type:" << hdr->e_machine;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..10f35c1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-archs-fix-build.patch

-- 
gammaray packaging