[SCM] gammaray packaging branch, experimental, updated. debian/2.1.0-3-23-g7ad1927

[Jakub Adam]

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

The following commit has been merged in the experimental branch:
commit 7ad192793a91102f59c476b540dd54ad6f4c2165
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Feb 7 13:51:37 2015 +0100

    Disable objectvisualizer plugin with Qt4
    
    libvtk6 moved to Qt5.
---
 debian/patches/disable-qt4-objectvisualizer.patch | 23 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/disable-qt4-objectvisualizer.patch b/debian/patches/disable-qt4-objectvisualizer.patch
new file mode 100644
index 0000000..ed49398
--- /dev/null
+++ b/debian/patches/disable-qt4-objectvisualizer.patch
@@ -0,0 +1,23 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 7 Feb 2015 13:48:20 +0100
+Subject: disable-qt4-objectvisualizer
+
+---
+ plugins/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index c48d194..dd72f79 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -1,7 +1,9 @@
+ add_subdirectory(codecbrowser)
+ add_subdirectory(fontbrowser)
+ add_subdirectory(kjobtracker)
+-add_subdirectory(objectvisualizer)
++if (Qt5Core_FOUND)
++  add_subdirectory(objectvisualizer)
++endif()
+ add_subdirectory(quickinspector)
+ add_subdirectory(selectionmodelinspector)
+ add_subdirectory(signalmonitor)
diff --git a/debian/patches/series b/debian/patches/series
index ea4ec13..f529ca3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian-archs-fix-build.patch
 fix-objectvisualizer-build.patch
 use-empty-rpath.patch
+disable-qt4-objectvisualizer.patch

-- 
gammaray packaging