Can be compiled, installed, but cannot run.

3 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6839a55496c9..9ee484ca6e1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Nov 23 16:29:51 UTC 2016
 pkgbase = linuxcnc-sim
 	pkgdesc = It can interpret G-code and simulate a CNC machine (formerly EMC2).
-	pkgver = 20160419
+	pkgver = 20161117
 	pkgrel = 1
 	url = http://linuxcnc.org/
 	install = linuxcnc-sim.install
@@ -23,9 +25,11 @@ pkgbase = linuxcnc-sim
 	source = linuxcnc::git://git.linuxcnc.org/git/linuxcnc.git
 	source = boost.patch
 	source = image-to-gcode.patch
+	source = linuxcnc-sim.sh
 	md5sums = SKIP
 	md5sums = ba6948dc5dc155849f55039e454cdbd6
 	md5sums = c31d34a7ba567bd664f362a52f8bb03b
+	md5sums = 3fb3f231cfefdfe1fa4d600ecbf4a3cb
 
 pkgname = linuxcnc-sim
 
diff --git a/PKGBUILD b/PKGBUILD
index 999a5c810846..13dba3dfae75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Alec Ari <neotheuser@ymail.com>
 
 pkgname=linuxcnc-sim
-pkgver=20160527
+pkgver=20161117
 pkgrel=1
 pkgdesc="It can interpret G-code and simulate a CNC machine (formerly EMC2)."
 arch=('i686' 'x86_64')
@@ -11,11 +11,12 @@ url="http://linuxcnc.org/"
 depends=('bc' 'bwidget' 'tcl' 'tk' 'xorg-server' 'python2-libgnome' 'python2-imaging' 'tkimg' 'python2-gtkglext' 'tclx' 'boost' 'boost-libs')
 install=$pkgname.install
 _gitname='linuxcnc'
-source=($_gitname::'git://git.linuxcnc.org/git/linuxcnc.git' 'boost.patch' 'image-to-gcode.patch')
+source=($_gitname::'git://git.linuxcnc.org/git/linuxcnc.git' 'boost.patch' 'image-to-gcode.patch' 'linuxcnc-sim.sh')
 #source=($_gitname::'git://git.linuxcnc.org/git/linuxcnc.git#tag=739df958aca9d246daad36f439c82bfbeac681b9' 'boost.patch')
 md5sums=('SKIP'
         'ba6948dc5dc155849f55039e454cdbd6'
-        'c31d34a7ba567bd664f362a52f8bb03b')
+        'c31d34a7ba567bd664f362a52f8bb03b'
+        '3fb3f231cfefdfe1fa4d600ecbf4a3cb')
 makedepends=('git')
 PKGEXT='.pkg.tar'
 
@@ -25,7 +26,7 @@ pkgver() {
 }
 
 build () {
-  find . -iname fixpaths.py -o -iname checkglade|xargs perl -p -i -e "s/python/python2/"
+  find . -iname fixpaths.py -o -iname checkglade -o -iname update_ini|xargs perl -p -i -e "s/python/python2/"
   cd $srcdir/$_gitname/src
   pwd
   patch -p0 <../../image-to-gcode.patch
@@ -39,8 +40,8 @@ build () {
 #  patch -Np1 < $srcdir/jepler-modsilent.patch
 #  cd $srcdir/$pkgname-$pkgver/src
   ./autogen.sh
-  ./configure --enable-simulator --without-libmodbus --prefix=/usr --with-python=/usr/bin/python2.7 --enable-non-distributable=yes || return 1
-  make || return 1
+  ./configure --with-realtime=uspace --without-libmodbus --prefix=/usr --with-python=/usr/bin/python2.7 --enable-non-distributable=yes
+  make
 }
 
 package() {
@@ -52,5 +53,6 @@ package() {
   cp -PR $srcdir/linuxcnc/share/applications $pkgdir/usr/share/
   mkdir -p $pkgdir/etc/xdg
   cp -PR $srcdir/linuxcnc/share/menus $pkgdir/etc/xdg/
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh"
 }
 
diff --git a/linuxcnc-sim.sh b/linuxcnc-sim.sh
new file mode 100755
index 000000000000..95403833bf90
--- /dev/null
+++ b/linuxcnc-sim.sh
@@ -0,0 +1 @@
+export TCLLIBPATH=$TCLLIBPATH:/usr/lib/tcltk/linuxcnc