From 1e9f667708ba6fdc4b16fe6851bc0ea0b6306fad Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 8 Feb 2021 16:40:17 +0100 Subject: gnu: qpdfview: Fix qt-5.15 compatibility. * gnu/packages/pdf.scm (qpdfview)[source]: Add patch to include a missing header. * gnu/packages/patches/qpdfview-qt515-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Leo Famulari --- 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 66e920a7bb..3063aa10c0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -869,7 +869,8 @@ (define-public qpdfview "trunk/" version "/+download/" "qpdfview-" version ".tar.gz")) (sha256 - (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")))) + (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")) + (patches (search-patches "qpdfview-qt515-compat.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 35089dca4053bf5888441d1648086cdadb6eb1e4 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 7 Feb 2021 12:40:33 +0100 Subject: gnu: Xpdf: Update to 4.03. * gnu/packages/pdf.scm (xpdf): Update to 4.03. [source]: Update URL. [build-system]: Use cmake-build-system. [arguments]: Remove #:parallel-build?, #:configure-flags and #:phases. [inputs]: Add cups, freetype & qtbase. Remove gs-fonts, lesstif, libpaper libx11, libxext, libxp, libxpm & libxt. Signed-off-by: Leo Famulari --- gnu/packages/pdf.scm | 42 ++++++++---------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 3063aa10c0..daea7ee8ad 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -396,47 +396,21 @@ (define-public libharu (define-public xpdf (package (name "xpdf") - (version "4.02") + (version "4.03") (source (origin (method url-fetch) - (uri (string-append "https://xpdfreader-dl.s3.amazonaws.com/xpdf-" - version "4.02.tar.gz")) + (uri (string-append "https://dl.xpdfreader.com/xpdf-" version ".tar.gz")) (sha256 - (base32 "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i")))) - (build-system gnu-build-system) - (inputs `(("freetype" ,freetype) - ("gs-fonts" ,gs-fonts) - ("lesstif" ,lesstif) - ("libpaper" ,libpaper) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxp" ,libxp) - ("libxpm" ,libxpm) - ("libxt" ,libxt) + (base32 "0ip81c9vy0igjnasl9iv2lz214fb01vvvdzbvjmgwc63fi1jgr0g")))) + (build-system cmake-build-system) + (inputs `(("cups" ,cups) + ("freetype" ,freetype) ("libpng" ,libpng) + ("qtbase" ,qtbase) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; there is no check target - #:parallel-build? #f ; build fails randomly on 8-way machines - #:configure-flags - (list (string-append "--with-freetype2-includes=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2")) - #:phases - (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs inputs #:allow-other-keys #:rest args) - (let* ((install (assoc-ref %standard-phases 'install)) - (out (assoc-ref outputs "out")) - (xpdfrc (string-append out "/etc/xpdfrc")) - (gs-fonts (assoc-ref inputs "gs-fonts"))) - (apply install args) - (substitute* xpdfrc - (("/usr/local/share/ghostscript/fonts") - (string-append gs-fonts "/share/fonts/type1/ghostscript")) - (("#fontFile") "fontFile"))) - #t))))) + `(#:tests? #f)) ; there is no check target (synopsis "Viewer for PDF files based on the Motif toolkit") (description "Xpdf is a viewer for Portable Document Format (PDF) files.") -- cgit v1.2.3