From: Christopher Baines <mail@cbaines.net>
To: "Wiktor Żelazny" <wz@freeshell.de>
Cc: 43991-done@debbugs.gnu.org
Subject: bug#43991: [PATCH] gnu: r-sf: Use proj instead of proj.4.
Date: Thu, 15 Oct 2020 21:11:19 +0100 [thread overview]
Message-ID: <87ft6fi714.fsf@cbaines.net> (raw)
In-Reply-To: <20201014172405.1910-1-wz@freeshell.de>
[-- Attachment #1: Type: text/plain, Size: 1868 bytes --]
Wiktor Żelazny <wz@freeshell.de> writes:
> From: Wiktor Żelazny <wzelazny@vurv.cz>
>
> * 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 © 2018 Marius Bakke <mbakke@fastmail.com>
> ;;; Copyright © 2018, 2019 Brett Gilio <brettg@gnu.org>
> ;;; Copyright © 2019 Nicolò Balzarotti <anothersms@gmail.com>
> -;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
> +;;; Copyright © 2019, 2020 Wiktor Żelazny <wzelazny@vurv.cz>
> ;;; Copyright © 2019 Arne Babenhauserheide <arne_bab@web.de>
> ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
> ;;; Copyright © 2020 Todor Kondić <tk.code@protonmail.com>
> @@ -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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
prev parent reply other threads:[~2020-10-15 20:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 17:24 [bug#43991] [PATCH] gnu: r-sf: Use proj instead of proj.4 Wiktor Żelazny
2020-10-15 20:11 ` Christopher Baines [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ft6fi714.fsf@cbaines.net \
--to=mail@cbaines.net \
--cc=43991-done@debbugs.gnu.org \
--cc=wz@freeshell.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).