Date: Thursday, September 4, 2014 @ 12:32:59 Author: aginiewicz Revision: 118267
upgpkg: mayavi 4.3.1-3 mayavi: fix mtime, switch to qt4 due to FS#41791 Added: mayavi/trunk/mayavi.csh mayavi/trunk/mayavi.sh Modified: mayavi/trunk/PKGBUILD ------------+ PKGBUILD | 36 +++++++++++++++++++++++++++--------- mayavi.csh | 1 + mayavi.sh | 1 + 3 files changed, 29 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-04 09:57:30 UTC (rev 118266) +++ PKGBUILD 2014-09-04 10:32:59 UTC (rev 118267) @@ -3,21 +3,24 @@ pkgname=mayavi pkgver=4.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A 3-dimensional visualizer of scientific data" arch=('i686' 'x86_64') url="https://github.com/enthought/mayavi" license=('BSD') -depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython2.8') +depends=('ipython2' 'vtk' 'python2-envisage' 'python2-pyqt4') makedepends=('python2-setuptools' 'python2-sphinx' 'python2-twisted' 'xorg-server-xvfb') replaces=('python2-mayavi') provides=('python2-mayavi') options=(!emptydirs) -source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz") -md5sums=('93677c77f0a835537bd210c493740b03') +source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz" + "mayavi.sh" "mayavi.csh") +md5sums=('93677c77f0a835537bd210c493740b03' + '6d36bbfb69010e313292cfee4982487f' + '91eb92abc506a00c29afcb37c9600914') -build() { +prepare() { cd "$srcdir"/mayavi-$pkgver # force selection of wxpython 2.8 @@ -32,6 +35,18 @@ # set path so autodoc can find just built modules echo "sys.path.append('$srcdir/enthought-mayavi-${_githubtag}/build/lib.linux-$CARCH-2.7/')" >> docs/source/mayavi/conf.py + + # fix python->python2 + sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + -i $(find . -name '*[\._]py') +} + +build() { + cd "$srcdir"/mayavi-$pkgver + rm -rf build + mkdir build mkdir -p build/lib.linux-$CARCH-2.7/{tvtk/plugins/scene,mayavi/preferences,mayavi/core} ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/tvtk_classes.zip \ build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip @@ -40,6 +55,9 @@ ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/plugins/scene/preferences.ini \ build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini + # force using Qt during build + export ETS_TOOLKIT=qt4 + # now this is ugly, but docs do not build without X. We setup X according to: # http://docs.enthought.com/mayavi/mayavi/tips.html#rendering-using-the-virtual-framebuffer export DISPLAY=:69 @@ -62,10 +80,10 @@ cp -r docs/build/* "${pkgdir}"/usr/lib/python2.7/site-packages - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find "${pkgdir}" -name '*.py') - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - "$pkgdir/usr/lib/python2.7/site-packages/mayavi/tests/csv_files/csv_2_py" + # switch to PyQt by default, fix FS#41791 + install -d "${pkgdir}"/etc/profile.d + install -Dm644 "${srcdir}"/mayavi.sh "${pkgdir}"/etc/profile.d/mayavi.sh + install -Dm644 "${srcdir}"/mayavi.csh "${pkgdir}"/etc/profile.d/mayavi.csh install -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Added: mayavi.csh =================================================================== --- mayavi.csh (rev 0) +++ mayavi.csh 2014-09-04 10:32:59 UTC (rev 118267) @@ -0,0 +1 @@ +setenv ETS_TOOLKIT "qt4" Added: mayavi.sh =================================================================== --- mayavi.sh (rev 0) +++ mayavi.sh 2014-09-04 10:32:59 UTC (rev 118267) @@ -0,0 +1 @@ +export ETS_TOOLKIT="qt4"