From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 KMUSNxmIH2OpDwEAbAwnHQ (envelope-from ) for ; Mon, 12 Sep 2022 21:27:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yPY8NhmIH2MncwEAG6o9tA (envelope-from ) for ; Mon, 12 Sep 2022 21:27:21 +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 7F06A36BB5 for ; Mon, 12 Sep 2022 21:27:21 +0200 (CEST) Received: from localhost ([::1]:59814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXp5U-0000vS-Ob for larch@yhetil.org; Mon, 12 Sep 2022 15:27:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXp4G-0000pN-1I for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXp4F-00011o-P7 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 1oXp4F-0000PS-L6 for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57685] [PATCH v2 2/3] gnu: saga: Fix build with newer libHaru. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Sep 2022 19:26:03 +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.16630107591543 (code B ref 57685); Mon, 12 Sep 2022 19:26:03 +0000 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:59 +0000 Received: from localhost ([127.0.0.1]:48089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp4B-0000Oo-1Z for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:59 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:21997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp48-0000OH-TE for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:57 -0400 Date: Mon, 12 Sep 2022 19:25:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010751; x=1663269951; bh=cHG636Xs3CkQGXg/WQXldBsA74hfsxvlqf96QW1RyI4=; 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=euZu4jmLqE6Q75T8rpUz3M96JfBMAg2/FucT1oN15/B9E+EuEDQZsCZYrxuTbyB0M COEEtS7FII9sOI8Daa/wxW3/dNgi/2j24XVflR1vs6ymaXjC7QC+T35UycmUmyfYnI wQ64efMSLJT00+N8QK3mqub2c4HKOhEfOTJsCIpayb36UhQbuxyW4ben9T6/xkiW91 WdwXvFj6xXKGGta2xY11wbezWo5OwluiIdbg7m50i1jFlOLzmkKOEB92ZdJP0ecwqm uQu1x0Qui9ZsHG2AUgzake8s8NO0aBeFHUuAPw8HtZ1HRwJ4ISdBsNIFyoUY3IOb3n zT15tpnjmAPpg== From: "Paul A. Patience" Message-ID: <20220912192510.420112-3-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=1663010841; 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=cHG636Xs3CkQGXg/WQXldBsA74hfsxvlqf96QW1RyI4=; b=SXl1FSy72M69mgUTMMHLPqD2EUNCrFp3hNiwZ6HZ76l+8y7oHwIEm7muU3VwZdDInMuVXg vS9EB+Aw82IO7qVraUZwUPTuMNze3uomY//YX12hPycdj9k4W94H15DAFhbOBzAvF0XfXJ P9xoIyBHLs3KBK1vHRAlPumf2tNtEZljaUCPGPzujR8WOj0f09ikWsyhgHtDAVxxpxLWl9 5c8wFCpCKUrPsgi97kPErbv7cua3XdDlgyFUKueyK+uDIMT248B1/VYeCfgPypVg0SkITc PpgU5n9FZVU1Dd6sG+LfS4ONutB2yrW3d+0ZMUnkHO6YNoiVjPvm24dOCBbupg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663010841; a=rsa-sha256; cv=none; b=dhZKHt3VK2FqAmDIZhvA8eGh8lzwE3W9iEHzxb4LRjRcYlYcgNFX5FA4WqrRV991YlPK7z 3lf00hf9fqVSxjA+GSejyjb1FxY0Oypwy9JPmUwuw3XQwG2/cXV8/cfW7mBVyIAZPRoxxa wTY9RAAs8uC6XghTHbRcUzRBXSZaEe3wypyHVQeAxVRAhYwGUdbXjqyzHcypVDtWFY3usI BfMjKCosboCmgMFvb+tRnF0E9GiMeXQ5u+P65UK2y3ftFwrfItInE8RSIO0NcVpZfeRnqj OkBN4ah3YAgf3/lyiVffYBOieIOroVyaF3hIvhwIsT+2RoboH8GUQ7nQcHSA1g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=euZu4jmL; 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: 2.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=euZu4jmL; 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: 7F06A36BB5 X-Spam-Score: 2.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: cejx1XpiAlus * gnu/packages/geo.scm (saga)[modules, snippet]: New fields. --- gnu/packages/geo.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9734ae66fe..082a55fc91 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2338,7 +2338,14 @@ (define-public saga (version-major version) "/SAGA%20-%20" version "/saga-" version ".tar.gz")) (sha256 - (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")))) + (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")) + (modules '((guix build utils))) + (snippet + '(substitute* "saga-gis/src/tools/docs/docs_pdf/doc_pdf.cpp" + (("^#include \n" all) + (string-append all "#include \n")) + (("\\bHPDF_PROJECTING_SCUARE_END\\b") + "HPDF_PROJECTING_SQUARE_END"))))) (build-system cmake-build-system) (native-inputs (list pkg-config swig)) -- 2.37.3