* Re: [PR REVIEW] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
@ 2020-11-29 21:11 ` skmpz
2020-11-29 21:20 ` ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: skmpz @ 2020-11-29 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by skmpz on void-packages repository
https://github.com/void-linux/void-packages/pull/26761#discussion_r532266904
Comment:
weird.. i get the same on 5.4.2..
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
2020-11-29 21:11 ` [PR REVIEW] calibre: update to 5.6.0 skmpz
@ 2020-11-29 21:20 ` ericonr
2020-11-30 19:40 ` skmpz
` (5 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-11-29 21:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26761#discussion_r532267871
Comment:
Oh nice, this is a locale generated bug. Do you have an account in their bug tracker, by any chance?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
2020-11-29 21:11 ` [PR REVIEW] calibre: update to 5.6.0 skmpz
2020-11-29 21:20 ` ericonr
@ 2020-11-30 19:40 ` skmpz
2020-11-30 20:47 ` ericonr
` (4 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: skmpz @ 2020-11-30 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New review comment by skmpz on void-packages repository
https://github.com/void-linux/void-packages/pull/26761#discussion_r532852332
Comment:
no :S
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-11-30 19:40 ` skmpz
@ 2020-11-30 20:47 ` ericonr
2020-11-30 20:48 ` ericonr
` (3 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-11-30 20:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26761#discussion_r532893111
Comment:
Ok, this test works on my machine. So please leave a comment that failure isn't deterministic.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-11-30 20:47 ` ericonr
@ 2020-11-30 20:48 ` ericonr
2020-11-30 22:12 ` [PR PATCH] [Updated] " skmpz
` (2 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-11-30 20:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26761#discussion_r532893775
Comment:
Indeed, the test worked here with `speech-dispatcher`, the devel package isn't needed.
Thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-11-30 20:48 ` ericonr
@ 2020-11-30 22:12 ` skmpz
2020-12-01 5:04 ` skmpz
2020-12-02 18:12 ` [PR PATCH] [Merged]: " ericonr
7 siblings, 0 replies; 8+ messages in thread
From: skmpz @ 2020-11-30 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There is an updated pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages calibre-5.6.0
https://github.com/void-linux/void-packages/pull/26761
calibre: update to 5.6.0.
A patch file from https://github.com/void-linux/void-packages/pull/26761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calibre-5.6.0-26761.patch --]
[-- Type: text/x-diff, Size: 3717 bytes --]
From 50ad4f3f8b583c909b8335d342f890ac299296ee Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 28 Nov 2020 17:19:37 +0400
Subject: [PATCH] calibre: update to 5.6.0.
---
...ot-don-t-try-to-import-plistlib.Data.patch | 27 -------------------
srcpkgs/calibre/template | 15 ++++++-----
2 files changed, 9 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
diff --git a/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch b/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
deleted file mode 100644
index 6567029cd48..00000000000
--- a/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 238680060c9ab66f87b2d4f4bddc033083b2af4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 2 Nov 2020 07:17:07 +0700
-Subject: [PATCH] polyglot: don't try to import plistlib.Data
-
-plistlib.Data is deprecated from Python 3.4 and fully removed in Python
-3.9.
-
-Skimming over the code, it's look like nothing uses this data structure.
-
-Let's remove it.
----
- src/polyglot/plistlib.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/polyglot/plistlib.py src/polyglot/plistlib.py
-index e1a5b8b16a..c55811e909 100644
---- src/polyglot/plistlib.py
-+++ src/polyglot/plistlib.py
-@@ -2,5 +2,5 @@
- # vim:fileencoding=utf-8
- # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>
-
--from plistlib import loads, dumps, Data # noqa
-+from plistlib import loads, dumps # noqa
- loads_binary_or_xml = loads
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 77de483b865..20f8ca9c0c8 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
# Template file for 'calibre'
pkgname=calibre
-version=5.4.2
+version=5.6.0
revision=1
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
@@ -19,21 +19,22 @@ depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
python3-dnspython python3-feedparser python3-html5-parser python3-mechanize
python3-msgpack python3-netifaces python3-psutil python3-regex python3-html2text
python3-pychm qt5-webengine"
-checkdepends="${depends} libjpeg-turbo-tools jxrlib"
+# should check if python3-pycryptodome is still needed
+checkdepends="${depends} libjpeg-turbo-tools jxrlib python3-pycryptodome
+ speech-dispatcher xvfb-run"
short_desc="Ebook management application"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-3.0-only"
homepage="https://calibre-ebook.com"
changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=e6bc37cbcfecf06d5d6d8cab132e6e4896a1bbade4e5385f26975111f1c0f517
+checksum=484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55
lib32disabled=yes
nocross=yes
do_configure() {
# Remove unneeded files and libs
- rm -rf resources/${pkgname}-portable.* \
- src/biplist
+ rm -rf resources/${pkgname}-portable.*
# Desktop integration (e.g. enforce arch defaults)
vsed -i src/calibre/linux.py \
@@ -52,9 +53,11 @@ do_check() {
# qt test crashes without any error messages
# disabled for now
# unrar test fails because python3-unrardll isn't packaged
+ # searching test case fails (non-deterministic)
python3 setup.py test \
--exclude-test-name unrar \
- --exclude-test-name qt
+ --exclude-test-name qt \
+ --exclude-test-name searching
}
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-11-30 22:12 ` [PR PATCH] [Updated] " skmpz
@ 2020-12-01 5:04 ` skmpz
2020-12-02 18:12 ` [PR PATCH] [Merged]: " ericonr
7 siblings, 0 replies; 8+ messages in thread
From: skmpz @ 2020-12-01 5:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There is an updated pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages calibre-5.6.0
https://github.com/void-linux/void-packages/pull/26761
calibre: update to 5.6.0.
A patch file from https://github.com/void-linux/void-packages/pull/26761.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calibre-5.6.0-26761.patch --]
[-- Type: text/x-diff, Size: 3708 bytes --]
From a6792fdadfd1ea3352828a406490b6cddd01294a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 28 Nov 2020 17:19:37 +0400
Subject: [PATCH] calibre: update to 5.6.0.
---
...ot-don-t-try-to-import-plistlib.Data.patch | 27 -------------------
srcpkgs/calibre/template | 15 ++++++-----
2 files changed, 9 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
diff --git a/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch b/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
deleted file mode 100644
index 6567029cd48..00000000000
--- a/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 238680060c9ab66f87b2d4f4bddc033083b2af4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 2 Nov 2020 07:17:07 +0700
-Subject: [PATCH] polyglot: don't try to import plistlib.Data
-
-plistlib.Data is deprecated from Python 3.4 and fully removed in Python
-3.9.
-
-Skimming over the code, it's look like nothing uses this data structure.
-
-Let's remove it.
----
- src/polyglot/plistlib.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/polyglot/plistlib.py src/polyglot/plistlib.py
-index e1a5b8b16a..c55811e909 100644
---- src/polyglot/plistlib.py
-+++ src/polyglot/plistlib.py
-@@ -2,5 +2,5 @@
- # vim:fileencoding=utf-8
- # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>
-
--from plistlib import loads, dumps, Data # noqa
-+from plistlib import loads, dumps # noqa
- loads_binary_or_xml = loads
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 77de483b865..c4f34a82b5b 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
# Template file for 'calibre'
pkgname=calibre
-version=5.4.2
+version=5.6.0
revision=1
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
@@ -19,21 +19,22 @@ depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
python3-dnspython python3-feedparser python3-html5-parser python3-mechanize
python3-msgpack python3-netifaces python3-psutil python3-regex python3-html2text
python3-pychm qt5-webengine"
-checkdepends="${depends} libjpeg-turbo-tools jxrlib"
+# should check if python3-pycryptodome is still needed
+checkdepends="${depends} libjpeg-turbo-tools jxrlib python3-pycryptodome
+ speech-dispatcher"
short_desc="Ebook management application"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-3.0-only"
homepage="https://calibre-ebook.com"
changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=e6bc37cbcfecf06d5d6d8cab132e6e4896a1bbade4e5385f26975111f1c0f517
+checksum=484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55
lib32disabled=yes
nocross=yes
do_configure() {
# Remove unneeded files and libs
- rm -rf resources/${pkgname}-portable.* \
- src/biplist
+ rm -rf resources/${pkgname}-portable.*
# Desktop integration (e.g. enforce arch defaults)
vsed -i src/calibre/linux.py \
@@ -52,9 +53,11 @@ do_check() {
# qt test crashes without any error messages
# disabled for now
# unrar test fails because python3-unrardll isn't packaged
+ # searching test case fails (non-deterministic)
python3 setup.py test \
--exclude-test-name unrar \
- --exclude-test-name qt
+ --exclude-test-name qt \
+ --exclude-test-name searching
}
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: calibre: update to 5.6.0.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26761@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-12-01 5:04 ` skmpz
@ 2020-12-02 18:12 ` ericonr
7 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-02 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
calibre: update to 5.6.0.
https://github.com/void-linux/void-packages/pull/26761
Description:
^ permalink raw reply [flat|nested] 8+ messages in thread