diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:08 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2018-08-13 20:39:32 +0200 |
commit | b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c (patch) | |
tree | 01c8ec8d4172c2834bef1e8859d6ca8b99338470 /gnu/packages/pdf.scm | |
parent | 25bd72678ae4048b0b84ee82bc5f2644367e9715 (diff) | |
parent | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (diff) | |
download | patches-b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c.tar patches-b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r-- | gnu/packages/pdf.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f5f4f95b71..4026fa2092 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -644,14 +644,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "6.0.0") + (version "8.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0csj2p2gkxrc0rk8ykymlsdgfas96vzf1dip3y1x7z1q9plwgzd9")) + "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove @@ -683,9 +683,9 @@ eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' `(("pkg-config" ,pkg-config) ("perl" ,perl))) (propagated-inputs - `(("pcre" ,pcre))) - (inputs - `(("zlib" ,zlib))) + ;; In Requires.private of libqpdf.pc. + `(("libjpeg-turbo" ,libjpeg-turbo) + ("zlib" ,zlib))) (synopsis "Command-line tools and library for transforming PDF files") (description "QPDF is a command-line program that does structural, content-preserving @@ -693,7 +693,9 @@ transformations on PDF files. It could have been called something like pdf-to-pdf. It includes support for merging and splitting PDFs and to manipulate the list of pages in a PDF file. It is not a PDF viewer or a program capable of converting PDF into other formats.") - (license license:clarified-artistic) + ;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0. + ;; Users can still choose to use the old license at their option. + (license (list license:asl2.0 license:clarified-artistic)) (home-page "http://qpdf.sourceforge.net/"))) (define-public xournal |