diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 66fbb20038..de680f4990 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -678,14 +678,14 @@ (define-public mupdf (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 @@ -717,9 +717,9 @@ (define-public qpdf `(("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 @@ -727,7 +727,9 @@ (define-public qpdf 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