Updated to version 1.2.0 and Qt5

4 files changed, 54 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e266de874a75..1380a4fbfaaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,20 @@
-# Generated by mksrcinfo v8
-# Thu Feb  9 01:09:37 UTC 2017
 pkgbase = camotics
 	pkgdesc = 3-axis NC machining simulation software
-	pkgver = 1.1.0
+	pkgver = 1.2.0
 	pkgrel = 1
-	url = http://camotics.org/
-	arch = i686
+	url = https://camotics.org/
 	arch = x86_64
 	license = GPL2
-	makedepends = boost
-	makedepends = cbang-git
-	makedepends = chakracore-cauldron-git
 	makedepends = scons
-	depends = bzip2
+	makedepends = python2-six
+	makedepends = qt5-tools
+	makedepends = cbang>=1.3.1
+	depends = v8-3.14
+	depends = qt5-websockets
 	depends = cairo
-	depends = expat
-	depends = glu
-	depends = libffi
-	depends = libgl
-	depends = libmariadbclient
-	depends = libunwind
-	depends = openssl
-	depends = qt4
-	depends = sqlite
-	depends = zlib
-	provides = camotics
-	replaces = openscam
-	source = https://github.com/CauldronDevelopmentLLC/camotics/archive/v1.1.0.tar.gz
-	source = camotics.desktop
-	md5sums = fdb06d795a54be5deb15f5341275f25f
-	md5sums = bca9df64570c6c6e6773e8428e27cfb8
+	depends = desktop-file-utils
+	source = camotics-1.2.0.tar.gz::https://github.com/CauldronDevelopmentLLC/camotics/archive/v1.2.0.tar.gz
+	sha256sums = f5203d2bbd32c4e347a8f79122e57b2deea68e6c5bd4f0be4087c4d62a31c8a4
 
 pkgname = camotics
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 2b2fff89d33d..0f6ade4a219e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,52 @@
-# Maintainer: Justin R. St-Amant <jstamant24 at gmail dot  com>
+# Maintainer: Paul Hentschel (hpmachining) <aur at hpminc dot com>
+# Contributor: Justin R. St-Amant <jstamant24 at gmail dot  com>
+
 pkgname=camotics
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="3-axis NC machining simulation software"
-arch=('i686' 'x86_64')
-url="http://camotics.org/"
+arch=('x86_64')
+url="https://camotics.org/"
 license=('GPL2')
-depends=('bzip2'
-         'cairo'
-         'expat'
-         'glu'
-         'libffi'
-         'libgl'
-         'libmariadbclient'
-         'libunwind'
-         'openssl'
-         'qt4'
-         'sqlite'
-         'zlib')
-makedepends=('boost' 'cbang-git' 'chakracore-cauldron-git' 'scons')
-provides=('camotics')
-replaces=('openscam')
-source=("https://github.com/CauldronDevelopmentLLC/$pkgname/archive/v$pkgver.tar.gz"
-        "camotics.desktop")
-md5sums=('fdb06d795a54be5deb15f5341275f25f'
-         'bca9df64570c6c6e6773e8428e27cfb8')
+depends=(
+  'v8-3.14'
+  'qt5-websockets'
+  'cairo'
+  'desktop-file-utils'
+)
+makedepends=(
+  'scons'
+  'python2-six'
+  'qt5-tools'
+  'cbang>=1.3.1'
+)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/CauldronDevelopmentLLC/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('f5203d2bbd32c4e347a8f79122e57b2deea68e6c5bd4f0be4087c4d62a31c8a4')
+
 prepare() {
-  cd "$srcdir"
-  mv "CAMotics-$pkgver" "$pkgname"
+  cd "CAMotics-$pkgver"
+  sed -i '24 a env.Append( LINKFLAGS = os.environ.get("LDFLAGS"))' SConstruct
 }
 
 build() {
-  cd "$srcdir/$pkgname"
-  export CHAKRA_CORE_HOME=/opt/chakracore-cauldron-git
-  export CBANG_HOME=/opt/cbang-git
-  scons qt_version=4
+  cd "CAMotics-$pkgver"
+  CBANG_HOME=/opt/cbang scons
 }
 
 package() {
-  cd "$srcdir"
-  install -Dm644 "camotics.desktop" \
-          "$pkgdir/usr/share/applications/camotics.desktop"
-  cd "$srcdir/$pkgname"
-  install -Dm644 "images/camotics.png" "$pkgdir/usr/share/pixmaps/camotics.png"
-  scons install compiler=gnu install_prefix="$pkgdir/usr" qt_version=4
+  cd "CAMotics-$pkgver"
+  CBANG_HOME=/opt/cbang scons install install_prefix="$pkgdir/usr"
+
+  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/ "$pkgdir/usr/share/doc/$pkgname"
+  cp -a machines/ "$pkgdir/usr/share/doc/$pkgname"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/camotics.desktop b/camotics.desktop
deleted file mode 100644
index cb195aad5d6a..000000000000
--- a/camotics.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=CAMotics
-Comment=3-axis NC machining simulation software
-Exec=camotics
-Icon=camotics
-Terminal=false
-StartupNotify=false
-Categories=Application;Education;Engineering;