[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-32-g2c7d1d2

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 07465b97e17985ec503ff6455024164aeb64a987
Author: Jakub Adam <jakub.adam at tieto.com>
Date:   Tue Jul 26 09:51:29 2016 +0200

    Refresh patches
---
 debian/changelog                                  |  4 +++
 debian/patches/debian-archs-fix-build.patch       | 41 +++++++++++++----------
 debian/patches/disable-qt4-objectvisualizer.patch |  6 ++--
 debian/patches/disable-qt4-webinspector.patch     |  6 ++--
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d2240f..a1a1eb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ gammaray (2.5.0-1) UNRELEASED; urgency=medium
   * Migrate to automatic debug packages.
   * Use secure URIs in Vcs-* fields.
   * Bump Standards-Version to 3.9.7.
+  * Refresh patches:
+    - debian-archs-fix-build.patch
+    - disable-qt4-objectvisualizer.patch
+    - disable-qt4-webinspector.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 26 Jul 2016 09:35:26 +0200
 
diff --git a/debian/patches/debian-archs-fix-build.patch b/debian/patches/debian-archs-fix-build.patch
index f214381..6911eba 100644
--- a/debian/patches/debian-archs-fix-build.patch
+++ b/debian/patches/debian-archs-fix-build.patch
@@ -4,14 +4,14 @@ Subject: debian-archs-fix-build
 
 ---
  cmake/GammaRayProbeABI.cmake      | 22 ++++++++++++++++++++++
- launcher/probeabidetector_elf.cpp |  5 +++++
- 2 files changed, 27 insertions(+)
+ launcher/probeabidetector_elf.cpp | 12 +++++++++++-
+ 2 files changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/cmake/GammaRayProbeABI.cmake b/cmake/GammaRayProbeABI.cmake
-index 8cd29e2..88914b3 100644
+index a217064..fc4605f 100644
 --- a/cmake/GammaRayProbeABI.cmake
 +++ b/cmake/GammaRayProbeABI.cmake
-@@ -56,10 +56,32 @@ elseif(APPLE)
+@@ -69,10 +69,32 @@ elseif(APPLE)
      set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
    endif()
  
@@ -42,21 +42,28 @@ index 8cd29e2..88914b3 100644
 +  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
 +    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-ppc64")
    else()
-     set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")
-   endif()
+     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 b9a12e3..0386372 100644
+index fb1c1d7..499d302 100644
 --- a/launcher/probeabidetector_elf.cpp
 +++ b/launcher/probeabidetector_elf.cpp
-@@ -159,6 +159,11 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
-     case EM_X86_64: return QStringLiteral("x86_64");
+@@ -162,7 +162,17 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
  #endif
-     case EM_ARM: return QStringLiteral("arm");
-+    case EM_MIPS: return QStringLiteral("mips");
-+    case EM_PPC: return QStringLiteral("ppc");
-+    case EM_S390: return QStringLiteral("s390x");
-+    case EM_PPC64: return QStringLiteral("ppc64");
-+    case EM_AARCH64: return QStringLiteral("aarch64");
-   }
+     case EM_ARM:
+         return QStringLiteral("arm");
+-    }
++    case EM_MIPS:
++	return QStringLiteral("mips");
++    case EM_PPC:
++	return QStringLiteral("ppc");
++    case EM_S390:
++	return QStringLiteral("s390x");
++    case EM_PPC64:
++	return QStringLiteral("ppc64");
++    case EM_AARCH64:
++	return QStringLiteral("aarch64");
++  }
  
-   qWarning() << "Unsupported ELF machine type:" << hdr->e_machine;
+     qWarning() << "Unsupported ELF machine type:" << hdr->e_machine;
+     return QString();
diff --git a/debian/patches/disable-qt4-objectvisualizer.patch b/debian/patches/disable-qt4-objectvisualizer.patch
index d69fb5d..99a9941 100644
--- a/debian/patches/disable-qt4-objectvisualizer.patch
+++ b/debian/patches/disable-qt4-objectvisualizer.patch
@@ -7,12 +7,12 @@ Subject: disable-qt4-objectvisualizer
  1 file changed, 1 deletion(-)
 
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index 5e5feff..660b7e1 100644
+index dde70dd..3058e72 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -10,7 +10,6 @@ add_subdirectory(webinspector)
- 
+@@ -11,7 +11,6 @@ add_subdirectory(webinspector)
  if(Qt5Core_FOUND)
+   add_subdirectory(network)
    add_subdirectory(translatorinspector)
 -else()
    add_subdirectory(objectvisualizer)
diff --git a/debian/patches/disable-qt4-webinspector.patch b/debian/patches/disable-qt4-webinspector.patch
index ed48c92..d701046 100644
--- a/debian/patches/disable-qt4-webinspector.patch
+++ b/debian/patches/disable-qt4-webinspector.patch
@@ -7,10 +7,10 @@ Subject: disable-qt4-webinspector
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index dd72f79..90b4df5 100644
+index 3058e72..f651c06 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -9,7 +9,9 @@ add_subdirectory(selectionmodelinspector)
+@@ -6,7 +6,9 @@ add_subdirectory(selectionmodelinspector)
  add_subdirectory(signalmonitor)
  add_subdirectory(statemachineviewer)
  add_subdirectory(timertop)
@@ -20,4 +20,4 @@ index dd72f79..90b4df5 100644
 +endif()
  
  if(Qt5Core_FOUND)
-   add_subdirectory(translatorinspector)
+   add_subdirectory(network)

-- 
gammaray packaging