[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-61-g16a229e

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 086ebbc391e39894753cfbcef6dbd9b87be5bae8
Author: Jakub Adam <jakub.adam at tieto.com>
Date:   Wed Mar 1 08:37:32 2017 +0100

    Refresh patches
---
 debian/changelog                                  |  3 +++
 debian/patches/debian-archs-fix-build.patch       | 13 ++++++++-----
 debian/patches/disable-qt4-objectvisualizer.patch |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c8421e..7c9fda4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 gammaray (2.7.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches:
+    - debian-archs-fix-build.patch
+    - disable-qt4-objectvisualizer.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 01 Mar 2017 08:18:38 +0100
 
diff --git a/debian/patches/debian-archs-fix-build.patch b/debian/patches/debian-archs-fix-build.patch
index 7c7d566..aa21cac 100644
--- a/debian/patches/debian-archs-fix-build.patch
+++ b/debian/patches/debian-archs-fix-build.patch
@@ -8,11 +8,11 @@ Subject: debian-archs-fix-build
  2 files changed, 30 insertions(+)
 
 diff --git a/cmake/GammaRayProbeABI.cmake b/cmake/GammaRayProbeABI.cmake
-index a217064..fc4605f 100644
+index efe4ec1..79e169a 100644
 --- a/cmake/GammaRayProbeABI.cmake
 +++ b/cmake/GammaRayProbeABI.cmake
-@@ -69,10 +69,32 @@ elseif(APPLE)
-     set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
+@@ -84,6 +84,24 @@ elseif(ANDROID)
+     message(FATAL_ERROR "Unsupported Android ABI ${ANDROID_ABI}.")
    endif()
  
 +# kFreeBSD reports i686 as i386 and x86_64 as amd64
@@ -34,6 +34,9 @@ index a217064..fc4605f 100644
 +  endif()
 +
  else()
+   if(NOT CMAKE_SYSTEM_PROCESSOR)
+     message(FATAL_ERROR "Unknown target architecture. Make sure to specify CMAKE_SYSTEM_PROCESSOR in your toolchain file!")
+@@ -91,6 +109,10 @@ 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")
@@ -45,10 +48,10 @@ index a217064..fc4605f 100644
      if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[345]86")
        set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-i686")
 diff --git a/launcher/probeabidetector_elf.cpp b/launcher/probeabidetector_elf.cpp
-index 45bd198..f38447f 100644
+index 5547305..48bcc29 100644
 --- a/launcher/probeabidetector_elf.cpp
 +++ b/launcher/probeabidetector_elf.cpp
-@@ -180,6 +180,14 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
+@@ -153,6 +153,14 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
      case EM_AARCH64:
          return QStringLiteral("aarch64");
  #endif
diff --git a/debian/patches/disable-qt4-objectvisualizer.patch b/debian/patches/disable-qt4-objectvisualizer.patch
index 351ee60..a19bc96 100644
--- a/debian/patches/disable-qt4-objectvisualizer.patch
+++ b/debian/patches/disable-qt4-objectvisualizer.patch
@@ -7,11 +7,11 @@ Subject: disable-qt4-objectvisualizer
  1 file changed, 1 deletion(-)
 
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index b9f5b75..34b5bd4 100644
+index ed25023..ae7a888 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -13,7 +13,6 @@ if(Qt5Core_FOUND)
-   add_subdirectory(network)
+@@ -14,7 +14,6 @@ if(Qt5Core_FOUND)
+   add_subdirectory(qtivi)
    add_subdirectory(translatorinspector)
    add_subdirectory(wlcompositorinspector)
 -else()

-- 
gammaray packaging