From patchwork Sun Apr 30 20:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 49717 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 9428F27BBE9; Sun, 30 Apr 2023 21:47:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 288DD27BBE2 for ; Sun, 30 Apr 2023 21:47:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptDwm-0004Th-S2; Sun, 30 Apr 2023 16:47:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptDwl-0004TB-AH for guix-patches@gnu.org; Sun, 30 Apr 2023 16:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptDwk-00037f-Tp for guix-patches@gnu.org; Sun, 30 Apr 2023 16:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptDwk-0005tD-HT for guix-patches@gnu.org; Sun, 30 Apr 2023 16:47:02 -0400 Subject: bug#63021: [PATCH] gnu: Add diffpdf. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 30 Apr 2023 20:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 63021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion Cc: 63021-done@debbugs.gnu.org Mail-Followup-To: 63021@debbugs.gnu.org, ludo@gnu.org, olivier.dion@polymtl.ca Received: via spool by 63021-done@debbugs.gnu.org id=D63021.168288760322598 (code D ref 63021); Sun, 30 Apr 2023 20:47:02 +0000 Received: (at 63021-done) by debbugs.gnu.org; 30 Apr 2023 20:46:43 +0000 Received: from localhost ([127.0.0.1]:38423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptDwR-0005sN-3n for submit@debbugs.gnu.org; Sun, 30 Apr 2023 16:46:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptDwP-0005s9-Ml for 63021-done@debbugs.gnu.org; Sun, 30 Apr 2023 16:46:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptDwK-0002wj-6e; Sun, 30 Apr 2023 16:46:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=0AdTyk6dlovSxVK6NAMjSKWtSR1XFopRq3Hes1nu+Ao=; b=LVhYLMQuxGfqw/pFU0Dc MMTt3xBFm5ZCOOdq4rOj1SoDEuwt8aFdTWRHfSq0qW10gtmxmT6If4Jr/UQT16CwyKYXvJwl7gQ2o 3nQs1HHbDf1yng29eYeNnyzFTnbd7sgotPF8CiDBd8OAfG5a1XmyAl+Gljj0i3nlLu1OBvIr+H2lm DRheQDk/G+lAzrrSVPYu6DB2E/mLY5liSj5xk9VJzYA/o2+CAadu7n2Ma79TazE8l7F/sWojYClnv cNswYz321Nc2vMkRtpLYVsoUtZMbmj/5BPa79a0vl4yJpnxFW36cyyumj/uVQfGXwSvcK+w22xYYs RJcBfBl7e0dkHQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptDwJ-0000wh-Qu; Sun, 30 Apr 2023 16:46:36 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20230422165710.13418-1-olivier.dion@polymtl.ca> Date: Sun, 30 Apr 2023 22:46:33 +0200 In-Reply-To: <20230422165710.13418-1-olivier.dion@polymtl.ca> (Olivier Dion's message of "Sat, 22 Apr 2023 12:57:10 -0400") Message-ID: <87a5ypqes6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Olivier Dion skribis: > * gnu/packages/pdf.scm (diffpdf): New variable. Applied with the changes below: addressing ‘guix lint’ warnings, using a version string that matches the latest tag, and passing it through ‘guix style’. Ludo’. diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6eea3c68d0..ddac5537f0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -168,35 +168,30 @@ (define-public a4pdf (license license:asl2.0))) (define-public diffpdf - (let ((commit "ba68231d3d05e0cb3a2d4a4fca8b70d4044f4303")) + (let ((commit "ba68231d3d05e0cb3a2d4a4fca8b70d4044f4303") + (revision "1")) (package (name "diffpdf") - (version "2.1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/eang/diffpdf") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1vwgv28b291lrcs9fljnlbnicv16lwj4vvl4bz6w3ldp9n5isjmf")))) + (version (git-version "2.1.3.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/eang/diffpdf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vwgv28b291lrcs9fljnlbnicv16lwj4vvl4bz6w3ldp9n5isjmf")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) - (inputs - (list - extra-cmake-modules - qtbase-5 - qttools-5 - poppler-qt5)) - (native-inputs - (list pkg-config)) + (inputs (list qtbase-5 qttools-5 poppler-qt5)) + (native-inputs (list pkg-config extra-cmake-modules)) (home-page "http://www.qtrac.eu/diffpdf-foss.html") (synopsis "Compare two PDF files") (description - "@command{diffpdf} offers three comparison modes: Words, Characters, -and Appearance.") + "@command{diffpdf} lets you compare PDF files, offering three +comparison modes: words, characters, and appearance.") (license license:gpl2)))) (define-public extractpdfmark