From patchwork Thu Sep 8 19:51:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 42341 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 4D5F927BBEA; Thu, 8 Sep 2022 20:54:11 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 E6AF927BBE9 for ; Thu, 8 Sep 2022 20:54:10 +0100 (BST) Received: from localhost ([::1]:52144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWNbG-00089l-3N for patchwork@mira.cbaines.net; Thu, 08 Sep 2022 15:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWNZC-000590-Jf for guix-patches@gnu.org; Thu, 08 Sep 2022 15:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWNZC-0000Er-BV for guix-patches@gnu.org; Thu, 08 Sep 2022 15:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWNZC-0004ci-7H for guix-patches@gnu.org; Thu, 08 Sep 2022 15:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57685] [PATCH] gnu: libharu: Update to 2.4.1. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Sep 2022 19:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57685 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57685@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166266669617736 (code B ref -1); Thu, 08 Sep 2022 19:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2022 19:51:36 +0000 Received: from localhost ([127.0.0.1]:60149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWNYl-0004bz-UX for submit@debbugs.gnu.org; Thu, 08 Sep 2022 15:51:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:41252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWNYk-0004bs-84 for submit@debbugs.gnu.org; Thu, 08 Sep 2022 15:51:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWNYi-00048u-Dd for guix-patches@gnu.org; Thu, 08 Sep 2022 15:51:32 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:42277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWNYe-00005f-1Y for guix-patches@gnu.org; Thu, 08 Sep 2022 15:51:31 -0400 Date: Thu, 08 Sep 2022 19:51:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1662666682; x=1662925882; bh=VAbmhZshay7A5xB5tssLzfv56XeH2OS2OczCUtvtjQw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=J6df0yZ9cMnCB2O+evECmHGJYKTeIjEyHPogoBvW5zvo8kRsi62gVX6aMFr6OPDAo EZWVdOvd2NdPGbY2eENcrZzaxL4FPYvPPl4xHQqT1GfgpkCaVX0ubtM7B34OyiQY6h h4sUGogBLg2vIRiKlQGoiX6urPD5F+voChtgNqpqbp++hOk84WU4KGlrotyiVrTgrN YhvPZsm6y0I6+UbRS+qqJk25MIdSX/RI1UhAZVItV5wFHb1WhD3eSeaVso5yBx4H/I SRiRwfgp1bwL3P+sfT7A19qabUgI4MwokLOShSo9NzJ+0IUEz5gas5E/eJvZ7QUNMs hoBSUtgxfq31Q== From: "Paul A. Patience" Message-ID: <20220908195104.346056-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail-4018.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pdf.scm (libharu): Update to 2.4.1. [build-system]: Switch to cmake-build-system. [arguments]: Remove #:configure-flags, add #:tests? and #:phases. [inputs]: Sort them. [native-inputs]: Remove. --- gnu/packages/pdf.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) -- 2.37.3 diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 14f75d9ef9..d449d36818 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,29 +364,30 @@ (define-public python-poppler-qt5 (define-public libharu (package (name "libharu") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libharu/libharu") - (commit (string-append - "RELEASE_" - (string-join (string-split version #\.) "_"))))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q")))) - (build-system gnu-build-system) + (version "2.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libharu/libharu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0371ba8ffqczdw7xnkx6pkjdbgw8s2yvqp7b8j0n2ky9cx4ga8v4")))) + (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-zlib=" - (assoc-ref %build-inputs "zlib")) - (string-append "--with-png=" - (assoc-ref %build-inputs "libpng"))))) + (list #:tests? #f ; No tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("^install\\(FILES (README\\.md CHANGES) INSTALL DESTINATION .*\\)" + _ files) + (format #f "install(FILES ~a DESTINATION ~a/share/doc/~a-~a)" + files #$output #$name #$version)))))))) (inputs - (list zlib libpng)) - (native-inputs - (list autoconf automake libtool)) + (list libpng zlib)) (home-page "http://libharu.org/") (synopsis "Library for generating PDF files") (description