v2.9.1

1 files changed, 32 insertions, 35 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0d994f53cc2b..33b4117cf5f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,26 @@
-# Maintainer:  Jason Kercher <jkercher43 a gmail>
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Jason Kercher <jkercher43 a gmail>
 # Contributor: Peter Ivanov <ivanovp@gmail.com>
 # Contributor: Alec Ari <neotheuser@ymail.com>
 
 pkgname=linuxcnc
-pkgver=2.8.4
+pkgver=2.9.1
 pkgrel=1
 pkgdesc="Controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more (formerly EMC2)"
-arch=('i686' 'x86_64')
-license=('GPL2')
+arch=(x86_64)
+license=(GPL2 'custom: unredestributable')
 url="http://linuxcnc.org"
-depends=('bc'
-         'bwidget'
-         'libxaw'
-         'boost-python2'
-         'python2-gobject'
-         'python2-imaging'
-         'python2-yapps2'
-         'tkimg'
-         'python2-gtkglext'
-         'tclx'
-         'xorg-server'
-         'boost'
-         'procps-ng'
-         'psmisc')
-makedepends=('intltool')
-conflicts=('linuxcnc-git' 'linuxcnc-bin')
-
+depends=(glibc python gtk3 libusb libxss python-cairo gobject-introspection-runtime dbus-python python-pillow libxmu
+         python-gobject tk python-matplotlib boost-libs python-numpy gstreamer at-spi2-core libepoxy libtirpc libxft
+         harfbuzz gcc-libs fontconfig gdk-pixbuf2 libxext librsvg glib2 zlib cairo readline systemd-libs freetype2
+         libx11 libxinerama python-configobj libgpiod  python-yapps2 tcl pango)
+makedepends=(intltool boost asciidoc glu procps-ng psmisc bwidget tclx)
+options=(!emptydirs)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LinuxCNC/linuxcnc/archive/refs/tags/v${pkgver}.tar.gz"
+        'unredestributable.txt'
         'libtirpc.patch')
-sha256sums=('d2c6950e011e462fdc50cc60d728bf3596d9ff1e0493fe0a174dd8724ab318c3'
+sha256sums=('e9cf46c9a29bd1f93628bae5d554dbb19be84a4e0752e205fd259cb0de3453a3'
+            '228a035c143ccbdd6056e1189267b034f046742cae034bff821eccc8dbc68ee3'
             'bc95bafd67fad1c1d3722261bc586cdc612ec9e1597fadb95fa825c10550ac2c')
 
 prepare() {
@@ -37,15 +29,20 @@ prepare() {
   find . -iname fixpaths.py -o -iname checkglade -o \
    -iname update_ini | xargs perl -p -i -e "s/python/python2/"
   patch -Np2 -i $srcdir/libtirpc.patch
+
   ./autogen.sh
-  ./configure --with-realtime=uspace \
-   --without-libmodbus --prefix=/usr \
-   --with-python=/usr/bin/python2.7 \
-   --enable-non-distributable=yes
+
+  ./configure \
+    --prefix=/usr \
+    --enable-non-distributable=yes \
+    --with-realtime=uspace \
+    --without-libmodbus \
+    --disable-gtk2
+
   # Linking time errors fix
-  sed -i "163s|FileName|FileNameArr|" hal/classicladder/files_project.c
-  sed -i "174s|FileName|FileNameArr|g" hal/classicladder/files_project.c
-  sed -i "175s|FileName|FileNameArr|" hal/classicladder/files_project.c
+  #sed -i "163s|FileName|FileNameArr|" hal/classicladder/files_project.c
+  #sed -i "174s|FileName|FileNameArr|g" hal/classicladder/files_project.c
+  #sed -i "175s|FileName|FileNameArr|" hal/classicladder/files_project.c
 }
 
 build () {
@@ -55,13 +52,13 @@ build () {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
-  DESTDIR=${pkgdir} make install 
+  DESTDIR=${pkgdir} make install
   cp -PR "${srcdir}/${pkgname}-${pkgver}/share/applications" $pkgdir/usr/share
   mkdir -p "${pkgdir}/etc/xdg"
   cp -PR "${srcdir}/${pkgname}-${pkgver}/share/menus" "${pkgdir}/etc/xdg/"
-  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/src/${pkgname}.sh" \
-   "${pkgdir}/etc/profile.d/${pkgname}.sh"
-  sed -i "s|${srcdir}||" "${pkgdir}/usr/include/linuxcnc/config.h"
-  sed -i "s|${srcdir}||" "${pkgdir}/usr/share/linuxcnc/Makefile.modinc"
-  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/src/linuxcnc.sh" -t "${pkgdir}/etc/profile.d/"
+  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/src/${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh"
+  #sed -i "s|${srcdir}||" "${pkgdir}/usr/include/linuxcnc/config.h"
+  #sed -i "s|${srcdir}||" "${pkgdir}/usr/share/linuxcnc/Makefile.modinc"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/src/linuxcnc.sh" -t "${pkgdir}/etc/profile.d/"
+  install -D -t "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/unredestributable.txt"
 }