From patchwork Thu Sep 8 20:14:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 5405 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 6B01D27BBEA; Thu, 8 Sep 2022 21:15:59 +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 26F9D27BBE9 for ; Thu, 8 Sep 2022 21:15:59 +0100 (BST) Received: from localhost ([::1]:46186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWNwL-0007la-Qz for patchwork@mira.cbaines.net; Thu, 08 Sep 2022 16:15:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWNvT-0007lH-6f for guix-patches@gnu.org; Thu, 08 Sep 2022 16:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWNvS-0003rG-8q for guix-patches@gnu.org; Thu, 08 Sep 2022 16:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWNvS-0005EE-4i for guix-patches@gnu.org; Thu, 08 Sep 2022 16:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57687] [PATCH 1/9] gnu: Add proj-7. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Sep 2022 20:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57687@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 57687-submit@debbugs.gnu.org id=B57687.166266809720072 (code B ref 57687); Thu, 08 Sep 2022 20:15:02 +0000 Received: (at 57687) by debbugs.gnu.org; 8 Sep 2022 20:14:57 +0000 Received: from localhost ([127.0.0.1]:60181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWNvN-0005Df-3T for submit@debbugs.gnu.org; Thu, 08 Sep 2022 16:14:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWNvL-0005DQ-Fu for 57687@debbugs.gnu.org; Thu, 08 Sep 2022 16:14:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4877C240103 for <57687@debbugs.gnu.org>; Thu, 8 Sep 2022 22:14:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1662668089; bh=wXdmHjUoz8YgLwx+j4wyXu+SFPBvo8IBe3IrtiwPXOQ=; h=From:To:Cc:Subject:Date:From; b=P6wWS6NZ9fqefbuhCAtdq0ARK3JmBNleyKKC9lA+TBpdAPvXS3S2c8nrYtwRKN8+2 QIApwbT/W1MWSkAPUW5HB58tUyAED3qNlsbotNzxX8j2y4DwvgIdyt/QyeNr+SoosF wUvL4fgHPBBKUR+yJGN6ObXxHziCZVlMK6grR83V60AUjGcVLNdUuwSStXgiAK6Pu/ 60h5io1PGEo+6kco2h2dNIA9le9rRI8P6DG/iGvKLGV9Sk4eD+Xx1dqmc9xvW9crTc aW9NlBgjnc8dIPJOMGr+XXZDYzfb6TefHsyTAf4Gaf5AQTCcIrqjLMAwt3dTxrlDJ1 3jy6uq1CMqgIQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MNr2J4mpFz9rxB; Thu, 8 Sep 2022 22:14:48 +0200 (CEST) From: Felix Gruber Date: Thu, 8 Sep 2022 20:14:30 +0000 Message-Id: <20220908201438.89973-1-felgru@posteo.net> In-Reply-To: <20220908201218.89645-1-felgru@posteo.net> References: <20220908201218.89645-1-felgru@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (proj-7): New variable. --- gnu/packages/geo.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9734ae66fe..b1f251b9c5 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -574,6 +574,27 @@ lets developers use the functionality of Proj in their own software.") ;; src/geodesic.*, src/tests/geodtest.cpp license:x11)))) +; This is the last version of proj that provides the old proj.4 API. +(define-public proj-7 + (package (inherit proj) + (version "7.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://download.osgeo.org/proj/proj-" + version ".tar.gz")) + (sha256 + (base32 + "050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k")))) + (arguments + `(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ + (substitute* "CMakeLists.txt" + (("MAJOR 7 MINOR 2 PATCH 0") "MAJOR 7 MINOR 2 PATCH 1"))))))))) + (define-public proj.4 (package (name "proj.4")