summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD41
-rw-r--r--mcomix-git.install4
3 files changed, 12 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f008f0d8ede3..da30720a6e65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = mcomix-git
pkgdesc = A user-friendly, customizable image viewer specifically designed to handle comic books
- pkgver = 2.1.1.r30.gae7d6a0
+ pkgver = 3.0.0.r16.g4a91687
pkgrel = 1
url = https://sourceforge.net/projects/mcomix/
- install = mcomix-git.install
arch = any
license = GPL
makedepends = gettext
@@ -18,6 +17,7 @@ pkgbase = mcomix-git
depends = python-gobject>=3.36.0
depends = python-cairo>=1.16.0
depends = python-setuptools
+ depends = python-wheel
optdepends = libunrar: for rar compressed comics
optdepends = p7zip: for 7z compressed comics
optdepends = unrar: for rar compressed comics
diff --git a/PKGBUILD b/PKGBUILD
index 877d58915634..2b2b6d27d2e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: Ray Powell <ray_al@xphoniexx.net>
pkgname=mcomix-git
-pkgver=2.1.1.r30.gae7d6a0
+pkgver=3.0.0.r16.g4a91687
pkgrel=1
pkgdesc='A user-friendly, customizable image viewer specifically designed to handle comic books'
arch=('any')
@@ -14,7 +14,7 @@ url='https://sourceforge.net/projects/mcomix/'
license=('GPL')
depends=('gtk3' 'python-pillow>=6.0.0' 'xdg-utils' 'python>=3.7'
'desktop-file-utils' 'hicolor-icon-theme'
- 'python-gobject>=3.36.0' 'python-cairo>=1.16.0' 'python-setuptools')
+ 'python-gobject>=3.36.0' 'python-cairo>=1.16.0' 'python-setuptools' 'python-wheel')
makedepends=('gettext' 'intltool' 'git')
optdepends=(
'libunrar: for rar compressed comics'
@@ -30,42 +30,21 @@ source=(
"${pkgname}::git+http://git.code.sf.net/p/mcomix/git"
)
sha256sums=('SKIP')
-install=mcomix-git.install
pkgver() {
cd "${pkgname}"
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-package() {
- cd "${srcdir}/${pkgname}"
- mkdir -p "${pkgdir}/usr/bin"
-
- _PYVERSION=$(python3 --version | sed -e 's/Python /python/')
- _ICONDIR="${pkgdir}/usr/lib/${_PYVERSION%.*}/site-packages/mcomix/images"
-
- install -dm755 "$_ICONDIR"
-
- python3 setup.py install --prefix=/usr --optimize=1 \
- --single-version-externally-managed --root="${pkgdir}/"
+build() {
+ cd "${pkgname}"
+ python -m build --wheel --no-isolation
+}
- install -Dm755 mcomix/images/*.png "${_ICONDIR}"
+package() {
+ cd "${pkgname}"
- install -Dm755 mime/comicthumb "${pkgdir}/usr/bin/comicthumb"
- install -Dm644 mime/comicthumb.1.gz "${pkgdir}/usr/share/man/man1/comicthumb.1.gz"
- install -Dm644 mime/comicthumb.thumbnailer "${pkgdir}/usr/share/thumbnailers/comicthumb.thumbnailer"
- install -Dm644 mime/comicbook.schemas "${pkgdir}/usr/share/gconf/schemas/mcomix.schemas"
- install -Dm644 mime/mcomix.desktop "${pkgdir}/usr/share/applications/mcomix.desktop"
- install -Dm644 mime/mcomix.appdata.xml "${pkgdir}/usr/share/metainfo/mcomix.appdata.xml"
+ python -m installer --destdir="${pkgdir}" dist/*.whl
- for size in 16x16 22x22 24x24 32x32 48x48
- do
- install -Dm755 "mcomix/images/${size}/mcomix.png" "${_ICONDIR}/${size}/mcomix.png"
- install -dm755 "${pkgdir}/usr/share/icons/hicolor/${size}/apps/"
- install -Dm644 "mcomix/images/${size}/mcomix.png" "${pkgdir}/usr/share/icons/hicolor/${size}/apps/mcomix.png"
- install -Dm644 "mime/icons/${size}/application-x-cb7.png" "${pkgdir}/usr/share/icons/hicolor/${size}/mimetypes/application-x-cb7.png"
- install -Dm644 "mime/icons/${size}/application-x-cbr.png" "${pkgdir}/usr/share/icons/hicolor/${size}/mimetypes/application-x-cbr.png"
- install -Dm644 "mime/icons/${size}/application-x-cbt.png" "${pkgdir}/usr/share/icons/hicolor/${size}/mimetypes/application-x-cbt.png"
- install -Dm644 "mime/icons/${size}/application-x-cbz.png" "${pkgdir}/usr/share/icons/hicolor/${size}/mimetypes/application-x-cbz.png"
- done
+ cp -a share "${pkgdir}/usr"
}
diff --git a/mcomix-git.install b/mcomix-git.install
deleted file mode 100644
index 54d2f88d4189..000000000000
--- a/mcomix-git.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_upgrade() {
- echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf'
-}
-