[SCM] gammaray packaging branch, master, updated. debian/2.1.0-2-5-g17981ab

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit d61d40577256e50dfdccea4ab1190155b3d87881
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 27 16:56:22 2014 +0200

    Fix FTBFS on mips64 kernel, ppc64 and arm64.
---
 debian/changelog                            |  4 ++++
 debian/patches/debian-archs-fix-build.patch | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbc5269..671088f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 gammaray (2.1.0-3) UNRELEASED; urgency=medium
 
+  [ Jakub Adam ]
   * Force 24-bit color depth to Xvfb
     - attempts to fix "Unsupported screen depth: 8" failures during
       the test runs on some architectures. 
 
+  [ Felix Geyer ]
+  * Fix FTBFS on mips64 kernel, ppc64 and arm64.
+
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 19 Jul 2014 13:58:03 +0200
 
 gammaray (2.1.0-2) unstable; urgency=medium
diff --git a/debian/patches/debian-archs-fix-build.patch b/debian/patches/debian-archs-fix-build.patch
index 977f179..1cd1914 100644
--- a/debian/patches/debian-archs-fix-build.patch
+++ b/debian/patches/debian-archs-fix-build.patch
@@ -11,7 +11,7 @@ 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)
+@@ -56,10 +56,32 @@ elseif(APPLE)
      set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
    endif()
  
@@ -36,17 +36,27 @@ index e8519e9..5da6dee 100644
  else()
    # uname reports different ARM versions, unlike ELF, so map all this to "arm"
    if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+     set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-arm")
++  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-mips")
++  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64el")
++    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-ppc64")
+   else()
+     set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
+   endif()
 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)
+@@ -151,6 +151,11 @@ 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";
++    case EM_PPC64: return "ppc64";
++    case EM_AARCH64: return "aarch64";
    }
  
    qWarning() << "Unsupported ELF machine type:" << hdr->e_machine;

-- 
gammaray packaging