[arch-commits] Commit in calibre/repos/community-x86_64 (3 files)

Eli Schwartz eschwartz at archlinux.org
Fri Nov 27 20:06:53 UTC 2020


    Date: Friday, November 27, 2020 @ 20:06:53
  Author: eschwartz
Revision: 764662

archrelease: copy trunk to community-x86_64

Added:
  calibre/repos/community-x86_64/PKGBUILD
    (from rev 764661, calibre/trunk/PKGBUILD)
Deleted:
  calibre/repos/community-x86_64/0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch
  calibre/repos/community-x86_64/PKGBUILD

--------------------------------------------------------------+
 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch |   50 --
 PKGBUILD                                                     |  209 ++++------
 2 files changed, 104 insertions(+), 155 deletions(-)

Deleted: 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch
===================================================================
--- 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch	2020-11-27 20:06:22 UTC (rev 764661)
+++ 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch	2020-11-27 20:06:53 UTC (rev 764662)
@@ -1,50 +0,0 @@
-From 7f5a11dccf6b6272e38ac91e760a1eaf49423cae Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Thu, 12 Nov 2020 22:47:03 -0500
-Subject: [PATCH] Do not build WIP espeak plugin before it is ready.
-
-Introduced in https://github.com/kovidgoyal/calibre/commit/c027aaff750ff73fa6affe909af911e8918b8316
-but as of the time of writing (November 12) it contains no public
-functions at all. Eventually, it will be runtime-optional in the viewer.
-
-Until this is a bit more advanced, let's just delete it from being
-compiled in order to avoid the build-time dependency. Watch this space
-for more news...
----
- setup/extensions.json    | 6 ------
- src/calibre/constants.py | 2 +-
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/setup/extensions.json b/setup/extensions.json
-index 38421c258f..2c9d5187de 100644
---- a/setup/extensions.json
-+++ b/setup/extensions.json
-@@ -179,12 +179,6 @@
-         "sources": "calibre/utils/cocoa.m calibre/utils/cocoa_wrapper.c",
-         "ldflags": "-framework Cocoa"
-     },
--    {
--        "name": "espeak",
--        "only": "linux haiku",
--        "sources": "calibre/utils/tts/espeak.cpp",
--        "libraries": "espeak-ng"
--    },
-     {
-         "name": "libusb",
-         "only": "macos linux haiku",
-diff --git a/src/calibre/constants.py b/src/calibre/constants.py
-index 36a4478a4d..3cc4682c24 100644
---- a/src/calibre/constants.py
-+++ b/src/calibre/constants.py
-@@ -253,7 +253,7 @@ def __init__(self):
-         elif ismacos:
-             extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')
-         elif isfreebsd or ishaiku or islinux:
--            extra = ('libusb', 'libmtp', 'espeak')
-+            extra = ('libusb', 'libmtp')
-         else:
-             extra = ()
-         self.calibre_extensions = frozenset(extensions + extra)
--- 
-2.29.2
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-27 20:06:22 UTC (rev 764661)
+++ PKGBUILD	2020-11-27 20:06:53 UTC (rev 764662)
@@ -1,105 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Petrov Roman <nwhisper at gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-# Contributor: Larry Hajali <larryhaja at gmail.com>
-
-pkgbase=calibre
-pkgname=calibre
-pkgver=5.5.0
-pkgrel=1
-pkgdesc="Ebook management application"
-arch=('x86_64')
-url="https://calibre-ebook.com/"
-license=('GPL3')
-_py_deps=('apsw' 'beautifulsoup4' 'cssselect' 'css-parser' 'dateutil' 'dbus' 'dnspython'
-          'feedparser' 'html2text' 'html5-parser' 'lxml' 'markdown' 'mechanize' 'msgpack'
-          'netifaces' 'unrardll' 'pillow' 'psutil' 'pychm' 'pygments' 'pyqt5'
-          'pyqtwebengine' 'regex' 'zeroconf')
-depends=('hunspell' 'hyphen' 'icu' 'jxrlib' 'libmtp' 'libusb'
-         'libwmf' 'mathjax' 'mtdev' 'optipng' 'podofo'
-         "${_py_deps[@]/#/python-}" 'qt5-svg' 'udisks2')
-makedepends=('qt5-x11extras' 'sip5' 'pyqt-builder' 'xdg-utils' 'rapydscript-ng')
-checkdepends=('xorg-server-xvfb')
-optdepends=('poppler: required for converting pdf to html')
-conflicts=('calibre-common' 'calibre-python3')
-replaces=('calibre-common' 'calibre-python3')
-source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgbase}-${pkgver}.tar.xz.sig"
-        "0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch")
-sha256sums=('01cebfd1ee7b05cd7393991818ce829d8bb080db5d12fe86111d242864660224'
-            'SKIP'
-            '8ed4a9578d3dbbc4ada4dd08f318c861012f45260cdd68caadbeb29b12d58a05')
-b2sums=('af710b7554ce82e52c742789831fd4afee53ddd0ce3a5e36970fee6e1f6a0cf91aa5b03bff53ec0f1ca66c6bc73ace3c770f13c44468a352541ae29a2043335b'
-        'SKIP'
-        '25ed435277cb3e2ad843295df5cf4469e4ddb96c880e4d0c3003d59cc71719e1a3062220d612766ced6e42d30f800603375baef43106e0b447acca8f5f58e3f5')
-validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid at kovidgoyal.net>
-
-prepare(){
-    cd "${pkgbase}-${pkgver}"
-
-    # wait until this is functional before building it
-    patch -p1 -i ../0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch
-
-    # Desktop integration (e.g. enforce arch defaults)
-    # Use uppercase naming scheme, don't delete config files under fakeroot.
-    sed -e "/import config_dir/,/os.rmdir(config_dir)/d" \
-        -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
-        -e "s/^Name=calibre/Name=Calibre/g" \
-        -i  src/calibre/linux.py
-
-    cd resources
-
-    # Remove unneeded files
-    rm ${pkgbase}-portable.* mozilla-ca-certs.pem
-
-    # use system mathjax
-    rm -r mathjax
-}
-
-build() {
-    cd "${pkgbase}-${pkgver}"
-
-    LANG='en_US.UTF-8' python setup.py build
-    LANG='en_US.UTF-8' python setup.py gui
-    LANG='en_US.UTF-8' python setup.py mathjax --path-to-mathjax /usr/share/mathjax --system-mathjax
-    LANG='en_US.UTF-8' python setup.py rapydscript
-}
-
-check() {
-    cd "${pkgbase}-${pkgver}"
-
-    # without xvfb-run this fails with much "Control socket failed to recv(), resetting"
-    # ERROR: test_websocket_perf (calibre.srv.tests.web_sockets.WebSocketTest)
-    # one or two tests are a bit flaky, but the python3 build seems to succeed more often
-    #
-    # test_ajax_book segfaults on qt >=5.15.1 inside of qt itself, but only in nspawn containers
-    # see https://github.com/kovidgoyal/calibre/commit/28ef780d9911d598314d98bdfc3b1c88a94681df
-    LANG='en_US.UTF-8' xvfb-run python setup.py test --exclude-test-name=test_ajax_book
-}
-
-package() {
-    cd "${pkgbase}-${pkgver}"
-
-    # If this directory doesn't exist, zsh completion won't install.
-    install -d "${pkgdir}/usr/share/zsh/site-functions"
-
-    LANG='en_US.UTF-8' python setup.py install \
-        --staging-root="${pkgdir}/usr" \
-        --prefix=/usr
-
-    cp -a man-pages/ "${pkgdir}/usr/share/man"
-
-    # not needed at runtime
-    rm -r "${pkgdir}"/usr/share/calibre/rapydscript/
-
-    # Compiling bytecode FS#33392
-    # This is kind of ugly but removes traces of the build root.
-    while read -rd '' _file; do
-        _destdir="$(dirname "${_file#${pkgdir}}")"
-        python3 -m compileall -d "${_destdir}" "${_file}"
-        python3 -O -m compileall -d "${_destdir}" "${_file}"
-    done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0)
-}

