From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 7d9NI4utiF95SwAA0tVLHw (envelope-from ) for ; Thu, 15 Oct 2020 20:14:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WG+1HoutiF9/TgAA1q6Kng (envelope-from ) for ; Thu, 15 Oct 2020 20:14:03 +0000 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 C3AB694042E for ; Thu, 15 Oct 2020 20:14:02 +0000 (UTC) Received: from localhost ([::1]:54274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT9dQ-0002KC-U3 for larch@yhetil.org; Thu, 15 Oct 2020 16:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT9bW-000066-PZ for guix-patches@gnu.org; Thu, 15 Oct 2020 16:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kT9bW-0001mz-Cv for guix-patches@gnu.org; Thu, 15 Oct 2020 16:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kT9bW-0003rM-8n for guix-patches@gnu.org; Thu, 15 Oct 2020 16:12:02 -0400 Subject: bug#43991: [PATCH] gnu: r-sf: Use proj instead of proj.4. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 15 Oct 2020 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 43991 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Wiktor =?UTF-8?Q?=C5=BBelazny?= Cc: 43991-done@debbugs.gnu.org Mail-Followup-To: 43991@debbugs.gnu.org, mail@cbaines.net, wz@freeshell.de Received: via spool by 43991-done@debbugs.gnu.org id=D43991.160279269114786 (code D ref 43991); Thu, 15 Oct 2020 20:12:02 +0000 Received: (at 43991-done) by debbugs.gnu.org; 15 Oct 2020 20:11:31 +0000 Received: from localhost ([127.0.0.1]:56690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kT9aw-0003qG-Hc for submit@debbugs.gnu.org; Thu, 15 Oct 2020 16:11:31 -0400 Received: from mira.cbaines.net ([212.71.252.8]:60788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kT9as-0003q5-LN for 43991-done@debbugs.gnu.org; Thu, 15 Oct 2020 16:11:25 -0400 Received: from localhost (188.28.126.178.threembb.co.uk [188.28.126.178]) by mira.cbaines.net (Postfix) with ESMTPSA id AEAB827BBEC; Thu, 15 Oct 2020 21:11:21 +0100 (BST) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8f5d5eec; Thu, 15 Oct 2020 20:11:19 +0000 (UTC) References: <20201014172405.1910-1-wz@freeshell.de> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <20201014172405.1910-1-wz@freeshell.de> Date: Thu, 15 Oct 2020 21:11:19 +0100 Message-ID: <87ft6fi714.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -3.11 X-TUID: CNP8VE3yzu9i --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Wiktor =C5=BBelazny writes: > From: Wiktor =C5=BBelazny > > * gnu/packages/cran.scm (r-sf)[inputs]: Replace proj.4 with proj, and > add sqlite. > > This addresses segfaults while loading vector GIS data from a file. > --- > gnu/packages/cran.scm | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm > index 59a409f8e9..252699c691 100644 > --- a/gnu/packages/cran.scm > +++ b/gnu/packages/cran.scm > @@ -17,7 +17,7 @@ > ;;; Copyright =C2=A9 2018 Marius Bakke > ;;; Copyright =C2=A9 2018, 2019 Brett Gilio > ;;; Copyright =C2=A9 2019 Nicol=C3=B2 Balzarotti > -;;; Copyright =C2=A9 2019 Wiktor =C5=BBelazny > +;;; Copyright =C2=A9 2019, 2020 Wiktor =C5=BBelazny > ;;; Copyright =C2=A9 2019 Arne Babenhauserheide > ;;; Copyright =C2=A9 2019, 2020 Efraim Flashner > ;;; Copyright =C2=A9 2020 Todor Kondi=C4=87 > @@ -90,6 +90,7 @@ > #:use-module (gnu packages pulseaudio) ;libsndfile > #:use-module (gnu packages python) > #:use-module (gnu packages python-xyz) > + #:use-module (gnu packages sqlite) > #:use-module (gnu packages statistics) > #:use-module (gnu packages tcl) > #:use-module (gnu packages tls) > @@ -13957,7 +13958,8 @@ tessellation.") > (inputs > `(("gdal" ,gdal) > ("geos" ,geos) > - ("proj" ,proj.4) > + ("proj" ,proj) > + ("sqlite" ,sqlite) > ("zlib" ,zlib))) > (propagated-inputs > `(("r-classint" ,r-classint) Looks good :) I tweaked the commit message slightly, just because I'd normally put the changelog at the end, but I've pushed to master as ae6a61d7311cde7ccb863bcff57e26f7674ebc18. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+IrOdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XceNw//ZIsxvj0oXfJy2+9HzdRwV131a0ElSRWx ucDVSKSd2pqRq1dOSfUjH+YiT9mnV14O80zHMJ3wILPSYC+2PvlVqn0MaSqM5vXK 5zhgEPLdhJIKgZusZDwGY8Em9zlxN8lRQXDMakeDdgFD4UIlWD8Qi4PaEypc9aBO c99BYxvowLjVMokuCQB4AUu3K/ix/xi45VvjigRpkmOqtaKUdbqrbKgBxmMqz5FM H26XuJUI4RvHU52IWvPSRubSg6xKKqmnJWMSniC6d6/OLfQes8CnGTDrJhILuFYe pLaIbcOc/zSC8AoMsZDyTjCokKUDCZnzXUJlVbKInY6XZSEB6oFs2pt9rPWMdkoL b4bUsN/BiTBJEcgMyo0dbzcOSmGxFk/02VyN0yxar6Cml5YaZtXXrNo6AxmpCmEY O1QB0ktLbODz0qCMkPJ6cO0537VgDdGx06ahBvbKFGEI1Wk4rkqV2VD8DjB0aND0 x8u2HP3y13dzamPYRD86ZTKuSakI7CjakCwcn02orUqTJox+DUxi/CrELUGQZCzn tiuDN0c6nFHfarLmjx0Giy/lcLl6c8xH7Ld/YQDPAxTvJ5ZLYY1+e+A9ClnqJNwq 094IcfKYy7byOVheRoiaDiHfQo+lTXmjp5KA/cS0lQTXEleMMmv/OgwQNl3dB1M2 jsePLGUCPp4= =SwlE -----END PGP SIGNATURE----- --=-=-=--