diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | boost.patch | 11 | ||||
| -rw-r--r-- | image-to-gcode.patch | 11 |
4 files changed, 27 insertions, 57 deletions
@@ -1,35 +1,38 @@ pkgbase = linuxcnc-sim pkgdesc = It can interpret G-code and simulate a CNC machine (formerly EMC2). - pkgver = 2.7.14 - pkgrel = 1 + pkgver = 2.7.15 + pkgrel = 8 url = http://linuxcnc.org/ install = linuxcnc-sim.install arch = i686 arch = x86_64 - license = GPL2 + license = custom: unredestributable makedepends = git + makedepends = intltool depends = bc depends = bwidget depends = tcl depends = tk depends = xorg-server - depends = python2-imaging + depends = python2-pillow depends = tkimg depends = python2-gtkglext depends = tclx depends = boost depends = boost-libs depends = libtirpc - source = linuxcnc::git://github.com/LinuxCNC/linuxcnc.git#tag=v2.7.14 - source = boost.patch - source = image-to-gcode.patch + depends = procps-ng + depends = psmisc + depends = python2-yapps2 + depends = python2-gobject2 + depends = boost-python2 + depends = boost-python2-libs + depends = libusb + source = linuxcnc::git+https://github.com/LinuxCNC/linuxcnc.git#tag=v2.7.15 source = linuxcnc-sim.sh source = libtirpc.patch md5sums = SKIP - md5sums = ba6948dc5dc155849f55039e454cdbd6 - md5sums = c31d34a7ba567bd664f362a52f8bb03b md5sums = 3fb3f231cfefdfe1fa4d600ecbf4a3cb md5sums = 42770a1aa791172358700e4d5af335ed pkgname = linuxcnc-sim - @@ -1,25 +1,26 @@ # Maintainer: Peter Ivanov <ivanovp@gmail.com> # Contributor: Alec Ari <neotheuser@ymail.com> +# +# Note: if configure script complains about missing 'bwidget' execute: +# sudo chmod -R o+rX /usr/lib/tcl8.6/bwidget-1.9.16 pkgname=linuxcnc-sim -pkgver=2.7.14 -pkgrel=1 +pkgver=2.7.15 +pkgrel=8 pkgdesc="It can interpret G-code and simulate a CNC machine (formerly EMC2)." arch=('i686' 'x86_64') -license=('GPL2') +license=('custom: unredestributable') url="http://linuxcnc.org/" -depends=('bc' 'bwidget' 'tcl' 'tk' 'xorg-server' 'python2-imaging' 'tkimg' 'python2-gtkglext' 'tclx' 'boost' 'boost-libs' 'libtirpc') +depends=('bc' 'bwidget' 'tcl' 'tk' 'xorg-server' 'python2-pillow' 'tkimg' 'python2-gtkglext' 'tclx' 'boost' 'boost-libs' 'libtirpc' 'procps-ng' 'psmisc' 'python2-yapps2' 'python2-gobject2' 'boost-python2' 'boost-python2-libs' 'libusb') install=$pkgname.install _gitname='linuxcnc' -source=($_gitname::"git://github.com/LinuxCNC/linuxcnc.git#tag=v$pkgver" 'boost.patch' 'image-to-gcode.patch' 'linuxcnc-sim.sh' 'libtirpc.patch') +source=($_gitname::"git+https://github.com/LinuxCNC/linuxcnc.git#tag=v$pkgver" 'linuxcnc-sim.sh' 'libtirpc.patch') #source=($_gitname::'git://git.linuxcnc.org/git/linuxcnc.git#tag=739df958aca9d246daad36f439c82bfbeac681b9' 'boost.patch') md5sums=('SKIP' - 'ba6948dc5dc155849f55039e454cdbd6' - 'c31d34a7ba567bd664f362a52f8bb03b' '3fb3f231cfefdfe1fa4d600ecbf4a3cb' '42770a1aa791172358700e4d5af335ed') -makedepends=('git') -PKGEXT='.pkg.tar' +makedepends=('git' 'intltool') +#PKGEXT='.pkg.tar' #pkgver() { # cd "$srcdir/$_gitname" @@ -27,28 +28,15 @@ PKGEXT='.pkg.tar' #} build () { - find . -iname fixpaths.py -o -iname checkglade -o -iname update_ini|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 -# patch -p0 <../../image-to-gcode.patch -# patch -p1 <../../boost.patch -# #This Makefile line fixes a seg fault due to changed CFLAGS -# cp -PR $srcdir/Makefile $srcdir/$pkgname-$pkgver/src/Makefile -# #This fixes build for updated Python libraries -# cp -PR $srcdir/Submakefile $srcdir/$pkgname-$pkgver/src/hal/drivers/Submakefile -# #Another Python fix -# cd $srcdir/$pkgname-$pkgver -# patch -Np1 < $srcdir/jepler-modsilent.patch patch -Np2 -i $srcdir/libtirpc.patch -# cd $srcdir/$pkgname-$pkgver/src -# CFLAGS+=" -I/usr/include/tirpc/" - CXXFLAGS+=" -I/usr/include/tirpc/" - CPPFLAGS+=" -I/usr/include/tirpc/" - INCLUDE+=" -I/usr/include/tirpc/" - LDFLAGS+=" -ltirpc" ./autogen.sh ./configure --with-realtime=uspace --without-libmodbus --prefix=/usr --with-python=/usr/bin/python2.7 --enable-non-distributable=yes + + sed -i "s/^char FileName\[500\];$/static char FileName[500];/" hal/classicladder/files_project.c make } @@ -64,5 +52,6 @@ package() { # mv -v $pkgdir/usr/share/man/man9/abs.9.gz $pkgdir/usr/share/man/man9/linuxcnc_abs.9.gz cp -PR $srcdir/linuxcnc/share/menus $pkgdir/etc/xdg/ install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh" + install -D -m644 "${srcdir}/linuxcnc/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/boost.patch b/boost.patch deleted file mode 100644 index e7d1b2aceb99..000000000000 --- a/boost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./emc/rs274ngc/rs274ngc_pre.cc 2014-10-22 06:40:15.674483981 +0200 -+++ ./emc/rs274ngc/rs274ngc_pre.cc 2014-10-22 06:40:30.550990352 +0200 -@@ -129,7 +129,7 @@ - // since interp.init() may be called repeatedly this would create a new - // wrapper instance on every init(), abandoning the old one and all user attributes - // tacked onto it, so make sure this is done exactly once -- _setup.pythis = boost::python::object(boost::cref(this)); -+ _setup.pythis = boost::python::object(boost::cref(*this)); - - // alias to 'interpreter.this' for the sake of ';py, .... ' comments - // besides 'this', eventually use proper instance names to handle diff --git a/image-to-gcode.patch b/image-to-gcode.patch deleted file mode 100644 index 95f4607328d0..000000000000 --- a/image-to-gcode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- image-to-gcode 2016-04-23 08:02:14.000000000 +0200 -+++ emc/usr_intf/axis/scripts/image-to-gcode.py 2016-04-23 08:00:16.004178946 +0200 -@@ -23,7 +23,7 @@ - import gettext; - gettext.install("linuxcnc", localedir=os.path.join(BASE, "share", "locale"), unicode=True) - --import Image -+from PIL import Image - - try: - import numpy.numarray as numarray |