From bd8c9c6bb5d37fe7481970e56f24a3bb5169c5e6 Mon Sep 17 00:00:00 2001 From: Christian Schendel Date: Sun, 7 Sep 2025 16:10:14 +0200 Subject: [PATCH] upgpkg: calibre-bin-8.10.0-2: clarify it is a -bin package --- .SRCINFO | 25 ++++---- PKGBUILD | 186 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 108 insertions(+), 103 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4f16441..4ca7100 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,10 +1,20 @@ pkgbase = calibre-bin - pkgdesc = Official desktop version Calibre - pkgver = 8.9.0 - pkgrel = 1 + pkgdesc = Ebook management application + pkgver = 8.10.0 + pkgrel = 2 url = https://github.com/kovidgoyal/calibre arch = x86_64 license = GPL-3.0-only + provides = calibre=8.10.0 + conflicts = calibre + conflicts = calibre-git + options = !emptydirs + source = share.tar.xz + source = https://github.com/kovidgoyal/calibre/releases/download/v8.10.0/calibre-8.10.0-x86_64.txz + b2sums = e4f5fae13053d05538c96d3be4ddb57bc5d98ecb365036a1afe4cf41e7c9e902ca039b4c7dbb7c1f8f45e53951633e98e1f36f29a192d0ea536067c7c6822512 + b2sums = 4baa625683b7e6ecb6ba043c4d68d131c13a6a83daf0dfe5de7a4f7aace9da35025f19af47d75394066bcd23bb16b7b69af38ca5c399455161741085c0211b68 + +pkgname = calibre-bin depends = alsa-lib depends = bash depends = brotli @@ -88,12 +98,3 @@ pkgbase = calibre-bin depends = xz depends = zlib depends = zstd - provides = calibre - conflicts = calibre - conflicts = calibre-git - source = share.tar.xz - source = https://github.com/kovidgoyal/calibre/releases/download/v8.9.0/calibre-8.9.0-x86_64.txz - b2sums = e4f5fae13053d05538c96d3be4ddb57bc5d98ecb365036a1afe4cf41e7c9e902ca039b4c7dbb7c1f8f45e53951633e98e1f36f29a192d0ea536067c7c6822512 - b2sums = 2752fe1ba2ec13b761ceedfa710999f3ab351f6a196e5bbb2f868e916871aa5e10a9500f46a9420a6ee2bcd4db8f3aa28c21c48031518c35efcd4d2c0b77c922 - -pkgname = calibre-bin diff --git a/PKGBUILD b/PKGBUILD index bf2ad0a..9ee26ea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,9 +2,9 @@ # Contributor: Alex Potapenko pkgname=calibre-bin -pkgver=8.9.0 -pkgrel=1 -pkgdesc="Official desktop version Calibre" +pkgver=8.10.0 +pkgrel=2 +pkgdesc="Ebook management application" arch=( x86_64 ) @@ -12,98 +12,16 @@ url="https://github.com/kovidgoyal/calibre" license=( GPL-3.0-only ) -depends=( - alsa-lib - bash - brotli - bzip2 - chmlib - dbus - expat - ffmpeg - flite - fontconfig - freetype2 - gcc-libs - glib2 - glibc - hicolor-icon-theme - hunspell - hyphen - jbigkit - libdeflate - libdrm - libffi - libglvnd - libgpg-error - libice - libinput - libjpeg-turbo - libmtp - libpng - libpulse - libsm - libstemmer - libtiff - libtirpc - libunrar - libusb - libwebp - libx11 - libxcb - libxcomposite - libxcrypt-compat - libxdamage - libxext - libxfixes - libxkbcommon - libxkbcommon-x11 - libxkbfile - libxrandr - libxslt - libxtst - mesa - mtdev - ncurses - nspr - nss - openjpeg2 - openssl - pcre2 - podofo - python - qt6-base - qt6-declarative - qt6-multimedia - qt6-positioning - qt6-sensors - qt6-speech - qt6-svg - qt6-wayland - qt6-webchannel - qt6-webengine - readline - sqlite - systemd-libs - uchardet - util-linux-libs - wayland - xcb-util-cursor - xcb-util-image - xcb-util-keysyms - xcb-util-renderutil - xcb-util-wm - xz - zlib - zstd -) provides=( - calibre + "calibre=$pkgver" ) conflicts=( calibre calibre-git ) +options=( + '!emptydirs' +) # Sources # Since there doesn't seem to be a simple way to generate desktop # integration files without building calibre from source, @@ -113,7 +31,7 @@ source=( "$url/releases/download/v${pkgver}/calibre-${pkgver}-x86_64.txz" ) b2sums=('e4f5fae13053d05538c96d3be4ddb57bc5d98ecb365036a1afe4cf41e7c9e902ca039b4c7dbb7c1f8f45e53951633e98e1f36f29a192d0ea536067c7c6822512' - '2752fe1ba2ec13b761ceedfa710999f3ab351f6a196e5bbb2f868e916871aa5e10a9500f46a9420a6ee2bcd4db8f3aa28c21c48031518c35efcd4d2c0b77c922') + '4baa625683b7e6ecb6ba043c4d68d131c13a6a83daf0dfe5de7a4f7aace9da35025f19af47d75394066bcd23bb16b7b69af38ca5c399455161741085c0211b68') prepare() { # don't want the sources symlinks in the final tarball @@ -125,6 +43,91 @@ prepare() { } package() { + depends+=( + alsa-lib + bash + brotli + bzip2 + chmlib + dbus + expat + ffmpeg + flite + fontconfig + freetype2 + gcc-libs + glib2 + glibc + hicolor-icon-theme + hunspell + hyphen + jbigkit + libdeflate + libdrm + libffi + libglvnd + libgpg-error + libice + libinput + libjpeg-turbo + libmtp + libpng + libpulse + libsm + libstemmer + libtiff + libtirpc + libunrar + libusb + libwebp + libx11 + libxcb + libxcomposite + libxcrypt-compat + libxdamage + libxext + libxfixes + libxkbcommon + libxkbcommon-x11 + libxkbfile + libxrandr + libxslt + libxtst + mesa + mtdev + ncurses + nspr + nss + openjpeg2 + openssl + pcre2 + podofo + python + qt6-base + qt6-declarative + qt6-multimedia + qt6-positioning + qt6-sensors + qt6-speech + qt6-svg + qt6-wayland + qt6-webchannel + qt6-webengine + readline + sqlite + systemd-libs + uchardet + util-linux-libs + wayland + xcb-util-cursor + xcb-util-image + xcb-util-keysyms + xcb-util-renderutil + xcb-util-wm + xz + zlib + zstd + ) # Creating needed directories install -dm755 "$pkgdir/usr/bin" install -dm755 "$pkgdir/opt/calibre" @@ -134,7 +137,8 @@ package() { mv -f "$pkgdir/opt/calibre/share" "$pkgdir/usr" # Create symlinks in /usr/bin - for f in `find "$pkgdir/opt/calibre" -maxdepth 1 -type f -printf "%f\n"`; do + #shellcheck disable=SC2044 + for f in $(find "$pkgdir/opt/calibre" -maxdepth 1 -type f -printf "%f\n"); do ln -s "/opt/calibre/$f" "$pkgdir/usr/bin/$f" done }