From 6f9728f6e23832f326faa8760631c6e68ea9c2e6 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Sat, 16 Apr 2022 14:49:23 +0300 Subject: [PATCH] Fix make dependencies --- .SRCINFO | 8 ++++++-- PKGBUILD | 32 ++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dcf72e4..2719afd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,15 @@ pkgbase = comictagger pkgdesc = Application for writing metadata to digital comics, written in Python and PyQt pkgver = 1.3.2.alpha.4 - pkgrel = 1 + pkgrel = 2 url = https://github.com/comictagger/comictagger arch = any license = Apache + makedepends = python-build + makedepends = python-installer + makedepends = python-setuptools-scm + makedepends = python-wheel makedepends = git - makedepends = python-setuptools depends = python depends = python-beautifulsoup4 depends = python-natsort @@ -17,6 +20,7 @@ pkgbase = comictagger depends = python-unrar-cffi depends = python-pyqt5 depends = python-pybcj + depends = python-brotli source = git+https://github.com/comictagger/comictagger.git#tag=1.3.2-alpha.4 sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 41351ef..49e808d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,23 +2,27 @@ pkgname=comictagger pkgver=1.3.2.alpha.4 -pkgrel=1 +pkgrel=2 pkgdesc='Application for writing metadata to digital comics, written in Python and PyQt' arch=(any) url='https://github.com/comictagger/comictagger' license=(Apache) -makedepends=('git' 'python-setuptools') -depends=('python' - 'python-beautifulsoup4' - 'python-natsort' - 'python-pillow' - 'python-requests' - 'python-pycountry' - 'python-py7zr' - 'python-unrar-cffi' - 'python-pyqt5' - 'python-pybcj' +depends=(python + python-beautifulsoup4 + python-natsort + python-pillow + python-requests + python-pycountry + python-py7zr + python-unrar-cffi + python-pyqt5 + python-pybcj + python-brotli ) +makedepends=(python-{build,installer} + python-setuptools-scm + python-wheel) +makedepends+=(git) _tag=1.3.2-alpha.4 source=(git+https://github.com/comictagger/comictagger.git#tag=$_tag) sha256sums=('SKIP') @@ -30,12 +34,12 @@ pkgver() { build() { cd comictagger - python setup.py build + python -m build -wn } package() { cd comictagger - python setup.py install --root="$pkgdir" --optimize=1 --skip-build + python -m installer -d "$pkgdir" dist/*.whl sed -e 's|/usr/local/share/comictagger/app.png|/usr/share/icons/comictagger.png|g' \ -e 's|%%CTSCRIPT%% %F|/usr/bin/comictagger|g' \