From patchwork Mon Sep 12 19:25:32 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: 42568 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 9224D27BBEA; Mon, 12 Sep 2022 20:26:42 +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 4248F27BBE9 for ; Mon, 12 Sep 2022 20:26:42 +0100 (BST) Received: from localhost ([::1]:59812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXp4r-0000qM-8E for patchwork@mira.cbaines.net; Mon, 12 Sep 2022 15:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXp4F-0000oz-8y for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59391) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXp4F-00011N-0c for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXp4E-0000PD-Pr for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57685] [PATCH v2 1/3] gnu: libharu: Update to 2.4.2. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Sep 2022 19:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57685 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57685@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 57685-submit@debbugs.gnu.org id=B57685.16630107521511 (code B ref 57685); Mon, 12 Sep 2022 19:26:02 +0000 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:52 +0000 Received: from localhost ([127.0.0.1]:48081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp44-0000OI-6q for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:52 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:33457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp41-0000Nw-IL for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:50 -0400 Date: Mon, 12 Sep 2022 19:25:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010743; x=1663269943; bh=r5IpmSzNLXK/UnQqOfL5i2Gn1mw4pGofLtxhuKTrJOM=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=CLzNal7I7KOxPJKG0PibP3Gfbdqcx7oSs3KcLLrcJgvraw9AWgM18/E/pGfBldcZF aq6DqlHwiin06YUwB//8bKdXjI+x7M7rdPu6Ifjrn2unsH/axCmGYUT04r76rsDsvq tN1IsCHib5/KXCnuPc2V76Sb1wW/yF66JHV6zipn5gFcxeYxMKXwpngx0gjoUjN0WV JruK5UzHQCbLn178E3YnCd6tbnkgZeZHkcvnvCqUxy533zx8Ju3IVln+xq7nDCAPHP 8bdZ/T8M+f+riNU/y6EEkWXKNiU15IiBVo3Q5kRUwFXuPOawyuGXurcegr/JZNna0Z XqDb0G2ByCRvQ== From: "Paul A. Patience" Message-ID: <20220912192510.420112-2-paul@apatience.com> In-Reply-To: <20220912192510.420112-1-paul@apatience.com> References: <20220912192510.420112-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , 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.2. [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..c5076fbe45 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.2") + (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 "1jwzqvv81zf5f7zssyixhyjirlp9ddwkbaabd177syb1bxljlsdc")))) + (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