diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/pdf.scm | |
parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r-- | gnu/packages/pdf.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index bd7a98c136..c79d941b20 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -633,8 +633,7 @@ by using the poppler rendering engine.") (files '("lib/zathura"))))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.59 - #:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'start-xserver ;; Tests require a running X server. (lambda* (#:key inputs #:allow-other-keys) @@ -1248,7 +1247,7 @@ python-pypdf2 instead.") (define-public pdfarranger (package (name "pdfarranger") - (version "1.8.1") + (version "1.8.2") (source (origin (method git-fetch) @@ -1257,7 +1256,7 @@ python-pypdf2 instead.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lcmlr7x4143f7wcn0m1ijlvch07nww2qfp3jfnacgy889ijvbfx")))) + (base32 "18bpnnwjx72d5ps06dr89mkixiwzc9hf5gr75k8qcnrkshl038v2")))) (build-system python-build-system) (arguments '(#:tests? #f ;no tests @@ -1275,7 +1274,10 @@ python-pypdf2 instead.") (inputs (list gtk+ poppler)) (propagated-inputs - (list img2pdf python-dateutil python-pikepdf python-pycairo + (list img2pdf + python-dateutil + python-pikepdf + python-pycairo python-pygobject)) (home-page "https://github.com/jeromerobert/pdfarranger") (synopsis "Merge, split and re-arrange pages from PDF documents") |