[arch-commits] Commit in calibre/repos/community-x86_64 (3 files)
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 -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 === --- PKGBUILD2020-11-27 20:06:22 UTC (rev 764661) +++ PKGBUILD2020-11-27 20:06:53 UTC (rev 764662) @@ -1,105 +0,0 @@ -# Maintainer: Jelle van der Waa -# Maintainer: Eli Schwartz -# Contributor: Daniel Wallace -# Contributor: Giovanni Scafora -# Contributor: Petrov Roman -# Contributor: Andrea Fagiani -# Contributor: Larry Hajali - -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') #
[arch-commits] Commit in calibre/repos/community-x86_64 (3 files)
Date: Friday, November 8, 2019 @ 02:32:59 Author: eschwartz Revision: 524586 archrelease: copy trunk to community-x86_64 Added: calibre/repos/community-x86_64/PKGBUILD (from rev 524585, calibre/trunk/PKGBUILD) Deleted: calibre/repos/community-x86_64/PKGBUILD calibre/repos/community-x86_64/calibre-qt-5.13.2.patch -+ PKGBUILD| 198 ++ calibre-qt-5.13.2.patch | 166 -- 2 files changed, 96 insertions(+), 268 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2019-11-08 02:32:32 UTC (rev 524585) +++ PKGBUILD2019-11-08 02:32:59 UTC (rev 524586) @@ -1,102 +0,0 @@ -# Maintainer: Jelle van der Waa -# Maintainer: Eli Schwartz -# Contributor: Daniel Wallace -# Contributor: Giovanni Scafora -# Contributor: Petrov Roman -# Contributor: Andrea Fagiani -# Contributor: Larry Hajali - -pkgname=calibre -pkgver=4.2.0 -pkgrel=5 -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' 'pygments' 'pyqt5' 'pyqtwebengine' 'regex') -depends=('chmlib' 'hunspell' 'icu' 'jxrlib' 'libmtp' 'libusbx' 'libwmf' 'mathjax2' 'mtdev' 'optipng' - 'podofo' "${_py_deps[@]/#/python2-}" 'qt5-svg' 'udisks2') -makedepends=('qt5-x11extras' 'rapydscript-ng' 'sip' 'xdg-utils') -checkdepends=('xorg-server-xvfb') -optdepends=('ipython2: to use calibre-debug' -'poppler: required for converting pdf to html') -source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz; -"https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig; - "calibre-qt-5.13.2.patch") -sha256sums=('b1b626acdcc3b29ae96489e7424389161bd6529545f47c0d2b063b99131286d8' -'SKIP' -'c4e952ad1bb15cb0c8c36e34b6f056d4263b74f9322ab611de5a73dd0004f2be') -b2sums=('a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437' -'SKIP' - '1778ba195a5088aa65d74ad22e255200f4d7304ee543077e15b08793cb6877c1e7bf45b9b63fb3beba9d6ad667c1d1ddb3218f9d539e252162fe9f33a5c17616') -validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) - -prepare(){ -cd "${pkgname}-${pkgver}" - -# fix ebook-viewer with Qt 5.13.2 -patch -p1 -i ../calibre-qt-5.13.2.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 - -# cherry-picked bits of python2-backports.functools_lru_cache -# needed for frozen builds + beautifulsoup4 -# see https://github.com/kovidgoyal/calibre/commit/b177f0a1096b4fdabd8772dd9edc2a69e683#commitcomment-33169700 -rm -r src/backports - -cd resources - -# Remove unneeded files -rm ${pkgname}-portable.* mozilla-ca-certs.pem - -# use system mathjax -rm -r mathjax -} - -build() { -cd "${pkgname}-${pkgver}" - -LANG='en_US.UTF-8' python2 setup.py build -LANG='en_US.UTF-8' python2 setup.py gui -LANG='en_US.UTF-8' python2 setup.py mathjax --path-to-mathjax /usr/share/mathjax2 --system-mathjax -LANG='en_US.UTF-8' python2 setup.py rapydscript -} - -check() { -cd "${pkgname}-${pkgver}" - -# without xvfb-run this fails with much "Control socket failed to recv(), resetting" -# ERROR: test_websocket_perf (calibre.srv.tests.web_sockets.WebSocketTest) -LANG='en_US.UTF-8' xvfb-run python2 setup.py test -} - -package() { -cd "${pkgname}-${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' python2 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}}")" -python2 -m compileall -d "${_destdir}" "${_file}" -python2 -O -m compileall -d "${_destdir}" "${_file}" -done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0) -} Copied: calibre/repos/community-x86_64/PKGBUILD (from rev 524585, calibre/trunk/PKGBUILD)
[arch-commits] Commit in calibre/repos/community-x86_64 (3 files)
Date: Sunday, November 3, 2019 @ 03:40:09 Author: eschwartz Revision: 522418 archrelease: copy trunk to community-x86_64 Added: calibre/repos/community-x86_64/PKGBUILD (from rev 522417, calibre/trunk/PKGBUILD) calibre/repos/community-x86_64/calibre-qt-5.13.2.patch (from rev 522417, calibre/trunk/calibre-qt-5.13.2.patch) Deleted: calibre/repos/community-x86_64/PKGBUILD -+ PKGBUILD| 204 +++--- calibre-qt-5.13.2.patch | 166 + 2 files changed, 268 insertions(+), 102 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2019-11-03 03:39:49 UTC (rev 522417) +++ PKGBUILD2019-11-03 03:40:09 UTC (rev 522418) @@ -1,102 +0,0 @@ -# Maintainer: Jelle van der Waa -# Maintainer: Eli Schwartz -# Contributor: Daniel Wallace -# Contributor: Giovanni Scafora -# Contributor: Petrov Roman -# Contributor: Andrea Fagiani -# Contributor: Larry Hajali - -pkgname=calibre -pkgver=4.2.0 -pkgrel=4 -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' 'pygments' 'pyqt5' 'pyqtwebengine' 'regex') -depends=('chmlib' 'hunspell' 'icu' 'jxrlib' 'libmtp' 'libusbx' 'libwmf' 'mathjax2' 'mtdev' 'optipng' - 'podofo' "${_py_deps[@]/#/python2-}" 'qt5-svg' 'udisks2') -makedepends=('qt5-x11extras' 'rapydscript-ng' 'sip' 'xdg-utils') -checkdepends=('xorg-server-xvfb') -optdepends=('ipython2: to use calibre-debug' -'poppler: required for converting pdf to html') -source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz; -"https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig; - calibre-qt-5.13.2.patch::"https://github.com/kovidgoyal/calibre/commit/6cccd18b.patch;) -sha256sums=('b1b626acdcc3b29ae96489e7424389161bd6529545f47c0d2b063b99131286d8' -'SKIP' -'e04ebcae81459b60c9b165ac494d7a5e2cb14a1da2af4b8ad890b0f4f6027fcd') -b2sums=('a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437' -'SKIP' - '5fabab94ed39ef63daa87e3f42b87cc8631113b670eb9698566682d2719c3816e5b54a4c1b49e77a962c82a19c4cb49c81896318f8ce9a8cf37db8a138d4ee2c') -validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) - -prepare(){ -cd "${pkgname}-${pkgver}" - -# fix ebook-viewer with Qt 5.13.2 -patch -p1 -i ../calibre-qt-5.13.2.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 - -# cherry-picked bits of python2-backports.functools_lru_cache -# needed for frozen builds + beautifulsoup4 -# see https://github.com/kovidgoyal/calibre/commit/b177f0a1096b4fdabd8772dd9edc2a69e683#commitcomment-33169700 -rm -r src/backports - -cd resources - -# Remove unneeded files -rm ${pkgname}-portable.* mozilla-ca-certs.pem - -# use system mathjax -rm -r mathjax -} - -build() { -cd "${pkgname}-${pkgver}" - -LANG='en_US.UTF-8' python2 setup.py build -LANG='en_US.UTF-8' python2 setup.py gui -LANG='en_US.UTF-8' python2 setup.py mathjax --path-to-mathjax /usr/share/mathjax2 --system-mathjax -LANG='en_US.UTF-8' python2 setup.py rapydscript -} - -check() { -cd "${pkgname}-${pkgver}" - -# without xvfb-run this fails with much "Control socket failed to recv(), resetting" -# ERROR: test_websocket_perf (calibre.srv.tests.web_sockets.WebSocketTest) -LANG='en_US.UTF-8' xvfb-run python2 setup.py test -} - -package() { -cd "${pkgname}-${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' python2 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}}")" -python2 -m compileall -d "${_destdir}" "${_file}" -python2 -O -m compileall -d "${_destdir}" "${_file}" -done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0) -} Copied:
[arch-commits] Commit in calibre/repos/community-x86_64 (3 files)
Date: Friday, September 28, 2018 @ 05:04:08 Author: eschwartz Revision: 386777 archrelease: copy trunk to community-x86_64 Added: calibre/repos/community-x86_64/PKGBUILD (from rev 386776, calibre/trunk/PKGBUILD) Deleted: calibre/repos/community-x86_64/PKGBUILD calibre/repos/community-x86_64/podofo_0.9.6.patch + PKGBUILD | 183 ++--- podofo_0.9.6.patch | 206 --- 2 files changed, 91 insertions(+), 298 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2018-09-28 05:03:22 UTC (rev 386776) +++ PKGBUILD2018-09-28 05:04:08 UTC (rev 386777) @@ -1,92 +0,0 @@ -# Maintainer: Jelle van der Waa -# Maintainer: Eli Schwartz -# Contributor: Daniel Wallace -# Contributor: Giovanni Scafora -# Contributor: Petrov Roman -# Contributor: Andrea Fagiani -# Contributor: Larry Hajali - -pkgname=calibre -pkgver=3.31.0 -pkgrel=3 -pkgdesc="Ebook management application" -arch=('x86_64') -url="https://calibre-ebook.com/; -license=('GPL3') -depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-dukpy' - 'python2-mechanize' 'podofo' 'libwmf' 'jxrlib' - 'chmlib' 'python2-lxml' 'libusbx' 'python2-html5-parser' - 'python2-pillow' 'shared-mime-info' 'python2-dnspython' 'python2-msgpack' - 'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' 'python2-dbus' - 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit' - 'qt5-svg' 'python2-regex' 'python2-pygments' 'mtdev' 'python2-unrardll' - 'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2') -makedepends=('qt5-x11extras' 'sip' 'xdg-utils') -checkdepends=('xorg-server-xvfb') -optdepends=('ipython2: to use calibre-debug' -'poppler: required for converting pdf to html' -) -source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz; -"https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig; -podofo_0.9.6.patch) -sha256sums=('3c2713a89a186e20d45ea42f2ed6be509fecce880ce6e233e63e6f3a415fe1f5' -'SKIP' -'4243e18653348aed438e28af7268c40ea6047e4b1d2b091faeaa1351572f7873') -validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) - -prepare(){ - cd "${pkgname}-${pkgver}" - - # https://bugs.launchpad.net/bugs/1791430 - patch -Np1 -i ${srcdir}/podofo_0.9.6.patch - - # Remove unneeded files - rm -rf resources/${pkgname}-portable.* - - # Desktop integration (e.g. enforce arch defaults) - sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \ - -e "/cc(\['xdg-mime', 'install', MIME\])/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 -} - -build() { - cd "${pkgname}-${pkgver}" - - LANG='en_US.UTF-8' python2 setup.py build - LANG='en_US.UTF-8' python2 setup.py gui -} - -check() { - cd "${pkgname}-${pkgver}" - - # without xvfb-run this fails with much "Control socket failed to recv(), resetting" - # ERROR: test_websocket_perf (calibre.srv.tests.web_sockets.WebSocketTest) - - LANG='en_US.UTF-8' xvfb-run python2 setup.py test -} - -package() { - cd "${pkgname}-${pkgver}" - - install -d "${pkgdir}/usr/share/zsh/site-functions" \ - "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor} - - install -Dm644 resources/calibre-mimetypes.xml \ -"${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml" - - XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \ -python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr - - cp -a man-pages/ "${pkgdir}/usr/share/man" - - # 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}}")" -python2 -m compileall -d "${_destdir}" "${_file}" -python2 -O -m compileall -d "${_destdir}" "${_file}" - done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0) -} Copied: calibre/repos/community-x86_64/PKGBUILD (from rev 386776, calibre/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2018-09-28 05:04:08 UTC (rev 386777) @@ -0,0 +1,91 @@ +# Maintainer: Jelle van der Waa +# Maintainer: Eli Schwartz +# Contributor: Daniel Wallace +# Contributor: Giovanni Scafora +# Contributor: Petrov Roman +# Contributor: Andrea Fagiani +# Contributor: Larry Hajali + +pkgname=calibre +pkgver=3.32.0 +pkgrel=1 +pkgdesc="Ebook management application" +arch=('x86_64') +url="https://calibre-ebook.com/; +license=('GPL3') +depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-dukpy' +