From e5fdc88e9cdaecffe5f928dac262c0ce0572e546 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 19 Jan 2020 11:31:22 +0100 Subject: [PATCH] bcnc: update to 0.9.14.303. --- srcpkgs/bcnc/files/bcnc.desktop | 9 -------- srcpkgs/bcnc/patches/python2.patch | 15 ------------- srcpkgs/bcnc/template | 34 ++++++++++++------------------ 3 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/bcnc/files/bcnc.desktop delete mode 100644 srcpkgs/bcnc/patches/python2.patch diff --git a/srcpkgs/bcnc/files/bcnc.desktop b/srcpkgs/bcnc/files/bcnc.desktop deleted file mode 100644 index 1cfd9ba08b1..00000000000 --- a/srcpkgs/bcnc/files/bcnc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Categories=Development -Name=bCNC -Comment=GRBL CNC command sender, autoleveler and g-code editor -Exec=bCNC -Icon=bcnc.png -StartupNotify=false -Terminal=false diff --git a/srcpkgs/bcnc/patches/python2.patch b/srcpkgs/bcnc/patches/python2.patch deleted file mode 100644 index 3bdbfc77239..00000000000 --- a/srcpkgs/bcnc/patches/python2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bCNC 2017-10-02 14:07:33.000000000 +0200 -+++ bCNC 2018-03-14 01:20:39.731648471 +0100 -@@ -1,10 +1,10 @@ - #!/usr/bin/env sh - --DIR=`dirname $0` -+DIR="$(dirname "$(readlink -f "$0")")" - PYTHONPATH=${DIR}:${DIR}/lib:${DIR}/plugins - export DIR PYTHONPATH - if [ .$PYTHON = . ]; then - PYTHON=python - fi --${PYTHON} ${DIR}/bCNC.py $* -+python2 ${DIR}/bCNC.py $* - #python -m cProfile -o bCNC.out ${DIR}/bCNC.py $* diff --git a/srcpkgs/bcnc/template b/srcpkgs/bcnc/template index f1250272318..d3aecaba97c 100644 --- a/srcpkgs/bcnc/template +++ b/srcpkgs/bcnc/template @@ -1,31 +1,23 @@ # Template file for 'bcnc' pkgname=bcnc -version=0.9.11 +version=0.9.14.303 revision=1 -wrksrc=bCNC-$version -hostmakedepends="python" -depends="python-pyserial python-Pillow python-tkinter" archs=noarch +wrksrc=bCNC-$version +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy libopencv-python3 python3-scipy" short_desc="GRBL CNC command sender, autoleveler and g-code editor" maintainer="Urs Schulz " license="GPL-2" homepage="https://github.com/vlachoudis/bCNC" -distfiles="https://github.com/vlachoudis/bCNC/archive/0.9.11.tar.gz" -checksum=832cad8d64e8ff8fec8cb861a5c98fa8167f9522ef102c7d79a32ed67b3c3f00 - - -do_build() { - python2 -O -m py_compile *.py -} - - -do_install() { - vinstall "${FILESDIR}"/bcnc.desktop 644 usr/share/applications/ - vinstall bCNC.png 644 usr/share/pixmaps/ bcnc.png +distfiles="${PYPI_SITE}/b/bCNC/bCNC-${version}.tar.gz" +checksum=2df238989184179726870559f0531aea1e85ae9369d194bf8dba3638107671d7 - vmkdir usr/lib/ - vcopy . usr/lib/bcnc - vmkdir usr/bin - ln -s ../lib/bcnc/bCNC "$DESTDIR"/usr/bin/bCNC - ln -s ../lib/bcnc/bCNC "$DESTDIR"/usr/bin/bcnc +post_install() { + vmkdir usr/share/applications + vmkdir usr/share/pixmaps + ln -s "${py3_sitelib}/bCNC/bCNC.desktop" "${DESTDIR}/usr/share/applications/" + ln -s "${py3_sitelib}/bCNC/bCNC.png" "${DESTDIR}/usr/share/pixmaps/" + ln -s "bCNC" "${DESTDIR}/usr/bin/bcnc" }