[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-52-g13c0bc4

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 480aba356ac84da80bea2f9b74ca7d1649edc712
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Oct 31 15:00:29 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 888cd88..093ad2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ gammaray (2.6.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop Fix-compilation-on-ARM-when-building-against-Qt-4.patch
     - applied upstream.
+  * Refresh patches:
+    - debian-archs-fix-build.patch
+    - disable-qt4-objectvisualizer.patch
+    - disable-qt4-webinspector.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 31 Oct 2016 14:53:18 +0100
 
diff --git a/debian/patches/debian-archs-fix-build.patch b/debian/patches/debian-archs-fix-build.patch
index 6911eba..7c7d566 100644
--- a/debian/patches/debian-archs-fix-build.patch
+++ b/debian/patches/debian-archs-fix-build.patch
@@ -4,8 +4,8 @@ Subject: debian-archs-fix-build
 
 ---
  cmake/GammaRayProbeABI.cmake      | 22 ++++++++++++++++++++++
- launcher/probeabidetector_elf.cpp | 12 +++++++++++-
- 2 files changed, 33 insertions(+), 1 deletion(-)
+ launcher/probeabidetector_elf.cpp |  8 ++++++++
+ 2 files changed, 30 insertions(+)
 
 diff --git a/cmake/GammaRayProbeABI.cmake b/cmake/GammaRayProbeABI.cmake
 index a217064..fc4605f 100644
@@ -45,25 +45,21 @@ 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 fb1c1d7..499d302 100644
+index 45bd198..f38447f 100644
 --- a/launcher/probeabidetector_elf.cpp
 +++ b/launcher/probeabidetector_elf.cpp
-@@ -162,7 +162,17 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
+@@ -180,6 +180,14 @@ static QString archFromELFHeader(const uchar *data, quint64 size)
+     case EM_AARCH64:
+         return QStringLiteral("aarch64");
  #endif
-     case EM_ARM:
-         return QStringLiteral("arm");
--    }
 +    case EM_MIPS:
-+	return QStringLiteral("mips");
++        return QStringLiteral("mips");
 +    case EM_PPC:
-+	return QStringLiteral("ppc");
++        return QStringLiteral("ppc");
 +    case EM_S390:
-+	return QStringLiteral("s390x");
++        return QStringLiteral("s390x");
 +    case EM_PPC64:
-+	return QStringLiteral("ppc64");
-+    case EM_AARCH64:
-+	return QStringLiteral("aarch64");
-+  }
++        return QStringLiteral("ppc64");
+     }
  
      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 99a9941..351ee60 100644
--- a/debian/patches/disable-qt4-objectvisualizer.patch
+++ b/debian/patches/disable-qt4-objectvisualizer.patch
@@ -7,13 +7,13 @@ Subject: disable-qt4-objectvisualizer
  1 file changed, 1 deletion(-)
 
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index dde70dd..3058e72 100644
+index b9f5b75..34b5bd4 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -11,7 +11,6 @@ add_subdirectory(webinspector)
- if(Qt5Core_FOUND)
+@@ -13,7 +13,6 @@ if(Qt5Core_FOUND)
    add_subdirectory(network)
    add_subdirectory(translatorinspector)
+   add_subdirectory(wlcompositorinspector)
 -else()
    add_subdirectory(objectvisualizer)
  endif()
diff --git a/debian/patches/disable-qt4-webinspector.patch b/debian/patches/disable-qt4-webinspector.patch
index 8ac068f..2b82e03 100644
--- a/debian/patches/disable-qt4-webinspector.patch
+++ b/debian/patches/disable-qt4-webinspector.patch
@@ -8,10 +8,10 @@ Subject: disable-qt4-webinspector
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d8335da..1b32d33 100644
+index c843783..c87f69a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -324,7 +324,7 @@ else()
+@@ -325,7 +325,7 @@ else()
      # minimum set
      find_package(Qt4 4.8.0 REQUIRED QtCore QtGui QtNetwork)
    endif()
@@ -21,10 +21,10 @@ index d8335da..1b32d33 100644
    include(${QT_USE_FILE})
    set(HAVE_QT_CONCURRENT true)
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index 3058e72..f651c06 100644
+index 34b5bd4..a21bc69 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -6,7 +6,9 @@ add_subdirectory(selectionmodelinspector)
+@@ -6,7 +6,9 @@ add_subdirectory(quickinspector)
  add_subdirectory(signalmonitor)
  add_subdirectory(statemachineviewer)
  add_subdirectory(timertop)
@@ -34,4 +34,4 @@ index 3058e72..f651c06 100644
 +endif()
  
  if(Qt5Core_FOUND)
-   add_subdirectory(network)
+   add_subdirectory(mimetypes)

-- 
gammaray packaging