GNU bug report logs - #34198
[PATCH 0/2] Add diffpdf.

Previous Next

Package: guix-patches;

Reported by: Danny Milosavljevic <dannym <at> scratchpost.org>

Date: Fri, 25 Jan 2019 16:45:01 UTC

Severity: normal

Tags: patch

Done: Andreas Enge <andreas <at> enge.fr>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34198 in the body.
You can then email your comments to 34198 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Fri, 25 Jan 2019 16:45:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 25 Jan 2019 16:45:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: guix-patches <at> gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH 0/2] Add diffpdf.
Date: Fri, 25 Jan 2019 17:43:47 +0100
Danny Milosavljevic (2):
  gnu: poppler-qt4: Enable qt4 frontend.
  gnu: Add diffpdf.

 gnu/packages/pdf.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)





Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Fri, 25 Jan 2019 16:49:02 GMT) Full text and rfc822 format available.

Message #8 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 34198 <at> debbugs.gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.
Date: Fri, 25 Jan 2019 17:48:01 +0100
* gnu/packages/pdf.scm (poppler-qt4)[version]: Downgrade to 0.61.1.
[source]: Apply CVE patch.
---
 gnu/packages/pdf.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 96c0f9e3a..956e25c6d 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -174,6 +174,16 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
 (define-public poppler-qt4
   (package/inherit poppler
    (name "poppler-qt4")
+   (version "0.61.1")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "https://poppler.freedesktop.org/poppler-"
+                                version ".tar.xz"))
+            (sha256
+             (base32
+              "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"))
+            (patches
+             (append (search-patches "poppler-CVE-2018-19149.patch")))))
    (inputs `(("qt-4" ,qt-4)
              ,@(package-inputs poppler)))
    (synopsis "Qt4 frontend for the Poppler PDF rendering library")))




Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Fri, 25 Jan 2019 16:49:02 GMT) Full text and rfc822 format available.

Message #11 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: 34198 <at> debbugs.gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH 2/2] gnu: Add diffpdf.
Date: Fri, 25 Jan 2019 17:48:02 +0100
* gnu/packages/pdf.scm (diffpdf): New variable.
---
 gnu/packages/pdf.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 956e25c6d..3b695f3a6 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1130,3 +1130,46 @@ presentation.  The input files processed by pdfpc are PDF documents.")
 rendering of the file.  The rendering is done by creating outline curves
 through the Pango @code{ft2} backend.")
       (license license:lgpl2.0+))))
+
+(define-public diffpdf
+  (package
+    (name "diffpdf")
+    (version "2.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.qtrac.eu/diffpdf-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "diffpdf.pro"
+              (("-lpoppler-qt4")
+               (string-append "-L" (assoc-ref inputs "poppler-qt4")
+                              "/lib -lpoppler-qt4"))
+              (("/usr/local/include/poppler")
+               (string-append (assoc-ref inputs "poppler-qt4")
+                              "/include/poppler")))
+             #t))
+         (replace 'configure
+           (lambda _
+             (invoke "lrelease" "diffpdf.pro")
+             (invoke "qmake")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (out-bin (string-append out "/bin")))
+               (install-file "diffpdf" out-bin)
+               #t))))))
+    (inputs
+     `(("poppler-qt4" ,poppler-qt4) ; at least 0.20.1
+       ("qt-4" ,qt-4)))
+    (home-page "http://www.qtrac.eu/diffpdf-foss.html")
+    (synopsis "Compare two PDF files")
+    (description "This package provides a GUI tool to compare two PDF files.")
+    (license license:gpl2)))




Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Tue, 29 Jan 2019 17:55:02 GMT) Full text and rfc822 format available.

Message #14 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 34198 <at> debbugs.gnu.org
Subject: Re: [bug#34198] [PATCH 2/2] gnu: Add diffpdf.
Date: Tue, 29 Jan 2019 18:08:45 +0100
Hi Danny,

> * gnu/packages/pdf.scm (diffpdf): New variable.
[…]
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-paths
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "diffpdf.pro"
> +              (("-lpoppler-qt4")
> +               (string-append "-L" (assoc-ref inputs "poppler-qt4")
> +                              "/lib -lpoppler-qt4"))

Is this really necessary?  Shouldn’t it be enough to have this directory
on LIBRARY_PATH at build time?

> +    (inputs
> +     `(("poppler-qt4" ,poppler-qt4) ; at least 0.20.1
> +       ("qt-4" ,qt-4)))

I was hoping we could get rid of Qt 4 in the near future, because it
doesn’t get security fixes.  Is there no Qt 5 variant?

> +    (home-page "http://www.qtrac.eu/diffpdf-foss.html")
> +    (synopsis "Compare two PDF files")
> +    (description "This package provides a GUI tool to compare two PDF files.")
> +    (license license:gpl2)))

Looks like GPLv2 or later.

--
Ricardo





Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Tue, 29 Jan 2019 18:52:02 GMT) Full text and rfc822 format available.

Message #17 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 34198 <at> debbugs.gnu.org
Subject: Re: [bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.
Date: Tue, 29 Jan 2019 18:05:22 +0100
Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> * gnu/packages/pdf.scm (poppler-qt4)[version]: Downgrade to 0.61.1.
> [source]: Apply CVE patch.
> ---
>  gnu/packages/pdf.scm | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index 96c0f9e3a..956e25c6d 100644
> --- a/gnu/packages/pdf.scm
> +++ b/gnu/packages/pdf.scm
> @@ -174,6 +174,16 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
>  (define-public poppler-qt4
>    (package/inherit poppler
>     (name "poppler-qt4")
> +   (version "0.61.1")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append "https://poppler.freedesktop.org/poppler-"
> +                                version ".tar.xz"))
> +            (sha256
> +             (base32
> +              "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"))
> +            (patches
> +             (append (search-patches "poppler-CVE-2018-19149.patch")))))
>     (inputs `(("qt-4" ,qt-4)
>               ,@(package-inputs poppler)))
>     (synopsis "Qt4 frontend for the Poppler PDF rendering library")))

