tags 384908 patch thanks
Hi, the attached patch adds packages for Qt3 and Qt4 support. However, it is not ideal, as the package cannot be rebuilt without an intermediate clean run -- which is pretty inconvenient given the time that is necessary for a complete build of vtk. HTH. Michael -- GPG key: 1024D/3144BE0F Michael Hanke http://apsy.gse.uni-magdeburg.de/hanke ICQ: 48230050
diff -rNu vtk-5.0.1.orig/debian/changelog vtk-5.0.1/debian/changelog --- vtk-5.0.1.orig/debian/changelog 2006-09-05 20:17:03.844518888 +0200 +++ vtk-5.0.1/debian/changelog 2006-09-05 13:55:02.037163272 +0200 @@ -1,3 +1,9 @@ +vtk (5.0.1-2~qt) unstable; urgency=low + + * Added GUI support for Qt3 and Qt4. + + -- Michael Hanke <[EMAIL PROTECTED]> Tue, 5 Sep 2006 13:54:47 +0200 + vtk (5.0.1-1) unstable; urgency=low * New upstream branch diff -rNu vtk-5.0.1.orig/debian/control vtk-5.0.1/debian/control --- vtk-5.0.1.orig/debian/control 2006-09-05 20:17:03.843519040 +0200 +++ vtk-5.0.1/debian/control 2006-09-05 20:14:38.060681400 +0200 @@ -2,7 +2,7 @@ Section: graphics Priority: optional Maintainer: A. Maitland Bottoms <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 4.0.0), xlibmesa-gl-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libx11-dev, libxt-dev, x-dev, tcl8.4-dev, tk8.4-dev, python-dev, cmake (>> 2.0.4), libexpat1-dev, libjpeg62-dev, libpng12-0-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libfreetype6-dev, ftgl-dev +Build-Depends: debhelper (>> 4.0.0), xlibmesa-gl-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libx11-dev, libxt-dev, x-dev, tcl8.4-dev, tk8.4-dev, python-dev, cmake (>> 2.0.4), libexpat1-dev, libjpeg62-dev, libpng12-0-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libfreetype6-dev, ftgl-dev, libqt3-mt-dev, libqt4-dev Build-Depends-Indep: libdigest-md5-perl, doxygen XS-Python-Version: current Standards-Version: 3.7.2.0 @@ -89,3 +89,50 @@ information may be available in /usr/share/doc/python-vtk/. . Homepage: http://www.vtk.org/ + + +Package: libvtk5-qt3 +Architecture: any +Depends: ${shlibs:Depends} +Section: libs +Description: Visualization Toolkit - A high level 3D visualization library + This provides the VTK GUI support for Qt3. + . + Homepage: http://www.vtk.org/ + + +Package: libvtk5-qt3-dev +Architecture: all +Depends: libvtk5-dev (>= ${Source-Version}), libvtk5-qt3 (>= ${Source-Version}) +Conflicts: libvtk5-qt4-dev +Section: libdevel +Description: Visualization Toolkit - A high level 3D visualization library + This provides the VTK header files required to compile C++ programs + that use VTK GUI support for Qt3. + . + Homepage: http://www.vtk.org/ + +Package: libvtk5-qt4 +Architecture: any +Depends: ${shlibs:Depends} +Section: libs +Description: Visualization Toolkit - A high level 3D visualization library + This provides the VTK GUI support for Qt4. + . + Homepage: http://www.vtk.org/ + + +Package: libvtk5-qt4-dev +Architecture: all +Depends: libvtk5-dev (>= ${Source-Version}), libvtk5-qt4 (>= ${Source-Version}) +Conflicts: libvtk5-qt3-dev +Section: libdevel +Description: Visualization Toolkit - A high level 3D visualization library + This provides the VTK header files required to compile C++ programs + that use VTK GUI support for Qt4. + . + Homepage: http://www.vtk.org/ + + + + diff -rNu vtk-5.0.1.orig/debian/libvtk5-qt3-dev.install vtk-5.0.1/debian/libvtk5-qt3-dev.install --- vtk-5.0.1.orig/debian/libvtk5-qt3-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.0.1/debian/libvtk5-qt3-dev.install 2006-09-05 13:44:42.000000000 +0200 @@ -0,0 +1,3 @@ +qt3-support/usr/include/* usr/include +qt3-support/usr/lib/lib*.so usr/lib +qt3-support/usr/lib/vtk-5.0 usr/lib diff -rNu vtk-5.0.1.orig/debian/libvtk5-qt3.dirs vtk-5.0.1/debian/libvtk5-qt3.dirs --- vtk-5.0.1.orig/debian/libvtk5-qt3.dirs 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.0.1/debian/libvtk5-qt3.dirs 2006-09-05 13:44:42.000000000 +0200 @@ -0,0 +1,2 @@ +usr/lib/qt3/plugins/designer + diff -rNu vtk-5.0.1.orig/debian/libvtk5-qt3.install vtk-5.0.1/debian/libvtk5-qt3.install --- vtk-5.0.1.orig/debian/libvtk5-qt3.install 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.0.1/debian/libvtk5-qt3.install 2006-09-05 13:44:42.000000000 +0200 @@ -0,0 +1,2 @@ +qt3-support/usr/lib/lib*.so.* usr/lib +qt3-support/usr/plugins/designer/* usr/lib/qt3/plugins/designer diff -rNu vtk-5.0.1.orig/debian/libvtk5-qt4-dev.install vtk-5.0.1/debian/libvtk5-qt4-dev.install --- vtk-5.0.1.orig/debian/libvtk5-qt4-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.0.1/debian/libvtk5-qt4-dev.install 2006-09-05 13:44:42.000000000 +0200 @@ -0,0 +1,3 @@ +qt4-support/usr/include/* usr/include +qt4-support/usr/lib/lib*.so usr/lib +qt4-support/usr/lib/vtk-5.0 usr/lib diff -rNu vtk-5.0.1.orig/debian/libvtk5-qt4.dirs vtk-5.0.1/debian/libvtk5-qt4.dirs --- vtk-5.0.1.orig/debian/libvtk5-qt4.dirs 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.0.1/debian/libvtk5-qt4.dirs 2006-09-05 13:44:42.000000000 +0200 @@ -0,0 +1,2 @@ +usr/lib/qt4/plugins/designer + diff -rNu vtk-5.0.1.orig/debian/libvtk5-qt4.install vtk-5.0.1/debian/libvtk5-qt4.install --- vtk-5.0.1.orig/debian/libvtk5-qt4.install 1970-01-01 01:00:00.000000000 +0100 +++ vtk-5.0.1/debian/libvtk5-qt4.install 2006-09-05 13:44:42.000000000 +0200 @@ -0,0 +1,2 @@ +qt4-support/usr/lib/lib*.so.* usr/lib +qt4-support/usr/plugins/designer/* usr/lib/qt4plugins/designer diff -rNu vtk-5.0.1.orig/debian/rules vtk-5.0.1/debian/rules --- vtk-5.0.1.orig/debian/rules 2006-09-05 20:17:03.846518584 +0200 +++ vtk-5.0.1/debian/rules 2006-09-05 13:52:55.544393096 +0200 @@ -38,6 +38,9 @@ PYVERS=$(shell pyversions -r debian/control) +# 'VTK GUI support' supported Qt versions +QTVERS=3 4 + configure: configure-stamp configure-stamp: dh_testdir @@ -70,6 +73,9 @@ echo TK_LIBRARY:FILEPATH=/usr/lib/libtk8.4.so >> Build/CMakeCache.txt echo VTK_TCL_LIBRARY_DIR:FILEPATH=/usr/lib/tcl8.4 >> Build/CMakeCache.txt + echo VTK_USE_GUISUPPORT:BOOL=ON >> Build/CMakeCache.txt + echo VTK_USE_QVTK:BOOL=OFF >> Build/CMakeCache.txt + echo PYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) >> Build/CMakeCache.txt echo PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so >> Build/CMakeCache.txt echo CMAKE_INSTALL_PREFIX:PATH=$(PWD)/debian/tmp/usr >> Build/CMakeCache.txt @@ -120,7 +126,18 @@ rm -f current dh_clean -install: build +install-qt%: + cd Build/GUISupport && $(MAKE) clean + + cd Build/GUISupport && \ + cmake .. -DDESIRED_QT_VERSION=$* -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt$* \ + -DQT_MOC_EXECUTABLE=/usr/bin/moc-qt$* -DQT_INCLUDE_DIR=/usr/include/qt$* \ + -DVTK_USE_GUISUPPORT:BOOL=ON -DVTK_USE_QVTK:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr + cd Build/GUISupport && $(MAKE) VERBOSE=$(DH_VERBOSE) && $(MAKE) install DESTDIR=$(PWD)/debian/tmp/qt$*-support + + +install-main: dh_testdir dh_testroot dh_clean -k @@ -132,6 +149,9 @@ rm -f $(CURDIR)/debian/tmp/usr/lib/vtk/*.so #(cd Build/bin && tar cf - *.so* ) | ( cd $(CURDIR)/debian/tmp/usr/lib/vtk/ && tar xpf - ) + +install: build install-main $(QTVERS:%=install-qt%) + # Build architecture-independent files here. # (libvtk5-dev, vtk-doc, vtk-examples) binary-indep: build build-docs install @@ -139,6 +159,10 @@ dh_testroot -i # dh_installdebconf -i dh_installdocs -i + + # install the qt stuff + dh_install -i --sourcedir=$(CURDIR)/debian/tmp + mv debian/tmp/usr/include/vtk-5.0 debian/libvtk5-dev/usr/include/ mv debian/tmp/usr/lib/vtk-5.0/doxygen/* debian/vtk-doc/usr/share/doc/vtk-doc/html/ mv debian/tmp/usr/lib/*.so debian/libvtk5-dev/usr/lib/ @@ -184,6 +208,10 @@ dh_testroot -a #dh_installdebconf -a dh_installdocs -a -n + + # install the qt stuff + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + mv debian/tmp/usr/bin/vtk debian/vtk-tcl/usr/bin/vtk mv debian/tmp/usr/lib/*TCL.so* debian/vtk-tcl/usr/lib/ #(cd $(CURDIR)/debian/vtk-tcl/usr/lib/tcl8.4 ; for i in ../*TCL.so.5.0 ; do ln -s $$i `basename $$i .5.0` ; done) diff -rNu vtk-5.0.1.orig/debian/vtk-doc.install vtk-5.0.1/debian/vtk-doc.install --- vtk-5.0.1.orig/debian/vtk-doc.install 2006-09-05 20:17:03.813523600 +0200 +++ vtk-5.0.1/debian/vtk-doc.install 2006-09-05 20:13:22.808121528 +0200 @@ -1 +0,0 @@ -debian/tmp/usr/share/doc/vtk-doc/html/
signature.asc
Description: Digital signature
