Subject: bug#46357: closed (Re: [bug#46357] [PATCH] gnu: xpdf: Update to 4.03.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 09 Feb 2021 20:46:02 +0000

Your bug report

#46357: [PATCH] gnu: xpdf: Update to 4.03.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
46357: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=46357
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#46357] [PATCH] gnu: xpdf: Update to 4.03.
From: Leo Famulari <[email-masked]>
To: Vincent Legoll <[email-masked]>
Cc: [email-masked]
Date: Tue, 9 Feb 2021 15:45:36 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

On Sun, Feb 07, 2021 at 12:40:33PM +0100, Vincent Legoll wrote:
> * gnu/packages/pdf.scm (xpdf): Update to 4.03.
> (source): Use a "dl.xpdfreader.com" 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.

Thank you for taking care of this complicated update!

I tweaked the commit message and pushed as
35089dca4053bf5888441d1648086cdadb6eb1e4

I made the commit message like this:

------
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.
------

The important difference is the use of () and [].

Basically, when we make changes to variables and functions — things that
are explicitly defined or exported — we put their names (parentheses).

Then, we describe changes to their components or fields in [brackets].

Does that make sense? I would have tweaked the commit message for your
vorbis-tools commit but I didn't notice the "(source)".

The general format, GNU ChangeLog, is described here:

https://www.gnu.org/prep/standards/html_node/Change-Logs.html

Subject: [PATCH] gnu: xpdf: Update to 4.03.
From: Vincent Legoll <[email-masked]>
To: [email-masked]
Cc: Vincent Legoll <[email-masked]>
Date: Sun, 7 Feb 2021 12:38:47 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/pdf.scm (xpdf): Update to 4.03.
(source): Use a "dl.xpdfreader.com" 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.
---
 gnu/packages/pdf.scm | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 66e920a7bb..b69f8d6536 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -396,15 +396,14 @@ reading and editing of existing PDF files.")
 (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)
+       (base32 "0ip81c9vy0igjnasl9iv2lz214fb01vvvdzbvjmgwc63fi1jgr0g"))))
+   (build-system cmake-build-system)
    (inputs `(("freetype" ,freetype)
              ("gs-fonts" ,gs-fonts)
              ("lesstif" ,lesstif)
@@ -417,26 +416,7 @@ reading and editing of existing PDF files.")
              ("libpng" ,libpng)
              ("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.")
-- 
2.30.0