From patchwork Sat Oct 2 12:55:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33551 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 42A0427BBE3; Sat, 2 Oct 2021 14:22:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0AD5F27BBE1 for ; Sat, 2 Oct 2021 14:22:28 +0100 (BST) Received: from localhost ([::1]:59250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWeyB-0000JW-1J for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 09:22:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWeZa-0006x8-Pk for guix-patches@gnu.org; Sat, 02 Oct 2021 08:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWeZa-0001vd-I2 for guix-patches@gnu.org; Sat, 02 Oct 2021 08:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWeZa-0001W7-Hc for guix-patches@gnu.org; Sat, 02 Oct 2021 08:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50963] [PATCH] gnu: grass: Depend on proj instead of proj.4. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 12:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50963@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16331793775737 (code B ref -1); Sat, 02 Oct 2021 12:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Oct 2021 12:56:17 +0000 Received: from localhost ([127.0.0.1]:58189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWeYr-0001US-0e for submit@debbugs.gnu.org; Sat, 02 Oct 2021 08:56:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:37576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWeYo-0001UK-SO for submit@debbugs.gnu.org; Sat, 02 Oct 2021 08:56:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWeYo-0005Vc-JT for guix-patches@gnu.org; Sat, 02 Oct 2021 08:56:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:48641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWeYm-0001dT-CV for guix-patches@gnu.org; Sat, 02 Oct 2021 08:56:14 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A5687240027 for ; Sat, 2 Oct 2021 14:56:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633179366; bh=jVMlr4j+XR6cO4vPd6DtdZN4BT0I0fx7laX4heKEV7I=; h=From:To:Cc:Subject:Date:From; b=aBhmA7JK9diHsO8kgisrenxCE87XkMXYpk1pxJduaEBRbZM9oYxdS6EHEaKdsfneo 1qM7teZ86XH3EBhj2VSH64JYl9IJzHi9QPfJERnE1ywJ6DPfgRj4KRvx4KjNdlCaql 3a4gaZ2Yh+KLdoFSWWodUO64QMKTGvO/hBuBTbDvnRIzXnaJTAO76iYB3DyevqZ262 ty/ZtoAs+E2G5eBD12CizgVNzR1i82c5fAt7h6hF09HF0m1aHt4NW52L2X/J01oyLa Gl3OMhd66BBfZh4eGD/jx3kGRBibuPaw9bDttvRB6725hWJeuiwPnNSh5Fhe4LwByV Ci2xgk/HlsAAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HM6RT6xplz9rxP; Sat, 2 Oct 2021 14:56:05 +0200 (CEST) From: Felix Gruber Date: Sat, 2 Oct 2021 12:55:51 +0000 Message-Id: <20211002125551.145787-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (grass)[inputs]: Replace proj.4 with proj. [arguments]: Change --with-proj-share. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 763e33a0a5..a8a66fdfc4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1953,7 +1953,7 @@ track your position right from your laptop.") ("openblas" ,openblas) ("perl" ,perl) ("postgresql" ,postgresql) - ("proj.4" ,proj.4) + ("proj" ,proj) ("python" ,python) ("python-dateutil" ,python-dateutil) ("python-numpy" ,python-numpy) @@ -2009,7 +2009,7 @@ track your position right from your laptop.") "--with-netcdf" "--with-postgres" (string-append "--with-proj-share=" - (assoc-ref inputs "proj.4") + (assoc-ref inputs "proj") "/share/proj") "--with-pthread" "--with-readline"