[gammaray/f20] Fix build against VTK 6.0

[Daniel Vrátil]

commit d75f36ff8f4244d7f19fb6bf2a7816a6497980cf
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Aug 27 15:47:38 2013 +0200

    Fix build against VTK 6.0

 gammaray-vtk60.patch |   32 ++++++++++++++++++++++++++++++++
 gammaray.spec        |   14 +++++++++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/gammaray-vtk60.patch b/gammaray-vtk60.patch
new file mode 100644
index 0000000..7975c43
--- /dev/null
+++ b/gammaray-vtk60.patch
@@ -0,0 +1,32 @@
+diff --git a/plugins/objectvisualizer/CMakeLists.txt b/plugins/objectvisualizer/CMakeLists.txt
+index 08e95bf..31369ae 100644
+--- a/plugins/objectvisualizer/CMakeLists.txt
++++ b/plugins/objectvisualizer/CMakeLists.txt
+@@ -10,6 +10,8 @@ include_directories(
+   ${VTK_INCLUDE_DIRS}
+ )
+ 
++include(${VTK_USE_FILE})
++
+ link_directories(${VTK_LIBRARY_DIRS})
+ 
+ set(gammaray_objectvisualizer_plugin_srcs
+@@ -29,11 +31,17 @@ gammaray_add_plugin(gammaray_objectvisualizer_plugin
+   ${gammaray_objectvisualizer_plugin_srcs}
+ )
+ 
++if (${VTK_MAJOR_VERSION} EQUAL 5)
++  set(VTK_QT_LIBRARY QVTK)
++elseif (${VTK_MAJOR_VERSION} EQUAL 6)
++  set(VTK_QT_LIBRARY vtkGUISupportQt)
++endif ()
++
+ target_link_libraries(gammaray_objectvisualizer_plugin
+   ${QT_QTCORE_LIBRARIES}
+   ${QT_QTGUI_LIBRARIES}
+   ${VTK_LIBRARIES}
+-  QVTK
++  ${VTK_QT_LIBRARY}
+   gammaray_probe
+ )
+ 
diff --git a/gammaray.spec b/gammaray.spec
index ad6dafc..be68ba6 100644
--- a/gammaray.spec
+++ b/gammaray.spec
@@ -2,7 +2,7 @@
 
 Name:           gammaray
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for examining internals of Qt applications
 
 License:        GPLv2+
@@ -12,6 +12,9 @@ URL:            http://www.kdab.com/kdab-products/gammaray/
 Source0:        gammaray-%{version}.tar.gz
 Source1:        http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{qt_version}.tar.gz
 
+# See https://github.com/KDAB/GammaRay/pull/50
+Patch0:         gammaray-vtk60.patch
+
 BuildRequires:  qt-devel
 BuildRequires:  qt-devel-private
 BuildRequires:  qtwebkit-devel
@@ -19,6 +22,9 @@ BuildRequires:  vtk-devel
 BuildRequires:  glibc-devel
 BuildRequires:  graphviz-devel
 BuildRequires:  kdelibs4-devel
+BuildRequires:  python-devel
+BuildRequires:  hdf5-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  chrpath
 BuildRequires:  docbook-dtds
 BuildRequires:  doxygen
@@ -49,6 +55,8 @@ This package includes developer documentation in HTML format.
 %prep
 %setup -q -b 1 -n GammaRay-%{version}
 
+%patch0 -p1 -b .vtk60
+
 %build
 %cmake . -DQT_PRIVATE_INCLUDE_DIR=%{_builddir}/qt-everywhere-opensource-src-%{qt_version}/include/QtCore
 make %{?_smp_mflags}
@@ -82,6 +90,10 @@ chrpath --delete %{buildroot}/%{_qt4_plugindir}/gammaray/gammaray_kjobtracker_pl
 %{_docdir}/gammaray/html/
 
 %changelog
+* Tue Aug 27 2013 Daniel Vrátil <dvratil at redhat.com> - 1.3.1-2
+- update Qt sources
+- fix build against VTK 6.0
+
 * Mon Aug 05 2013 Daniel Vrátil <dvratil at redhat.com> - 1.3.1-1
 - GammaRay 1.3.1