From cf388192d4596ffcb3f5ed89917604160150e9cf Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Wed, 20 Jan 2021 17:01:13 +0200 Subject: [PATCH] Use lordwelch fork --- .SRCINFO | 13 ++++++++----- PKGBUILD | 31 ++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 28714e8..733346b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,22 @@ pkgbase = comictagger pkgdesc = Application for writing metadata to digital comics, written in Python and PyQt - pkgver = 1.3.0.alpha.0 + pkgver = 1.1.31.rc1.r38.be698a1 pkgrel = 1 - url = https://github.com/comictagger/comictagger + url = https://github.com/lordwelch/comictagger/ arch = any license = Apache + makedepends = git makedepends = python-setuptools depends = python depends = python-beautifulsoup4 + depends = python-configparser depends = python-natsort - depends = python-pypdf2 + depends = python-pathvalidate depends = python-pillow - depends = python-pyqt5 + depends = python-requests depends = python-unrar-cffi - source = git+https://github.com/comictagger/comictagger.git#tag=1.3.0-alpha.0 + depends = python-pyqt5 + source = git+https://github.com/lordwelch/comictagger.git#commit=be698a17d68cb037e5874313f222b90b315918f1 sha256sums = SKIP pkgname = comictagger diff --git a/PKGBUILD b/PKGBUILD index 7d90f89..1057851 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,24 +1,32 @@ # Maintainer: loathingkernel pkgname=comictagger -_srctag=1.3.0-alpha.0 -pkgver=${_srctag//-/.} +pkgver=1.1.31.rc1.r38.be698a1 pkgrel=1 pkgdesc='Application for writing metadata to digital comics, written in Python and PyQt' arch=(any) -url='https://github.com/comictagger/comictagger' +url='https://github.com/lordwelch/comictagger/' license=(Apache) -makedepends=('python-setuptools') +makedepends=('git' 'python-setuptools') depends=('python' 'python-beautifulsoup4' + 'python-configparser' 'python-natsort' - 'python-pypdf2' + 'python-pathvalidate' 'python-pillow' + 'python-requests' + 'python-unrar-cffi' 'python-pyqt5' - 'python-unrar-cffi') -source=(git+https://github.com/comictagger/comictagger.git#tag=$_srctag) +) +_commit=be698a17d68cb037e5874313f222b90b315918f1 +source=(git+https://github.com/lordwelch/comictagger.git#commit=$_commit) sha256sums=('SKIP') +pkgver() { + cd comictagger + printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" +} + build() { cd comictagger python setup.py build @@ -27,4 +35,13 @@ build() { package() { cd comictagger python setup.py install --root="$pkgdir" --optimize=1 --skip-build + + sed -e 's|/usr/local/share/comictagger/app.png|/usr/share/icons/comictagger.png|g' \ + -e 's|%%CTSCRIPT%% %F|/usr/bin/comictagger|g' \ + -i desktop-integration/linux/ComicTagger.desktop + + install -Dm644 desktop-integration/linux/ComicTagger.desktop \ + "$pkgdir"/usr/share/applications/comictagger.desktop + install -Dm644 comictaggerlib/graphics/app.png \ + "$pkgdir"/usr/share/icons/comictagger.png }