[dolfin] 01/01: Build against vtk6 not vtk5 and disable Qt

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository dolfin.

commit dea3b5682b170e7d6bd4634f7ab156634763fa33
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Apr 26 17:07:24 2016 +0800

    Build against vtk6 not vtk5 and disable Qt
    
    in source and libdolfin-dev dependencies.
    
    Drop dependencies on libvtk5-qt4-dev, i.e. don't update to
    libvtk6-qt-dev, since dolfin supports Qt4 only, while vtk6 uses Qt5.
    
    So disable Qt support in the build. Otherwise QVTKWidget (defined in
    libvtk5-qt4-dev) will be undefined in
    dolfin/plot/VTKWindowOutputStage.cpp.
    
    Note, general Qt support has been dropped upstream.
    
    Closes: #821875.
---
 debian/changelog | 3 +++
 debian/control   | 8 ++------
 debian/rules     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83d0a91..e7d09b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dolfin (1.6.0-4) UNRELEASED; urgency=medium
 
   [ Drew Parsons ]
   * Remove python-dolfin dependency on python-netcdf. Closes: #821215.
+  * Build against vtk6 not vtk5 (source and libdolfin-dev dependencies).
+    Requires Qt4 support to be switched off (vtk6 uses Qt5).
+    Qt support has been dropped upstream. Closes: #821875. 
 
  -- Mattia Rizzolo <mattia at debian.org>  Sat, 23 Apr 2016 22:15:22 +0000
 
diff --git a/debian/control b/debian/control
index aa355a9..5f5b079 100644
--- a/debian/control
+++ b/debian/control
@@ -22,10 +22,8 @@ Build-Depends:
  libboost-timer-dev,
  libeigen3-dev,
  libhdf5-mpi-dev,
- libqt4-dev,
  libsuitesparse-dev,
- libvtk5-dev,
- libvtk5-qt4-dev,
+ libvtk6-dev,
  libxml2-dev,
  mpi-default-dev,
  petsc-dev [!kfreebsd-amd64 !kfreebsd-i386],
@@ -60,10 +58,8 @@ Depends:
  libdolfin1.6 (= ${binary:Version}),
  libeigen3-dev,
  libhdf5-mpi-dev,
- libqt4-dev,
  libsuitesparse-dev,
- libvtk5-dev,
- libvtk5-qt4-dev,
+ libvtk6-dev,
  libxml2-dev,
  petsc-dev [!kfreebsd-amd64 !kfreebsd-i386],
  pkg-config,
diff --git a/debian/rules b/debian/rules
index ef07473..46cf2da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ CMAKE_OPTS := \
 	-D HDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5pcc \
 	-D HDF5_Fortran_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5pfc \
 	-D DOLFIN_ENABLE_VTK:BOOL=ON \
-	-D DOLFIN_ENABLE_QT:BOOL=ON \
+	-D DOLFIN_ENABLE_QT:BOOL=OFF \
 	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
 	-D DOLFIN_ENABLE_PASTIX:BOOL=OFF \
 	-D DOLFIN_ENABLE_SCOTCH:BOOL=OFF \

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