diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-04-16 14:39:48 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-04-16 14:39:48 +0300 |
| commit | fcc39864dba82e14895afbe841091091366c96bc (patch) | |
| tree | 6e0f05495fd6512051224dc85fd3ab495cbf1a24 /gnu/packages/pdf.scm | |
| parent | 76fc36d0a7215979bb74c05840f5a4de4ab5ea93 (diff) | |
| parent | 44f9432705d04c069a8acf9e37e3ad856ac0bf82 (diff) | |
| download | guix-fcc39864dba82e14895afbe841091091366c96bc.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: gnu/local.mk gnu/packages/boost.scm gnu/packages/chez.scm gnu/packages/compression.scm gnu/packages/crates-io.scm gnu/packages/docbook.scm gnu/packages/engineering.scm gnu/packages/gcc.scm gnu/packages/gl.scm gnu/packages/gtk.scm gnu/packages/nettle.scm gnu/packages/python-check.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/rust.scm gnu/packages/sqlite.scm guix/build-system/node.scm
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 437000b7c0..689d03afc8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -299,13 +299,6 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) -(define-public poppler-qt4 - (package/inherit poppler - (name "poppler-qt4") - (inputs `(("qt-4" ,qt-4) - ,@(package-inputs poppler))) - (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) - (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") @@ -316,14 +309,14 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (define-public python-poppler-qt5 (package (name "python-poppler-qt5") - (version "0.24.2") + (version "21.1.0") (source (origin (method url-fetch) (uri (pypi-uri "python-poppler-qt5" version)) (sha256 (base32 - "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r")))) + "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd")))) (build-system python-build-system) (arguments `(;; There are no tests. The check phase just causes a rebuild. @@ -346,7 +339,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python-sip" ,python-sip) + `(("python-sip" ,python-sip-4) ("python-pyqt" ,python-pyqt) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase))) |