[bug#34198] [PATCH 0/2] Add diffpdf.

[bug#34198] [PATCH 0/2] Add diffpdf.

[Danny Milosavljevic]

Danny Milosavljevic (2):
  gnu: poppler-qt4: Enable qt4 frontend.
  gnu: Add diffpdf.

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

[bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.

[Danny Milosavljevic]

* 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")))

[bug#34198] [PATCH 2/2] gnu: Add diffpdf.

[Danny Milosavljevic]

* 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)))

[bug#34198] [PATCH 2/2] gnu: Add diffpdf.

[Ricardo Wurmus]

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

[bug#34198] [PATCH 2/2] gnu: Add diffpdf.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

Hi Ricardo,

On Tue, 29 Jan 2019 18:08:45 +0100
Ricardo Wurmus <rekado@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!

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.

[Ricardo Wurmus]

Danny Milosavljevic <dannym@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

[bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

Hi Ricardo,

On Tue, 29 Jan 2019 18:05:22 +0100
Ricardo Wurmus <rekado@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.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 875 bytes --]

Danny Milosavljevic <dannym@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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#34198: Closing

[Andreas Enge]

There seems to be consensus to not add this package, since Qt4 is being
phased out. Closing.

Andreas