From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0IO6I9qHH2OpEgEAbAwnHQ (envelope-from ) for ; Mon, 12 Sep 2022 21:26:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kJnGI9qHH2M9fgEA9RJhRA (envelope-from ) for ; Mon, 12 Sep 2022 21:26:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 29F0836AAD for ; Mon, 12 Sep 2022 21:26:18 +0200 (CEST) Received: from localhost ([::1]:59812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXp4T-0000qM-9M for larch@yhetil.org; Mon, 12 Sep 2022 15:26:17 -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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663010778; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=r5IpmSzNLXK/UnQqOfL5i2Gn1mw4pGofLtxhuKTrJOM=; b=kuzFHJjllwfkuixsLj9oDo9Vux7r53C2Hw8Ai4KTHBDdmasSMwdfZOmwuV6/6leQ9dpLfV +HNojzq61bnwZrnlz5um4YzZkBikbvNv1LPq+5AosCHHzaalNISuykS4KYZ/bj9htOrVTA M+Iv0OuKGp796dsxB0/r9Dl7liGWvKwobD7eCwjff/EkSbWfpOT3ur7rCA+YqY7apvQccX c9pX4/jrhDDIZpwgCMgZY1JIoUcJEEXcK6HVW2Bzc30flCudTH+jh3PyMN8oJS6GxYCIhp vgI0gqQzdzMmco0FtceTnXrSliYe7M6lvLqZGC6ff3qQ0UsYD6rLhL1NLTG6Sw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663010778; a=rsa-sha256; cv=none; b=NAFhucfsRkrYoMN6vIbJdI9p/d721FzAM3qqnxf4juZUd4Ok8EN65s2uBb5x2/oUcvC/l8 aiqlIGZvId2/GhVm8awrByacBedRxJaVoqrGKmQ5Z1g/0TmA/+7Pj40Wbml/gzm/7Bff8x TyVLbQv8/idJByVIWddX7EK8rrsfbf003H5cbRT61Dsi40TawAaOfjVoJ6/rr3B0v8BajY upVqaYJTFDNZCevuMwWbswPBWga24/ImKXZ4n1HzwZoe42EMIiOK19ScxYprZjhOBkUxw1 td+YpaXbMNPQKksMmG5934EOWU3YGZ9c8Sc9YtRxQNetziLLjtkyRGBLzbJ5vg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=CLzNal7I; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=CLzNal7I; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 29F0836AAD X-Spam-Score: 3.69 X-Migadu-Scanner: scn1.migadu.com X-TUID: +2UvI+PFeIEn * 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(-) 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 =C2=A9 2020 Timotej Lazar ;;; Copyright =C2=A9 2020, 2022 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Maxime Devos +;;; Copyright =C2=A9 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=3D" - (assoc-ref %build-inputs "zlib")) - (string-append "--with-png=3D" - (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 DEST= INATION .*\\)" + _ 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 -- 2.37.3