From a464c0aa9f578682d2b3d2b64160ed72d404052f Mon Sep 17 00:00:00 2001 From: Frank Tornack Date: Thu, 14 Apr 2022 17:46:36 +0200 Subject: [PATCH 1/6] add missing i18njs --- PKGBUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 799d083..0b1da45 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,9 +10,9 @@ license=('GPL3') depends=('python' 'bluez' 'bluez-utils' 'python-bleak') makedepends=('git') provides=("cat-printer=${pkgver}") -source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git") -md5sums=('SKIP') -sha256sums=('SKIP') +source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git" "i18njs4$pkgname::git+https://github.com/roddeh/i18njs.git") +md5sums=('SKIP' 'SKIP') +sha256sums=('SKIP' 'SKIP') options=(!strip emptydirs) pkgver() { cd "$pkgname" @@ -22,10 +22,12 @@ package() { mkdir -p "$pkgdir/usr/bin" mkdir -p "$pkgdir/usr/share/cat-printer" cp -r "$srcdir/cat-printer-git"/* "$pkgdir/usr/share/cat-printer/" + cp -r "$srcdir/i18njs4cat-printer-git/dist/i18n.js" "$pkgdir/usr/share/cat-printer/www/i18n.js" rm -rf "$pkgdir/usr/share/cat-printer/build-"* rm -rf "$pkgdir/usr/share/cat-printer/dev-diary.txt" rm -rf "$pkgdir/usr/share/cat-printer/TODO" rm -rf "$pkgdir/usr/share/cat-printer/systemd" + mkdir -p "$pkgdir/usr/lib/systemd/system/" install -m644 "$srcdir/cat-printer-git/systemd/cat-printer.service" "$pkgdir/usr/lib/systemd/system/" cat < "$pkgdir/usr/bin/cat-printer" #!/bin/sh From 3356b9f01954a79cacaca01e29f5333de95a0707 Mon Sep 17 00:00:00 2001 From: Frank Tornack Date: Thu, 14 Apr 2022 17:50:11 +0200 Subject: [PATCH 2/6] fix License for i18njs4 --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 0b1da45..8300d88 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="A project that provides support to some Bluetooth Cat Printer models, on many platforms!" arch=('any') url="https://github.com/NaitLee/Cat-Printer" -license=('GPL3') +license=('GPL3' 'MIT') depends=('python' 'bluez' 'bluez-utils' 'python-bleak') makedepends=('git') provides=("cat-printer=${pkgver}") From a73871f094abdce84fc8e756711f35557181738c Mon Sep 17 00:00:00 2001 From: Frank Tornack Date: Thu, 14 Apr 2022 18:01:36 +0200 Subject: [PATCH 3/6] fixed missing font This solves the problem but is not a permanent solution. --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index 8300d88..68289ad 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,6 +23,7 @@ package() { mkdir -p "$pkgdir/usr/share/cat-printer" cp -r "$srcdir/cat-printer-git"/* "$pkgdir/usr/share/cat-printer/" cp -r "$srcdir/i18njs4cat-printer-git/dist/i18n.js" "$pkgdir/usr/share/cat-printer/www/i18n.js" + ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2" rm -rf "$pkgdir/usr/share/cat-printer/build-"* rm -rf "$pkgdir/usr/share/cat-printer/dev-diary.txt" rm -rf "$pkgdir/usr/share/cat-printer/TODO" From 11b2294eba3195097bb82e3166f8afdf63c9988e Mon Sep 17 00:00:00 2001 From: Frank Tornack Date: Sun, 17 Apr 2022 22:39:57 +0200 Subject: [PATCH 4/6] remove i18n git --- PKGBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 68289ad..e48c3b8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,13 +6,13 @@ pkgrel=1 pkgdesc="A project that provides support to some Bluetooth Cat Printer models, on many platforms!" arch=('any') url="https://github.com/NaitLee/Cat-Printer" -license=('GPL3' 'MIT') +license=('GPL3') depends=('python' 'bluez' 'bluez-utils' 'python-bleak') makedepends=('git') provides=("cat-printer=${pkgver}") -source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git" "i18njs4$pkgname::git+https://github.com/roddeh/i18njs.git") -md5sums=('SKIP' 'SKIP') -sha256sums=('SKIP' 'SKIP') +source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git") +md5sums=('SKIP') +sha256sums=('SKIP') options=(!strip emptydirs) pkgver() { cd "$pkgname" @@ -22,7 +22,6 @@ package() { mkdir -p "$pkgdir/usr/bin" mkdir -p "$pkgdir/usr/share/cat-printer" cp -r "$srcdir/cat-printer-git"/* "$pkgdir/usr/share/cat-printer/" - cp -r "$srcdir/i18njs4cat-printer-git/dist/i18n.js" "$pkgdir/usr/share/cat-printer/www/i18n.js" ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2" rm -rf "$pkgdir/usr/share/cat-printer/build-"* rm -rf "$pkgdir/usr/share/cat-printer/dev-diary.txt" From 9bda1ff934b381c3506181ea62c491bfde2ab4cb Mon Sep 17 00:00:00 2001 From: Frank Tornack Date: Sun, 17 Apr 2022 22:42:13 +0200 Subject: [PATCH 5/6] remove copy of files --- PKGBUILD | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e48c3b8..5e975f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,12 +21,7 @@ pkgver() { package() { mkdir -p "$pkgdir/usr/bin" mkdir -p "$pkgdir/usr/share/cat-printer" - cp -r "$srcdir/cat-printer-git"/* "$pkgdir/usr/share/cat-printer/" ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2" - rm -rf "$pkgdir/usr/share/cat-printer/build-"* - rm -rf "$pkgdir/usr/share/cat-printer/dev-diary.txt" - rm -rf "$pkgdir/usr/share/cat-printer/TODO" - rm -rf "$pkgdir/usr/share/cat-printer/systemd" mkdir -p "$pkgdir/usr/lib/systemd/system/" install -m644 "$srcdir/cat-printer-git/systemd/cat-printer.service" "$pkgdir/usr/lib/systemd/system/" cat < "$pkgdir/usr/bin/cat-printer" @@ -41,4 +36,5 @@ cd /usr/share/cat-printer python3 server.py "\$@" EOF chmod +x "$pkgdir/usr/bin/cat-printer-server" + chmod +x "$pkgdir/usr/bin/cat-printer" } From 40196e5e5172f13072fbbbe97417a44d57a7dc72 Mon Sep 17 00:00:00 2001 From: Frank Tornack Date: Sun, 17 Apr 2022 23:05:40 +0200 Subject: [PATCH 6/6] use bundle.py now --- PKGBUILD | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5e975f4..13ebcce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,8 +7,8 @@ pkgdesc="A project that provides support to some Bluetooth Cat Printer models, o arch=('any') url="https://github.com/NaitLee/Cat-Printer" license=('GPL3') -depends=('python' 'bluez' 'bluez-utils' 'python-bleak') -makedepends=('git') +depends=('python' 'bluez' 'bluez-utils' 'python-bleak' 'ghostscript') +makedepends=('git' 'unzip') provides=("cat-printer=${pkgver}") source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git") md5sums=('SKIP') @@ -18,11 +18,17 @@ pkgver() { cd "$pkgname" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +build() { + cd "$pkgname/build-common" + for i in $(find | grep -E '.*\.pyc'); do rm $i; done + python3 bundle.py -b "$pkgver" +} package() { mkdir -p "$pkgdir/usr/bin" - mkdir -p "$pkgdir/usr/share/cat-printer" - ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2" + mkdir -p "$pkgdir/usr/share/" mkdir -p "$pkgdir/usr/lib/systemd/system/" + unzip "$srcdir/cat-printer-git/cat-printer-bare-$pkgver.zip" -d "$pkgdir/usr/share/" + ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2" install -m644 "$srcdir/cat-printer-git/systemd/cat-printer.service" "$pkgdir/usr/lib/systemd/system/" cat < "$pkgdir/usr/bin/cat-printer" #!/bin/sh