Date: Monday, October 19, 2015 @ 21:08:58 Author: kkeen Revision: 144383
upgpkg: openscad 2015.03.01-5 cgal rebuild & tests Modified: openscad/trunk/CHANGELOG openscad/trunk/PKGBUILD -----------+ CHANGELOG | 9 +++++++++ PKGBUILD | 16 ++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) Modified: CHANGELOG =================================================================== --- CHANGELOG 2015-10-19 18:25:55 UTC (rev 144382) +++ CHANGELOG 2015-10-19 19:08:58 UTC (rev 144383) @@ -1,3 +1,12 @@ +2015-10-19 Kyle Keen <[email protected]> + * 2015.03.01-5 + - No changes + - Rebuild for cgal-4.7 + +2015-10-02 foutrelis + * 2015.03.01-4 + - No changes + 2015-04-29 Kyle Keen <[email protected]> * 2015.03.01-3 - No changes Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-19 18:25:55 UTC (rev 144382) +++ PKGBUILD 2015-10-19 19:08:58 UTC (rev 144383) @@ -6,7 +6,7 @@ pkgname=openscad pkgver=2015.03.01 _ver=2015.03-1 # hopefully -X is temporary -pkgrel=4 +pkgrel=5 pkgdesc="The programmers solid 3D CAD modeller" url="http://openscad.org/"; arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ changelog=CHANGELOG depends=('qt4' 'qscintilla' 'cgal' 'opencsg' 'boost-libs' 'shared-mime-info') makedepends=('eigen' 'boost' 'imagemagick') -# full tests need cmake, python2, imagemagick -checkdepends=('cmake') +# full tests need imagemagick and an X11 or framebuffer session +checkdepends=('cmake' 'xproto' 'libx11' 'python2') source=("http://files.openscad.org/openscad-$_ver.src.tar.gz";) md5sums=('c5994220078f5f5c13984da304e4a2fe') @@ -31,11 +31,15 @@ # see doc/testing.txt about enabling # normally will display stuff, run image diffs cd "$srcdir/$pkgname-$_ver/tests" - # something here still bugs out - return 0 + sed -i 's/exit 1/exit 0/' virtualfb.sh cmake . + # pkgconfig weirdness + sed -i 's/-lmpfr/& -lX11/' CMakeFiles/openscad_nogui.dir/link.txt make - # run a subset of headless tests + sed -i 's/ python$/&2/' *.py + sed -i 's|/usr/bin/python"|/usr/bin/python2"|g' CTestTestfile.cmake + sed -i 's|/usr/bin/python |/usr/bin/python2 |g' CTestCustom.cmake + msg "Running headless tests..." ctest -R 'dumptest|echotest|csgtexttest|csgtermtest|openscad-nonascii|openscad-override' }
