[arch-commits] Commit in openscad/trunk (CHANGELOG PKGBUILD)
Kyle Keen
kkeen at archlinux.org
Sat Apr 11 18:02:32 UTC 2015
Date: Saturday, April 11, 2015 @ 20:02:32
Author: kkeen
Revision: 131171
upgpkg: openscad 2015.03-2
Modified:
openscad/trunk/CHANGELOG
openscad/trunk/PKGBUILD
-----------+
CHANGELOG | 8 ++++----
PKGBUILD | 24 ++++++++++++++++--------
2 files changed, 20 insertions(+), 12 deletions(-)
Modified: CHANGELOG
===================================================================
--- CHANGELOG 2015-04-11 15:45:57 UTC (rev 131170)
+++ CHANGELOG 2015-04-11 18:02:32 UTC (rev 131171)
@@ -1,5 +1,8 @@
+2015-04-11 Kyle Keen <keenerd at gmail.com>
+ * 2015.03-2
+ - Rebuild for cgal-4.6-1
+
2015-03-10 Kyle Keen <keenerd at gmail.com>
-
* 2015.03-1
- New release
- Now uses qscintilla for the editor
@@ -9,19 +12,16 @@
- No changes
- Rebuild for boost-1.57.0-1
-
2014-08-18 Kyle Keen <keenerd at gmail.com>
* 2014.03-4
- No changes
- Rebuild for boost-1.56.0-1
-
2014-08-18 Kyle Keen <keenerd at gmail.com>
* 2014.03-3
- No changes
- Rebuild for glew-1.11.0-1
-
2014-08-12 Kyle Keen <keenerd at gmail.com>
* 2014.03-2
- No changes
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-11 15:45:57 UTC (rev 131170)
+++ PKGBUILD 2015-04-11 18:02:32 UTC (rev 131171)
@@ -5,7 +5,7 @@
# Contributor: Pierre DOUCET <pierre at equinoxefr.org>
pkgname=openscad
pkgver=2015.03
-pkgrel=1
+pkgrel=2
pkgdesc="The programmers solid 3D CAD modeller"
url="http://openscad.org/"
arch=('i686' 'x86_64')
@@ -14,26 +14,34 @@
changelog=CHANGELOG
depends=('qt4' 'qscintilla' 'cgal' 'opencsg' 'boost-libs' 'shared-mime-info')
makedepends=('eigen' 'boost' 'imagemagick')
+# full tests need cmake, python2, imagemagick
+checkdepends=('cmake')
source=("http://files.openscad.org/openscad-$pkgver.src.tar.gz")
md5sums=('d1daed0ba048141bb910cfcadf8838e3')
build() {
cd "$srcdir/$pkgname-$pkgver"
- rm -f libraries/MCAD/*.py
- # internal version is done correctly now
- qmake-qt4 PREFIX="/usr" VERSION="$pkgver"
+ qmake-qt4 PREFIX="/usr"
make
convert "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png"
}
-# it has tests
-# tests need cmake, python, imagemagick
-# see doc/testing.txt about enabling
-# needs to display stuff, run image diffs
+check() {
+ # see doc/testing.txt about enabling
+ # normally will display stuff, run image diffs
+ cd "$srcdir/$pkgname-$pkgver/tests"
+ # something here still bugs out
+ return 0
+ cmake .
+ make
+ # run a subset of headless tests
+ ctest -R 'dumptest|echotest|csgtexttest|csgtermtest|openscad-nonascii|openscad-override'
+}
package() {
cd "$srcdir/$pkgname-$pkgver"
make INSTALL_ROOT="$pkgdir" install
+ rm "$pkgdir/usr/share/openscad/libraries/MCAD/"*.py
install -Dm644 "icons/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
install -Dm644 "icons/$pkgname-128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
install -Dm644 "icons/$pkgname.xml" "$pkgdir/usr/share/mime/packages/$pkgname.xml"
More information about the arch-commits
mailing list