From patchwork Mon Sep 12 19:25:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 42569 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 7D3FA27BBEA; Mon, 12 Sep 2022 20:27:17 +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 341A627BBE9 for ; Mon, 12 Sep 2022 20:27:17 +0100 (BST) Received: from localhost ([::1]:59814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXp5O-0000vS-Is for patchwork@mira.cbaines.net; Mon, 12 Sep 2022 15:27:16 -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 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/geo.scm (saga)[modules, snippet]: New fields. --- gnu/packages/geo.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.37.3 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))