[vtk6] 01/02: Fix compilation on arm* with missing Qt. (Closes: #793304)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository vtk6.

commit 73ff79a4d069d5cd1d8316f251885287a035a158
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Jul 29 09:38:10 2015 -0700

    Fix compilation on arm* with missing Qt. (Closes: #793304)
---
 debian/control                              |  6 ++++--
 debian/patches/80_fix_arm_compilation.patch | 21 +++++++++++++++++++++
 debian/patches/series                       |  1 +
 debian/rules                                | 16 +++++++++++-----
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index dd92e6d..48abfc8 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,8 @@ Build-Depends: chrpath,
                libosmesa6-dev,
                libpng-dev,
                libpq-dev,
+               libqt4-dev [armel armhf],
+               libqt4-opengl-dev [armel armhf],
                libqt5opengl5-dev [!armel !armhf],
                libqt5webkit5-dev [!armel !armhf],
                libsqlite3-dev,
@@ -135,7 +137,7 @@ Description: VTK header files
  C++ programs that use VTK to do 3D visualisation.
 
 Package: libvtk6-qt-dev
-Architecture: any
+Architecture: amd64 arm64 i386 powerpc ppc64el mips mipsel kfreebsd-amd64 kfreebsd-i386 s390x
 Section: libdevel
 Depends: libvtk6-dev (= ${binary:Version}),
          ${misc:Depends},
@@ -173,7 +175,7 @@ Description: VTK libraries
  that use VTK.
 
 Package: libvtk6.2-qt
-Architecture: any
+Architecture: amd64 arm64 i386 powerpc ppc64el mips mipsel kfreebsd-amd64 kfreebsd-i386 s390x
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/80_fix_arm_compilation.patch b/debian/patches/80_fix_arm_compilation.patch
new file mode 100644
index 0000000..62b1fe0
--- /dev/null
+++ b/debian/patches/80_fix_arm_compilation.patch
@@ -0,0 +1,21 @@
+Description: Drop some examples, which require Qt
+ It is neccessary for the fixing of arm-compilation
+ where Qt is not available
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/793304
+Last-Update: 2015-07-29
+
+--- vtk6-6.2.0+dfsg1.orig/Examples/Infovis/Cxx/CMakeLists.txt
++++ vtk6-6.2.0+dfsg1/Examples/Infovis/Cxx/CMakeLists.txt
+@@ -26,11 +26,6 @@ if(vtkViewsInfovis_LOADED)
+ endif()
+ 
+ # If Qt is enabled include the QT based examples
+-if(vtkGUISupportQt_LOADED)
+-  add_subdirectory(EasyView)
+-  add_subdirectory(CustomLinkView)
+-  add_subdirectory(StatsView)
+-endif()
+ 
+ if(vtkInfovisParallel_LOADED)
+   add_executable(ParallelBFS ParallelBFS.cxx)
diff --git a/debian/patches/series b/debian/patches/series
index c5bf4f7..0428c1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 50_use_system_utf8.patch
 60_use_system_mpi4py.patch
 70_fix_ftbfs_gcc49.patch
+80_fix_arm_compilation.patch
diff --git a/debian/rules b/debian/rules
index c36d893..61f9e4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ extra_flags +=  \
 	-DVTK_EXTRA_COMPILER_WARNINGS=ON \
 	-DVTK_Group_Imaging=ON \
 	-DVTK_Group_MPI=ON \
-	-DVTK_Group_Qt=ON \
 	-DVTK_Group_Tk=ON \
 	-DVTK_Group_Views=ON \
 	-DVTK_BUILD_ALL_MODULES=ON \
@@ -46,14 +45,21 @@ extra_flags +=  \
 	-DCMAKE_BUILD_TYPE=None \
 	-DVTK_USE_GCC_VISIBILITY=ON \
 
-qt4_archs = armel armhf
-ifeq (,$(filter $(DEB_HOST_ARCH),$(qt4_archs)))
-	extra_flags += -DVTK_QT_VERSION=5
+noqt_archs = armel armhf
+ifeq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs)))
+	extra_flags += -DVTK_QT_VERSION=5	-DVTK_Group_Qt=ON
 else
-	extra_flags += -DVTK_QT_VERSION=4
+	extra_flags += -DVTK_QT_VERSION=4	-DVTK_Group_Qt=OFF  -DModule_vtkGUISupportQt=OFF -DModule_vtkGUISupportQtOpenGL=OFF -DModule_vtkGUISupportQtSQL=OFF
 endif
 
 override_dh_auto_configure:
+ifneq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs)))
+	echo '' > $(CURDIR)/Views/Qt/module.cmake
+	echo '' > $(CURDIR)/GUISupport/QtWebkit/module.cmake
+	echo '' > $(CURDIR)/Rendering/Qt/module.cmake
+	echo '' > $(CURDIR)/GUISupport/QtOpenGL/module.cmake
+	echo '' > $(CURDIR)/Examples/GUI/Qt/SimpleView/CMakeLists.txt
+endif
 	dh_auto_configure -- $(extra_flags)
 
 override_dh_auto_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git