unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#43991] [PATCH] gnu: r-sf: Use proj instead of proj.4.
@ 2020-10-14 17:24 Wiktor Żelazny
  2020-10-15 20:11 ` bug#43991: " Christopher Baines
  0 siblings, 1 reply; 2+ messages in thread
From: Wiktor Żelazny @ 2020-10-14 17:24 UTC (permalink / raw)
  To: 43991

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)
-- 
2.28.0





^ permalink raw reply	[flat|nested] 2+ messages in thread

* bug#43991: [PATCH] gnu: r-sf: Use proj instead of proj.4.
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Christopher Baines @ 2020-10-15 20:11 UTC (permalink / raw)
  To: Wiktor Żelazny; +Cc: 43991-done

[-- 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 --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-15 20:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 17:24 [bug#43991] [PATCH] gnu: r-sf: Use proj instead of proj.4 Wiktor Żelazny
2020-10-15 20:11 ` bug#43991: " Christopher Baines

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git