From patchwork Fri Jan 25 16:48:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 818 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8753716AAC; Fri, 25 Jan 2019 16:49:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3DF6A16AAA for ; Fri, 25 Jan 2019 16:49:13 +0000 (GMT) Received: from localhost ([127.0.0.1]:47225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn4fI-0007oL-Ry for patchwork@mira.cbaines.net; Fri, 25 Jan 2019 11:49:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn4fB-0007k6-6n for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn4f8-0000pd-GU for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gn4f8-0000pQ-DR for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gn4f8-0000En-4o for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34198] [PATCH 1/2] gnu: poppler-qt4: Enable qt4 frontend. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jan 2019 16:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34198@debbugs.gnu.org Received: via spool by 34198-submit@debbugs.gnu.org id=B34198.1548434893841 (code B ref 34198); Fri, 25 Jan 2019 16:49:02 +0000 Received: (at 34198) by debbugs.gnu.org; 25 Jan 2019 16:48:13 +0000 Received: from localhost ([127.0.0.1]:45466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gn4eL-0000DT-2P for submit@debbugs.gnu.org; Fri, 25 Jan 2019 11:48:13 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:49238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gn4eG-0000DH-Jf for 34198@debbugs.gnu.org; Fri, 25 Jan 2019 11:48:10 -0500 Received: from dayas.3.home (178.113.131.130.wireless.dyn.drei.com [178.113.131.130]) by dd26836.kasserver.com (Postfix) with ESMTPSA id DAD8B3360496; Fri, 25 Jan 2019 17:48:06 +0100 (CET) From: Danny Milosavljevic Date: Fri, 25 Jan 2019 17:48:01 +0100 Message-Id: <20190125164802.17853-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190125164347.17780-1-dannym@scratchpost.org> References: <20190125164347.17780-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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"))) From patchwork Fri Jan 25 16:48:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 819 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6DD0316AAC; Fri, 25 Jan 2019 16:49:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EF19A16AAA for ; Fri, 25 Jan 2019 16:49:20 +0000 (GMT) Received: from localhost ([127.0.0.1]:47231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn4fQ-0007wf-JY for patchwork@mira.cbaines.net; Fri, 25 Jan 2019 11:49:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn4fC-0007kb-7O for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn4f8-0000po-TG for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gn4f8-0000pj-PO for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gn4f8-0000Eu-L5 for guix-patches@gnu.org; Fri, 25 Jan 2019 11:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34198] [PATCH 2/2] gnu: Add diffpdf. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jan 2019 16:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34198@debbugs.gnu.org Received: via spool by 34198-submit@debbugs.gnu.org id=B34198.1548434895855 (code B ref 34198); Fri, 25 Jan 2019 16:49:02 +0000 Received: (at 34198) by debbugs.gnu.org; 25 Jan 2019 16:48:15 +0000 Received: from localhost ([127.0.0.1]:45469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gn4eN-0000Dj-CL for submit@debbugs.gnu.org; Fri, 25 Jan 2019 11:48:15 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:49250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gn4eK-0000DU-C9 for 34198@debbugs.gnu.org; Fri, 25 Jan 2019 11:48:13 -0500 Received: from dayas.3.home (178.113.131.130.wireless.dyn.drei.com [178.113.131.130]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 658F13360496; Fri, 25 Jan 2019 17:48:11 +0100 (CET) From: Danny Milosavljevic Date: Fri, 25 Jan 2019 17:48:02 +0100 Message-Id: <20190125164802.17853-2-dannym@scratchpost.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190125164802.17853-1-dannym@scratchpost.org> References: <20190125164347.17780-1-dannym@scratchpost.org> <20190125164802.17853-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)))