summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD27
3 files changed, 17 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5531cf61ac8..416229f1bd3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
pkgbase = camotics-git
pkgdesc = 3-axis NC machining simulation software
- pkgver = r829.a1bc453
+ pkgver = r1012.8a867d3
pkgrel = 1
url = http://camotics.org/
arch = x86_64
license = GPL2
makedepends = git
makedepends = scons
- makedepends = python2-six
+ makedepends = python-six
makedepends = qt5-tools
makedepends = cbang-git
- depends = v8-6.8
+ depends = v8-r
depends = qt5-websockets
depends = cairo
depends = desktop-file-utils
provides = camotics
conflicts = camotics
- source = camotics::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git
+ options = !lto
+ source = camotics::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git#commit=master
sha256sums = SKIP
pkgname = camotics-git
-
diff --git a/.gitignore b/.gitignore
index 018a3de08144..7735b4612827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
!PKGBUILD
!.SRCINFO
!.gitignore
+!*.patch
diff --git a/PKGBUILD b/PKGBUILD
index 558240bd62fc..513150d1531a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Paul Hentschel <aur at hpminc dot com>
pkgname=camotics-git
-pkgver=r829.a1bc453
+pkgver=r1012.8a867d3
pkgrel=1
pkgdesc="3-axis NC machining simulation software"
arch=('x86_64')
url="http://camotics.org/"
license=('GPL2')
depends=(
- 'v8-6.8'
+ 'v8-r'
'qt5-websockets'
'cairo'
'desktop-file-utils'
@@ -16,16 +16,18 @@ depends=(
makedepends=(
'git'
'scons'
- 'python2-six'
+ 'python-six'
'qt5-tools'
'cbang-git'
)
provides=('camotics')
conflicts=('camotics')
+_commit="master"
source=(
- "${pkgname%-*}::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git"
+ "${pkgname%-*}::git+https://github.com/CauldronDevelopmentLLC/CAMotics.git#commit=$_commit"
)
sha256sums=('SKIP')
+options=('!lto')
pkgver() {
cd "${pkgname%-*}"
@@ -34,22 +36,15 @@ pkgver() {
build() {
cd "${pkgname%-*}"
- CBANG_HOME=/opt/cbang scons linkflags=$LDFLAGS
+ mkdir -p build
+ CBANG_HOME=/opt/cbang scons cxxstd="c++17" linkflags=$LDFLAGS
}
package() {
cd "${pkgname%-*}"
- CBANG_HOME=/opt/cbang scons install install_prefix="$pkgdir/usr" linkflags=$LDFLAGS
-
- install -d "$pkgdir/usr/share/${pkgname%-*}"/tpl_lib
- cp -a tpl_lib/ "$pkgdir/usr/share/${pkgname%-*}"
- install -Dm644 -t "$pkgdir"/usr/share/applications CAMotics.desktop
- install -Dm644 -t "$pkgdir"/usr/share/pixmaps images/camotics.png
- install -Dm644 -t "$pkgdir/usr/share/doc/${pkgname%-*}" README.md CHANGELOG.md COPYING LICENSE
-
- # install examples and machines
- install -d "$pkgdir/usr/share/doc/${pkgname%-*}"/{examples,machines}
- cp -a {examples/,machines/} "$pkgdir/usr/share/doc/${pkgname%-*}"
+ CBANG_HOME=/opt/cbang scons install cxxstd="c++17" install_prefix="$pkgdir/usr"
+ local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+ install build/camotics.so -D "$pkgdir/$site_packages/camotics.so"
}
# vim:set ts=2 sw=2 et: