* [PR PATCH] bcnc: update to 0.9.14.303.
@ 2020-01-19 11:23 voidlinux-github
2020-01-19 11:42 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-19 14:02 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 2 replies; 3+ messages in thread
From: voidlinux-github @ 2020-01-19 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
There is a new pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages bcnc
https://github.com/void-linux/void-packages/pull/18393
bcnc: update to 0.9.14.303.
A patch file from https://github.com/void-linux/void-packages/pull/18393.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bcnc-18393.patch --]
[-- Type: text/x-diff, Size: 3225 bytes --]
From e5fdc88e9cdaecffe5f928dac262c0ce0572e546 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 <voidpkgs@ursschulz.de>"
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"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] bcnc: update to 0.9.14.303.
2020-01-19 11:23 [PR PATCH] bcnc: update to 0.9.14.303 voidlinux-github
@ 2020-01-19 11:42 ` voidlinux-github
2020-01-19 14:02 ` [PR PATCH] [Merged]: " voidlinux-github
1 sibling, 0 replies; 3+ messages in thread
From: voidlinux-github @ 2020-01-19 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
There is an updated pull request by faulesocke against master on the void-packages repository
https://github.com/faulesocke/void-packages bcnc
https://github.com/void-linux/void-packages/pull/18393
bcnc: update to 0.9.14.303.
A patch file from https://github.com/void-linux/void-packages/pull/18393.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bcnc-18393.patch --]
[-- Type: text/x-diff, Size: 3249 bytes --]
From 369fb2578f01708fc0ec13789a86d8ef3f9faf17 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
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 | 36 ++++++++++++------------------
3 files changed, 14 insertions(+), 46 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..bd573f4b199 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 <voidpkgs@ursschulz.de>"
-license="GPL-2"
+license="GPL-2.0-only"
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"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: bcnc: update to 0.9.14.303.
2020-01-19 11:23 [PR PATCH] bcnc: update to 0.9.14.303 voidlinux-github
2020-01-19 11:42 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-19 14:02 ` voidlinux-github
1 sibling, 0 replies; 3+ messages in thread
From: voidlinux-github @ 2020-01-19 14:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
There's a merged pull request on the void-packages repository
bcnc: update to 0.9.14.303.
https://github.com/void-linux/void-packages/pull/18393
Description:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-19 14:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-19 11:23 [PR PATCH] bcnc: update to 0.9.14.303 voidlinux-github
2020-01-19 11:42 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-19 14:02 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).