update to 0.9.2

2 files changed, 28 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9c1cf44e3d3..c6cd60086b0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 # Generated by mksrcinfo v8
-# Thu Mar  9 13:55:58 UTC 2017
+# Fri Nov 24 17:52:20 UTC 2017
 pkgbase = antimony
 	pkgdesc = Graph-based 3D CSG CAD modeller
-	pkgver = 0.9.0
-	pkgrel = 2
+	pkgver = 0.9.2
+	pkgrel = 1
 	url = http://www.mattkeeter.com/projects/antimony/3/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = boost
+	makedepends = ninja
 	depends = qt5-base
 	depends = boost-libs
 	depends = python
 	depends = libpng
 	depends = lemon
-	source = https://github.com/mkeeter/antimony/archive/0.9.0.tar.gz
-	md5sums = a5390c486cd0ec2bf7a1578d7eec8ec9
+	source = antimony.0.9.2.tgz::https://github.com/mkeeter/antimony/archive/0.9.2.tar.gz
+	md5sums = bef515c3501367c97637756d9ac25720
 
 pkgname = antimony
 
diff --git a/PKGBUILD b/PKGBUILD
index 3125ccd23332..554f40fcbbe7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,52 @@
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 
 pkgname=antimony
-pkgver=0.9.0
-pkgrel=2
+pkgver=0.9.2
+pkgrel=1
 pkgdesc="Graph-based 3D CSG CAD modeller"
 url="http://www.mattkeeter.com/projects/antimony/3/"
 arch=('i686' 'x86_64')
 license=('MIT')
 depends=('qt5-base' 'boost-libs' 'python' 'libpng' 'lemon')
-makedepends=('boost')
-source=("https://github.com/mkeeter/antimony/archive/$pkgver.tar.gz")
-md5sums=('a5390c486cd0ec2bf7a1578d7eec8ec9')
+makedepends=('boost' 'ninja')
+source=("$pkgname.$pkgver.tgz::https://github.com/mkeeter/antimony/archive/$pkgver.tar.gz")
+md5sums=('bef515c3501367c97637756d9ac25720')
 
 # todo, replace bundled eigen with official
 
 prepare() {
     cd "$srcdir/$pkgname-$pkgver"
 
-    sed -i 's|\(executable.path =\).*|\1 /usr/bin|' app/app.pro
-    sed -i 's|\(nodes_folder.path =\).*|\1  /usr/share/antimony/sb/nodes|' app/app.pro
-    sed -i 's|\(fab_folder.path =\).*|\1 /usr/lib/python3.6/site-packages/fab|' app/app.pro
-    sed -i 's|return path.join("/");|return "/usr/share/antimony/sb/nodes";|' app/src/app/app.cpp
-    sed -i 's|lpython3.4m|lpython3.6m|' qt/python.pri
+    sed -i 's|/usr/local/|/usr/|' app/app/{app,main}.cpp app/CMakeLists.txt
+
+    #sed -i 's|\(executable.path =\).*|\1 /usr/bin|' app/app.pro
+    #sed -i 's|\(nodes_folder.path =\).*|\1  /usr/share/antimony/sb/nodes|' app/app.pro
+    #sed -i 's|\(fab_folder.path =\).*|\1 /usr/lib/python3.6/site-packages/fab|' app/app.pro
+    #sed -i 's|return path.join("/");|return "/usr/share/antimony/sb/nodes";|' app/src/app/app.cpp
+    #sed -i 's|lpython3.4m|lpython3.6m|' qt/python.pri
 
     # probably a flag somewhere to make this syntax kosher
-    sed -i 's|{-1,-1,-1}|std::make_tuple(-1,-1,-1)|' lib/fab/inc/fab/types/shape.h
-    sed -i 's|{r,g,b}|std::make_tuple(r,g,b)|' lib/fab/src/types/shape.cpp
+    #sed -i 's|{-1,-1,-1}|std::make_tuple(-1,-1,-1)|' lib/fab/inc/fab/types/shape.h
+    #sed -i 's|{r,g,b}|std::make_tuple(r,g,b)|' lib/fab/src/types/shape.cpp
 }
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
     mkdir -p build
     cd build
-    qmake-qt5 PREFIX="/usr" ../sb.pro
-    sed -i 's|/local/bin|/bin|g' Makefile
-    make
+    cmake ../ -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+    ninja
 }
 
 check() {
-    cd "$srcdir/$pkgname-$pkgver"
-    mkdir -p tests
-    cd tests
-    qmake-qt5 PREFIX="/usr" ../lib/fab/fab-tests.pro
-    qmake-qt5 PREFIX="/usr" ../lib/graph/graph-tests.pro
-    make
+    cd "$srcdir/$pkgname-$pkgver/build"
+    lib/fab/SbFabTest
+    lib/graph/SbGraphTest
 }
 
 package() {
     cd "$srcdir/$pkgname-$pkgver/build"
-    make INSTALL_ROOT="$pkgdir" install
-    make INSTALL_ROOT="$pkgdir" install
-    install -Dm755 app/antimony "$pkgdir/usr/bin/antimony"
+    DESTDIR="$pkgdir" ninja install
+    install -Dm644 ../README.md "$pkgdir/usr/share/licenses/$pkgname/README"
 }
+