This is in preparation of the qtsvg update to version 6.
This change was automated via the following command:
git grep -l '\bqtsvg\b' | xargs sed 's/qtsvg/qtsvg-5/g' -i
See <https://issues.guix.gnu.org/53289> for more information about this change.
* gnu/packages/ebook.scm (calibre)[inputs]: Replace python-pyqt with
python-pyqt-without-qtwebkit.
[arguments]: Adjust the custom 'configure' phase accordingly.
Fixes <https://issues.guix.gnu.org/53247>.
* gnu/packages/patches/calibre-fix-zeroconf.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ebook.scm (calibre)[source]: Use it.
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
This change was automated via the following command:
$ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g'
$ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g'
$ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g'
$ git checkout etc # to clear some spurious changes
This is done so the qtbase package can be upgraded to version 6 in the
following commit.
* guix/build/utils.scm (wrap-program): The wrapper? procedure is
incorrectly named as it actually checks to see if prog is the
original program that was moved, not the wrapper.
* guix/build/python-build-system: (wrap): Use renamed wrapped-program?.
* gnu/packages/ebook.scm (calibre)[arguments]: Likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
* gnu/packages/ebook.scm (calibre): Update to 5.14.0.
[source]: Adjust the snippet to preserve some files used by the HTML reader.
[native-inputs]: Add python-pyqt-builder. Replace python2-flake8 with
python-flake8.
[inputs]: Remove chmlib, js-mathjax, python-chardet, and python-sip. Add
python-cchardet, python-speechd, python-zeroconf, python-py7zr, python-pychm,
python-pycryptodome, libjpeg, and libjxr. Replace all Python 2 dependencies
with their Python 3 equivalents.
[arguments]: Build with the default Python and adjust custom phases accordingly.
Adjust the 'configure' phase to changes in how Calibre uses SIP, and patch
lookup paths for libjpeg and libjxr.
Rename the 'build-extra' phase to 'install-rapydscript', and run it after the
'install' phase. Adjust it for Calibre 5.14.0.
* gnu/packages/patches/calibre-no-updates-dialog.patch,
gnu/packages/patches/calibre-remove-test-sqlite.patch,
gnu/packages/patches/calibre-remove-test-unrar.patch: Adjust patches for Calibre
5.14.0.
Even thought this is named PATH, it's not a search path, instead the value is
assumed to be the location of the executable.
* gnu/packages/ebook.scm (calibre)[arguments]: Fix QTWEBENGINEPROCESS_PATH
wrapping.
Signed-off-by: Christopher Baines <mail@cbaines.net>
* gnu/packages/ebook.scm (cozy): Update to 0.7.1.
[arguments]: Substitute only the Exec line in the desktop file.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Based on the suggestion of the author, this commit cleans up the
changes introduced by fd3eac4dd7
For more information, see: https://issues.guix.gnu.org/43249
* gnu/packages/e-book.scm (calibre):
[arguments]: Remove the manual 'wrap phase replacement and add a
'wrap-program phase after standard 'wrap phase to make the runtime
dependency QtWebEngineProcess available to the binaries.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
* gnu/packages/ebook.scm (calibre): Wrap QTWEBENGINEPROCESS_PATH in
addition to wrapping PYTHONPATH as python-build-system does.
Signed-off-by: Andreas Enge <andreas@enge.fr>