Copied: calibre/repos/community-x86_64/PKGBUILD (from rev 764661, calibre/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-27 20:06:53 UTC (rev 764662)
@@ -0,0 +1,104 @@
+# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Petrov Roman <nwhisper at gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryhaja at gmail.com>
+
+pkgbase=calibre
+pkgname=calibre
+pkgver=5.6.0
+pkgrel=1
+pkgdesc="Ebook management application"
+arch=('x86_64')
+url="https://calibre-ebook.com/"
+license=('GPL3')
+_py_deps=('apsw' 'beautifulsoup4' 'cssselect' 'css-parser' 'dateutil' 'dbus' 'dnspython'
+          'feedparser' 'html2text' 'html5-parser' 'lxml' 'markdown' 'mechanize' 'msgpack'
+          'netifaces' 'unrardll' 'pillow' 'psutil' 'pychm' 'pygments' 'pyqt5'
+          'pyqtwebengine' 'regex' 'zeroconf')
+depends=('hunspell' 'hyphen' 'icu' 'jxrlib' 'libmtp' 'libusb'
+         'libwmf' 'mathjax' 'mtdev' 'optipng' 'podofo'
+         "${_py_deps[@]/#/python-}" 'qt5-svg' 'udisks2')
+makedepends=('qt5-x11extras' 'sip5' 'pyqt-builder' 'xdg-utils' 'rapydscript-ng')
+checkdepends=('xorg-server-xvfb')
+optdepends=('poppler: required for converting pdf to html')
+conflicts=('calibre-common' 'calibre-python3')
+replaces=('calibre-common' 'calibre-python3')
+source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
+        "https://calibre-ebook.com/signatures/${pkgbase}-${pkgver}.tar.xz.sig")
+sha256sums=('484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55'
+            'SKIP')
+b2sums=('44941c50873c285aa552c5b4ac716e5d3dd6bc3e1a4f13b1003d42adb808566ec3a5083c683a40d9679524e4ae70eed6ec8bc4c70770991f9791bcea25387c42'
+        'SKIP')
+validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid at kovidgoyal.net>
+
+prepare(){
+    cd "${pkgbase}-${pkgver}"
+
+    # Desktop integration (e.g. enforce arch defaults)
+    # Use uppercase naming scheme, don't delete config files under fakeroot.
+    sed -e "/import config_dir/,/os.rmdir(config_dir)/d" \
+        -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
+        -e "s/^Name=calibre/Name=Calibre/g" \
+        -i  src/calibre/linux.py
+
+    cd resources
+
+    # Remove unneeded files
+    rm ${pkgbase}-portable.* mozilla-ca-certs.pem
+
+    # use system mathjax
+    rm -r mathjax
+}
+
+build() {
+    cd "${pkgbase}-${pkgver}"
+
+    LANG='en_US.UTF-8' python setup.py build
+    LANG='en_US.UTF-8' python setup.py gui
+    LANG='en_US.UTF-8' python setup.py mathjax --path-to-mathjax /usr/share/mathjax --system-mathjax
+    LANG='en_US.UTF-8' python setup.py rapydscript
+}
+
+check() {
+    cd "${pkgbase}-${pkgver}"
+
+    _test_excludes=(
+        # merely testing if a runtime-optional feature works, but is not
+        # operative yet e.g. only tries checking if the optdepend is importable
+        'speech_dispatcher'
+        # tests if a completely unused module is bundled
+        'pycryptodome'
+    )
+
+    # without xvfb-run this fails with much "Control socket failed to recv(), resetting"
+    # ERROR: test_websocket_perf (calibre.srv.tests.web_sockets.WebSocketTest)
+    # one or two tests are a bit flaky, but the python3 build seems to succeed more often
+    LANG='en_US.UTF-8' xvfb-run python setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+package() {
+    cd "${pkgbase}-${pkgver}"
+
+    # If this directory doesn't exist, zsh completion won't install.
+    install -d "${pkgdir}/usr/share/zsh/site-functions"
+
+    LANG='en_US.UTF-8' python setup.py install \
+        --staging-root="${pkgdir}/usr" \
+        --prefix=/usr
+
+    cp -a man-pages/ "${pkgdir}/usr/share/man"
+
+    # not needed at runtime
+    rm -r "${pkgdir}"/usr/share/calibre/rapydscript/
+
+    # Compiling bytecode FS#33392
+    # This is kind of ugly but removes traces of the build root.
+    while read -rd '' _file; do
+        _destdir="$(dirname "${_file#${pkgdir}}")"
+        python3 -m compileall -d "${_destdir}" "${_file}"
+        python3 -O -m compileall -d "${_destdir}" "${_file}"
+    done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0)
+}


More information about the arch-commits mailing list