Could the previous higher version of the package not be built?
Otherwise we’d have to deal with the downgrade somehow to make sure that
installed packages get downgraded to this version as well.

-- 
Ricardo





Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Tue, 29 Jan 2019 20:11:01 GMT) Full text and rfc822 format available.

Message #20 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 34198 <at> debbugs.gnu.org
Subject: Re: [bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.
Date: Tue, 29 Jan 2019 21:09:59 +0100
[Message part 1 (text/plain, inline)]
Hi Ricardo,

On Tue, 29 Jan 2019 18:05:22 +0100
Ricardo Wurmus <rekado <at> elephly.net> wrote:

> Could the previous higher version of the package not be built?
> Otherwise we’d have to deal with the downgrade somehow to make sure that
> installed packages get downgraded to this version as well.

It could technically be built, but it was missing the qt4 frontend because
newer poppler versions had removed it from its source entirely.

Nobody else uses poppler-qt4 in Guix - otherwise the client would have noticed
that it did not work at all.

I just needed a PDF differ which requires poppler-qt4, so I fixed poppler-qt4.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Tue, 29 Jan 2019 20:13:02 GMT) Full text and rfc822 format available.

Message #23 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 34198 <at> debbugs.gnu.org
Subject: Re: [bug#34198] [PATCH 2/2] gnu: Add diffpdf.
Date: Tue, 29 Jan 2019 21:12:09 +0100
[Message part 1 (text/plain, inline)]
Hi Ricardo,

On Tue, 29 Jan 2019 18:08:45 +0100
Ricardo Wurmus <rekado <at> elephly.net> wrote:

> I was hoping we could get rid of Qt 4 in the near future, because it
> doesn’t get security fixes.  Is there no Qt 5 variant?

No.  The company seems to write proprietary Windows solutions now.

Kudos to them for keeping the FOSS version on their homepage anyway.

> Looks like GPLv2 or later.

Thanks for the review!
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34198; Package guix-patches. (Thu, 31 Jan 2019 22:00:02 GMT) Full text and rfc822 format available.

Message #26 received at 34198 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>, 34198 <at> debbugs.gnu.org
Subject: Re: [bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.
Date: Thu, 31 Jan 2019 22:59:02 +0100
[Message part 1 (text/plain, inline)]
Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> * gnu/packages/pdf.scm (poppler-qt4)[version]: Downgrade to 0.61.1.
> [source]: Apply CVE patch.
> ---
>  gnu/packages/pdf.scm | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index 96c0f9e3a..956e25c6d 100644
> --- a/gnu/packages/pdf.scm
> +++ b/gnu/packages/pdf.scm
> @@ -174,6 +174,16 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
>  (define-public poppler-qt4
>    (package/inherit poppler
>     (name "poppler-qt4")
> +   (version "0.61.1")
> +   (source (origin

Since this adds a completely different source I think package/inherit is
inappropriate, because we no longer want Poppler grafts applying here.

That said, I would rather we abandoned this package, since Qt4 is
unmaintained for a really long time now.
[signature.asc (application/pgp-signature, inline)]

Reply sent to Andreas Enge <andreas <at> enge.fr>:
You have taken responsibility. (Sat, 05 Sep 2020 20:48:02 GMT) Full text and rfc822 format available.

Notification sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
bug acknowledged by developer. (Sat, 05 Sep 2020 20:48:02 GMT) Full text and rfc822 format available.

Message #31 received at 34198-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 34198-done <at> debbugs.gnu.org
Subject: Closing
Date: Sat, 5 Sep 2020 22:47:23 +0200
There seems to be consensus to not add this package, since Qt4 is being
phased out. Closing.

Andreas





bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sun, 04 Oct 2020 11:24:11 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 205 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.