[SCM] gammaray packaging branch, experimental, updated. debian/2.1.0-3-18-gfe11e49

[Jakub Adam]

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

The following commit has been merged in the experimental branch:
commit cd8b415ea77fbece582a2d3bfce203c848084077
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Dec 13 08:54:44 2014 +0100

    Re-enable objectvisualizer plugin
---
 debian/changelog                                |  2 ++
 debian/control                                  | 25 +++++++++++++------------
 debian/patches/fix-objectvisualizer-build.patch | 22 ++++++++++++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cce1e1a..c36e29b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ gammaray (2.2.0-1) UNRELEASED; urgency=medium
   * Refresh d/patches/debian-archs-fix-build.patch.
   * Install new signalmonitor and translatorinspector plugins.
   * Update d/changelog with (re)moved files.
+  * Re-enable objectvisualizer plugin since Qt5-compatible VTK has become
+    available.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 12 Dec 2014 21:56:04 +0100
 
diff --git a/debian/control b/debian/control
index 1eb29ae..a9a950b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9),
                libqt4-dev,
                libqtwebkit-dev,
                libgraphviz-dev,
+               libvtk6-dev,
                gdb,
                xauth,
                xvfb
@@ -51,18 +52,18 @@ Description: GammaRay support for inspecting Qt4 applications
  binaries compiled for Qt5. Install this package if you want to use
  GammaRay with Qt4 applications.
 
-#Package: gammaray-plugin-objectvisualizer
-#Architecture: any
-#Depends: gammaray (= ${binary:Version}),
-#         ${shlibs:Depends},
-#         ${misc:Depends}
-#Description: QObject hierarchy visualization plugin for GammaRay
-# This plugin can visualize parent-child relationships of QObjects in a
-# form of planar or 3D acyclic graph. Multiple graph layout algorihtms
-# are available.
-# .
-# Also, for use with 3D glasses, various types of stereoscopic rendering
-# are supported.
+Package: gammaray-plugin-objectvisualizer
+Architecture: any
+Depends: gammaray (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: QObject hierarchy visualization plugin for GammaRay
+ This plugin can visualize parent-child relationships of QObjects in a
+ form of planar or 3D acyclic graph. Multiple graph layout algorihtms
+ are available.
+ .
+ Also, for use with 3D glasses, various types of stereoscopic rendering
+ are supported.
 
 Package: gammaray-plugin-quickinspector
 Architecture: any
diff --git a/debian/patches/fix-objectvisualizer-build.patch b/debian/patches/fix-objectvisualizer-build.patch
new file mode 100644
index 0000000..c396c5a
--- /dev/null
+++ b/debian/patches/fix-objectvisualizer-build.patch
@@ -0,0 +1,22 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 13 Dec 2014 09:47:40 +0100
+Subject: fix-objectvisualizer-build
+
+---
+ plugins/objectvisualizer/CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/plugins/objectvisualizer/CMakeLists.txt b/plugins/objectvisualizer/CMakeLists.txt
+index 94bef6d..e30506e 100644
+--- a/plugins/objectvisualizer/CMakeLists.txt
++++ b/plugins/objectvisualizer/CMakeLists.txt
+@@ -15,8 +15,7 @@ target_link_libraries(gammaray_objectvisualizer_plugin
+ )
+ 
+ ######## START VTK VISUALIZATION
+-# VTK includes QtGui/... stuff => breaks compilation with Qt5
+-if(VTK_FOUND AND NOT Qt5Core_FOUND AND NOT GAMMARAY_PROBE_ONLY_BUILD)
++if(VTK_FOUND AND NOT GAMMARAY_PROBE_ONLY_BUILD)
+ 
+ set(OPTIONAL_VTK_LIBRARIES
+ )
diff --git a/debian/patches/series b/debian/patches/series
index 10f35c1..8db3a3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-archs-fix-build.patch
+fix-objectvisualizer-build.patch

-- 
gammaray packaging