Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
calibre
Commits:
ba45177d by Antonio Rojas at 2024-12-14T11:36:21+01:00
upgpkg: 7.22.0-1: Update to 7.22.0
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = calibre
pkgdesc = Ebook management application
- pkgver = 7.17.0
- pkgrel = 6
+ pkgver = 7.22.0
+ pkgrel = 1
url = https://calibre-ebook.com
arch = x86_64
license = GPL-3.0-only
@@ -50,6 +50,7 @@ pkgbase = calibre
depends = python-pychm
depends = python-pycryptodome
depends = python-pygments
+ depends = python-pykakasi
depends = python-pyqt6
depends = python-pyqt6-webengine
depends = python-regex
@@ -58,6 +59,8 @@ pkgbase = calibre
depends = python-zeroconf
depends = python-zstandard
depends = qt6-imageformats
+ depends = qt6-multimedia
+ depends = qt6-speech
depends = qt6-svg
depends = qt6-webengine
depends = ttf-liberation
@@ -71,16 +74,10 @@ pkgbase = calibre
conflicts = calibre-python3
replaces = calibre-common
replaces = calibre-python3
- source = https://download.calibre-ebook.com/7.17.0/calibre-7.17.0.tar.xz
- source = https://calibre-ebook.com/signatures/calibre-7.17.0.tar.xz.sig
- source = https://github.com/kovidgoyal/calibre/commit/0796e120.patch
- source = https://github.com/kovidgoyal/calibre/commit/358a2022.patch
- source = https://github.com/kovidgoyal/calibre/commit/a961ddbf.patch
+ source = https://download.calibre-ebook.com/7.22.0/calibre-7.22.0.tar.xz
+ source = https://calibre-ebook.com/signatures/calibre-7.22.0.tar.xz.sig
validpgpkeys = 3CE1780F78DD88DF45194FD706BC317B515ACE7C
- sha256sums =
ce89672c0acfad8be70c1bb94d56bd4bc54def90375806ff6a7d5059c0b0d748
+ sha256sums =
4660ad7bab6893417fb6ce5c69c005064b0d61f9cbca5638242993c9bfba2149
sha256sums = SKIP
- sha256sums =
5e58c2a65fd3de3d12b23ac23c153071e49b23c7f295f4df22a45821ae3e9fa2
- sha256sums =
21f6894c1631cb27b6c25379df65f2a706a27304837f42ec66090a64cc44afb4
- sha256sums =
510cc0ede9f5f00222c2ed91551b4c94189cc84ee0abdbbace866f9b4ddad38d
pkgname = calibre
=====================================
PKGBUILD
=====================================
@@ -8,8 +8,8 @@
# Contributor: Larry Hajali <[email protected]>
pkgname=calibre
-pkgver=7.17.0
-pkgrel=6
+pkgver=7.22.0
+pkgrel=1
pkgdesc='Ebook management application'
arch=(x86_64)
url=https://calibre-ebook.com
@@ -38,6 +38,7 @@ _pydeps=(apsw
pychm
pycryptodome
pygments
+ pykakasi
pyqt6
pyqt6-webengine
regex
@@ -59,6 +60,8 @@ depends=(hunspell
podofo
"${_pydeps[@]/#/python-}"
qt6-imageformats
+ qt6-multimedia
+ qt6-speech
qt6-svg
qt6-webengine
ttf-liberation
@@ -82,15 +85,9 @@ conflicts=(calibre-common
replaces=("${conflicts[@]}")
_archive="$pkgname-$pkgver"
source=("https://download.calibre-ebook.com/$pkgver/$_archive.tar.xz";
- "$url/signatures/$_archive.tar.xz.sig"
- https://github.com/kovidgoyal/calibre/commit/0796e120.patch
- https://github.com/kovidgoyal/calibre/commit/358a2022.patch
- https://github.com/kovidgoyal/calibre/commit/a961ddbf.patch)
-sha256sums=('ce89672c0acfad8be70c1bb94d56bd4bc54def90375806ff6a7d5059c0b0d748'
- 'SKIP'
- '5e58c2a65fd3de3d12b23ac23c153071e49b23c7f295f4df22a45821ae3e9fa2'
- '21f6894c1631cb27b6c25379df65f2a706a27304837f42ec66090a64cc44afb4'
- '510cc0ede9f5f00222c2ed91551b4c94189cc84ee0abdbbace866f9b4ddad38d')
+ "$url/signatures/$_archive.tar.xz.sig")
+sha256sums=('4660ad7bab6893417fb6ce5c69c005064b0d61f9cbca5638242993c9bfba2149'
+ 'SKIP')
validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New
longer key) <[email protected]>
prepare(){
@@ -103,14 +100,6 @@ prepare(){
-i src/calibre/linux.py
# Remove unneeded files
rm -f resources/$pkgname-portable.*
- sed -e 's|"14"|"17"|' -e 's|"11"|"17"|' -i setup/extensions.json # Fix
build with ICU 75
-
-# Fix issues with Qt 6.8
- patch -p1 -i ../0796e120.patch
-# Fix test failure with openssl 3.4
- patch -p1 -i ../358a2022.patch
-# Fix tests with pillow 11
- patch -p1 -i ../a961ddbf.patch
}
build() {
@@ -127,7 +116,7 @@ build() {
check() {
cd "$_archive"
export LANG='en_US.UTF-8'
- python setup.py test --under-sanitize
+ python setup.py test --under-sanitize --exclude-test-name test_piper
python setup.py test_rs
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/calibre/-/commit/ba45177d63d3ca03f3083bffcf6bc4b5689dbfb8
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/calibre/-/commit/ba45177d63d3ca03f3083bffcf6bc4b5689dbfb8
You're receiving this email because of your account on gitlab.archlinux.org.
