From 6cbee49d6668eb7fd738080666f66febfce8c7e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Mar 2018 07:47:34 -0400 Subject: gnu: All snippets report errors using exceptions, else return #t. * gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm, gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/fpga.scm, gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm, gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm, gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lxde.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm, gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm, gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm, gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm, gnu/packages/pretty-print.scm, gnu/packages/profiling.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm, gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm, gnu/packages/scribus.scm, gnu/packages/sdl.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm, gnu/packages/terminals.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/tls.scm, gnu/packages/unrtf.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: In all snippets, report errors using exceptions, or else return #t. --- gnu/packages/pdf.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 95f42c6751..f1aa958931 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -579,7 +579,7 @@ extracting content or merging files.") (base32 "0b9j0gqbc3jhmx87r6idcsh8lnb30840c3hyx6dk2gdjqqh3hysp")) (modules '((guix build utils))) - (snippet '(delete-file-recursively "thirdparty")))) + (snippet '(begin (delete-file-recursively "thirdparty") #t)))) (build-system gnu-build-system) (inputs `(("curl" ,curl) @@ -631,12 +631,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove ;; dependency on Perl. - '(substitute* "qpdf/fix-qdf" - (("#!/usr/bin/env perl") - "\ + '(begin + (substitute* "qpdf/fix-qdf" + (("#!/usr/bin/env perl") + "\ eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' & eval 'exec perl -wS \"$0\" $argv:q' - if 0;\n"))))) + if 0;\n")) + #t)))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,perl) -- cgit v1.2.3 From b5e530198ab11c511bed0a2d1d12728bd62f1c2c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 18 Mar 2018 23:22:59 -0400 Subject: gnu: qpdf: Return #t from all phases. * gnu/packages/pdf.scm (qpdf)[arguments]: Return #t from 'patch-paths' phase. --- gnu/packages/pdf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f1aa958931..2d2c4d756e 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -652,7 +652,8 @@ eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' (substitute* (append '("qtest/bin/qtest-driver") (find-files "." "\\.test")) - (("/usr/bin/env") (which "env")))))))) + (("/usr/bin/env") (which "env"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit v1.2.3 From 4735610ee34adaa6295f73d1a4d1d37c9aadb78b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Mar 2018 11:32:12 +0100 Subject: gnu: poppler: Update to 0.63.0. * gnu/packages/pdf.scm (poppler): Update to 0.63.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 2d2c4d756e..23d77d2062 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -79,14 +79,14 @@ (define-public poppler (package (name "poppler") - (version "0.62.0") + (version "0.63.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv")))) + "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From d0e888c39dde9459434dbfe9461faca0dcfb9f24 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Apr 2018 14:12:14 -0400 Subject: gnu: xournal: Update to 0.4.8.2016. * gnu/packages/pdf.scm (xournal): Update to 0.4.8.2016. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 84b53b00b4..7762b06ff7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -673,7 +673,7 @@ program capable of converting PDF into other formats.") (define-public xournal (package (name "xournal") - (version "0.4.8") + (version "0.4.8.2016") (source (origin (method url-fetch) @@ -681,7 +681,7 @@ program capable of converting PDF into other formats.") "/xournal-" version ".tar.gz")) (sha256 (base32 - "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13")))) + "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j")))) (build-system gnu-build-system) (inputs `(("gtk" ,gtk+-2) -- cgit v1.2.3 From 6d161406659fd9166da81162db8b2f42de1cd50b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 27 Apr 2018 22:03:03 -0400 Subject: gnu: Add poppler-data. * gnu/packages/pdf.scm (poppler-data): New variable. --- gnu/packages/pdf.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7762b06ff7..9e5af5f011 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2016 Arun Isaac -;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -124,6 +124,36 @@ (license license:gpl2+) (home-page "https://poppler.freedesktop.org/"))) +(define-public poppler-data + (package + (name "poppler-data") + (version "0.4.9") + (source (origin + (method url-fetch) + (uri (string-append "https://poppler.freedesktop.org/poppler-data" + "-" version ".tar.gz")) + (sha256 + (base32 + "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no test suite + #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; The package only provides some data files, so there is nothing to + ;; build. + (delete 'configure) + (delete 'build)))) + (synopsis "Poppler encoding files for rendering of CJK and Cyrillic text") + (description "This package provides optional encoding files for Poppler. +When present, Poppler is able to correctly render CJK and Cyrillic text.") + (home-page (package-home-page poppler)) + ;; See COPYING in the source distribution for more information about + ;; the licensing. + (license (list license:bsd-3 + license:gpl2)))) + (define-public poppler-qt4 (package (inherit poppler) (name "poppler-qt4") -- cgit v1.2.3 From 2b79c6833d5b6728edf859f7e885ed397b77bedc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 May 2018 12:04:30 +0300 Subject: gnu: mupdf: Update to 1.13.0. * gnu/packages/pdf.scm (mupdf): Update to 1.13.0. [source]: Remove patches. * gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch, gnu/packages/patches/mupdf-CVE-2017-17858.patch, gnu/packages/patches/mupdf-CVE-2018-6544.patch, gnu/packages/patches/mupdf-CVE-2018-1000051.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/packages/pdf.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9e5af5f011..fd494739c3 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Nils Gillmann -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 Julien Lepiller @@ -597,21 +597,17 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (string-append "https://mupdf.com/downloads/archive/" name "-" version "-source.tar.xz")) - (patches (search-patches "mupdf-build-with-latest-openjpeg.patch" - "mupdf-CVE-2017-17858.patch" - "mupdf-CVE-2018-6544.patch" - "mupdf-CVE-2018-1000051.patch")) (sha256 (base32 - "0b9j0gqbc3jhmx87r6idcsh8lnb30840c3hyx6dk2gdjqqh3hysp")) + "0129k92bav692l6lyw10ryldx7h2f9khjpgnp3f3n4fdsph9hrkl")) (modules '((guix build utils))) - (snippet '(delete-file-recursively "thirdparty")))) + (snippet '(begin (delete-file-recursively "thirdparty") #t)))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 49d85a19fbb072e3d02e96e1f72eca745a73e4e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Jun 2018 01:11:16 +0200 Subject: gnu: pdfgrep: Update to 2.1.1. * gnu/packages/pdf.scm (pdfgrep): Update to 2.1.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index fd494739c3..e531210d42 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -982,7 +982,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.") (define-public pdfgrep (package (name "pdfgrep") - (version "2.0.1") + (version "2.1.1") (source (origin (method url-fetch) @@ -990,7 +990,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.") name "-" version ".tar.gz")) (sha256 (base32 - "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03")))) + "02qcl5kmr5qzjfc99qpbpfb1890bxlrq3r208gnding51zrmb09c")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3