GNU bug report logs - #30492
[PATCH 0/4] Add libspatialite and spatialite-gui

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30492 in the body.
You can then email your comments to 30492 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/4] Add libspatialite and spatialite-gui
Date: Fri, 16 Feb 2018 22:09:13 +0100

This adds libspatialite and spatialite-gui.
The libgaiagraphics as such is outdated and no longer supported,
but still needed for spatialite-gui. 

Björn Höfling (4):
  gnu: Add libspatialite.
  gnu: Add libgaiagraphics.
  gnu: Add wxwidgets <at> 2.8.
  gnu: Add spatialite-gui.

 gnu/packages/geo.scm       | 108 ++++++++++++++++++++++++++++++++++++++++++++-
 gnu/packages/wxwidgets.scm |  25 +++++++++++
 2 files changed, 132 insertions(+), 1 deletion(-)

-- 
2.16.1

Message #8 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH 1/4] gnu: Add libspatialite.
Date: Fri, 16 Feb 2018 22:18:16 +0100

* gnu/packages/geo.scm (libspatialite): New variable.
---
 gnu/packages/geo.scm | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9c7f7c115..784bc15ec 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016 Alex Griffin <a <at> ajgrf.com>
-;;; Copyright © 2017 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
+;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;;
@@ -28,6 +28,7 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
@@ -193,6 +194,46 @@ writing GeoTIFF information tags.")
                    (license:non-copyleft "file://LICENSE"
                                          "See LICENSE in the distribution.")))))
 
+(define-public libspatialite
+  (package
+    (name "libspatialite")
+    (version "4.3.0a")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/libspatialite-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("freexl" ,freexl)
+       ("geos" ,geos)
+       ("libxml2" ,libxml2)
+       ("proj.4" ,proj.4)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+    (arguments
+     `(#:tests? #f)) ; Test failures.
+    (synopsis "Library to extend SQLite to support Spatial SQL capabilities")
+    (description "SpatiaLite is a library intended to extend the SQLite core
+to support fully fledged Spatial SQL capabilities.  SpatiaLite is smoothly
+integrated into SQLite to provide a complete and powerful Spatial DBMS
+(mostly OGC-SFS compliant).")
+    (home-page "https://www.gaia-gis.it/fossil/libspatialite/index")
+    ;; For the genuine libspatialite-sources holds:
+    ;; Any of the licenses MPL1.1, GPL2+ or LGPL2.1+  may be picked.
+    ;; Files under src/control_points are from GRASS
+    ;; and are licensed under GPL2+ only.
+    ;; src/md5.[ch]: Placed into the public domain by Alexander Peslyak.
+    (license (list license:gpl2+
+                   license:lgpl2.1+
+                   license:mpl1.1
+                   license:public-domain))))
+
 (define-public proj.4
   (package
     (name "proj.4")
-- 
2.16.1

Message #11 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH 2/4] gnu: Add libgaiagraphics.
Date: Fri, 16 Feb 2018 22:19:26 +0100

* gnu/packages/geo.scm (libgaiagraphics): New variable.
---
 gnu/packages/geo.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 784bc15ec..9004d6947 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -145,6 +145,36 @@ and driving.")
     (home-page "https://wiki.gnome.org/Apps/Maps")
     (license license:gpl2+)))
 
+(define-public libgaiagraphics
+  (package
+    (name "libgaiagraphics")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/libgaiagraphics-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "076afqv417ag3hfvnif0qc7qscmnq1dsf6y431yygwgf34rjkayc"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("libpng" ,libpng)
+       ("libjepeg-turbo" ,libjpeg-turbo)
+       ("libtiff" ,libtiff)
+       ("libgeotiff" ,libgeotiff)
+       ("proj.4" ,proj.4)
+       ("libxml2" ,libxml2)
+       ("zlib" ,zlib)))
+     (synopsis "Gaia common graphics support")
+     (description "libgaiagraphics is a library supporting
+ common-utility raster handling methods.")
+    (home-page "https://www.gaia-gis.it/fossil/libgaiagraphics/index")
+    (license license:lgpl3+)))
+
 (define-public libgeotiff
   (package
     (name "libgeotiff")
-- 
2.16.1

Message #14 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: Add wxwidgets <at> 2.8.
Date: Fri, 16 Feb 2018 22:20:04 +0100

* gnu/packages/wxwidgets.scm (wxwidgets-2.8): New variable.
---
 gnu/packages/wxwidgets.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 84446d8ef..e59e2f2d4 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2017 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2017 Thomas Danckaert <post <at> thomasdanckaert.be>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2018 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -126,6 +127,30 @@ and many other languages.")
               ((#:configure-flags flags)
                `(cons "--enable-mediactrl" ,flags))))))
 
+(define-public wxwidgets-2.8
+  (package (inherit wxwidgets)
+           (version "2.8.12")
+           (source
+            (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/wxWidgets/wxWidgets/archive/v"
+                                  version ".tar.gz"))
+              (file-name (string-append "wxwidgets-" version ".tar.gz"))
+              (sha256
+               (base32 "1xa8hxfpfnjw5b3227h4wk59bgk215bzpgh2rfc1l2svp2bkc5kr"))))
+           (inputs
+            `(("glu" ,glu)
+              ;; XXX gstreamer-0.10 builds fail
+              ;; ("gstreamer" ,gstreamer-0.10)
+              ("gtk" ,gtk+-2)
+              ("libjpeg" ,libjpeg)
+              ("libmspack" ,libmspack)
+              ("libsm" ,libsm)
+              ("libtiff" ,libtiff)
+              ("mesa" ,mesa)
+              ("webkitgtk" ,webkitgtk)
+              ("sdl" ,sdl)))))
+
 (define-public python2-wxpython
   (package
     (name "python2-wxpython")
-- 
2.16.1

Message #17 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: Add spatialite-gui.
Date: Fri, 16 Feb 2018 22:20:28 +0100

* gnu/packages/geo.scm (spatialite-gui): New variable.
---
 gnu/packages/geo.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9004d6947..2cd363991 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -27,6 +27,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages glib)
@@ -35,6 +36,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages webkit)
+  #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xml))
 
 (define-public geos
@@ -313,3 +315,36 @@ projections.")
                    (license:non-copyleft "http://www.epsg.org/TermsOfUse")
                    ;; cmake/*
                    license:boost1.0))))
+
+(define-public spatialite-gui
+  (package
+    (name "spatialite-gui")
+    (version "1.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/spatialite_gui-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1r05dz9pyc8vsd2wbqxcsracpfbaamz470rcyp2myfpqwznv376b"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("freexl" ,freexl)
+       ("geos" ,geos)
+       ("libgaiagraphics" ,libgaiagraphics)
+       ("libspatialite" ,libspatialite)
+       ("libxml2" ,libxml2)
+       ("proj.4" ,proj.4)
+       ("sqlite" ,sqlite)
+       ("wxwidgets" ,wxwidgets-2.8)
+       ("zlib" ,zlib)))
+    (synopsis "Graphical user interface for SpatiaLite")
+    (description "Spatialite-gui provides a visual interface for viewing and
+ maintaining a spatialite database.  You can easily see the structure of the
+ tables and data contents using point and click functions, many of which
+ construct common SQL queries, or craft your own SQL queries.")
+    (home-page "https://www.gaia-gis.it/fossil/spatialite_gui/index")
+    (license license:gpl3+)))
-- 
2.16.1

Message #20 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 30492 <at> debbugs.gnu.org
Subject: Re: [bug#30492] [PATCH 1/4] gnu: Add libspatialite.
Date: Sun, 18 Feb 2018 18:03:02 +0100

[Message part 1 (text/plain, inline)]

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:

> * gnu/packages/geo.scm (libspatialite): New variable.

Thanks!  Unfortunately this patch no longer applies, can you send an
updated patch?

[...]
 
> +(define-public libspatialite
> +  (package
> +    (name "libspatialite")
> +    (version "4.3.0a")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://www.gaia-gis.it/gaia-sins/libspatialite-"
> +                           version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("freexl" ,freexl)
> +       ("geos" ,geos)
> +       ("libxml2" ,libxml2)
> +       ("proj.4" ,proj.4)
> +       ("sqlite" ,sqlite)
> +       ("zlib" ,zlib)))
> +    (arguments
> +     `(#:tests? #f)) ; Test failures.

Please also add some details about the test failures, if possible.

> +    (synopsis "Library to extend SQLite to support Spatial SQL capabilities")
> +    (description "SpatiaLite is a library intended to extend the SQLite core
> +to support fully fledged Spatial SQL capabilities.  SpatiaLite is smoothly
> +integrated into SQLite to provide a complete and powerful Spatial DBMS
> +(mostly OGC-SFS compliant).")
> +    (home-page "https://www.gaia-gis.it/fossil/libspatialite/index")
> +    ;; For the genuine libspatialite-sources holds:
> +    ;; Any of the licenses MPL1.1, GPL2+ or LGPL2.1+  may be picked.
> +    ;; Files under src/control_points are from GRASS
> +    ;; and are licensed under GPL2+ only.
> +    ;; src/md5.[ch]: Placed into the public domain by Alexander Peslyak.
> +    (license (list license:gpl2+
> +                   license:lgpl2.1+
> +                   license:mpl1.1
> +                   license:public-domain))))
> +
>  (define-public proj.4
>    (package
>      (name "proj.4")
> -- 
> 2.16.1

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 30492 <at> debbugs.gnu.org
Subject: Re: [bug#30492] [PATCH 2/4] gnu: Add libgaiagraphics.
Date: Sun, 18 Feb 2018 18:03:55 +0100

[Message part 1 (text/plain, inline)]

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:

> * gnu/packages/geo.scm (libgaiagraphics): New variable.

LGTM.

[signature.asc (application/pgp-signature, inline)]

Message #26 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 30492 <at> debbugs.gnu.org
Subject: Re: [bug#30492] [PATCH 3/4] gnu: Add wxwidgets <at> 2.8.
Date: Sun, 18 Feb 2018 18:07:38 +0100

[Message part 1 (text/plain, inline)]

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:

> * gnu/packages/wxwidgets.scm (wxwidgets-2.8): New variable.

This is effectively a revert of
6f9ba4c91c096a2fb95da111be0657d99ef2b683.  However, it does some things
differently, can you have a look and see if this patch needs adjustment?

[...]
  
> +(define-public wxwidgets-2.8
> +  (package (inherit wxwidgets)
> +           (version "2.8.12")
> +           (source
> +            (origin
> +              (method url-fetch)
> +              (uri (string-append "https://github.com/wxWidgets/wxWidgets/archive/v"
> +                                  version ".tar.gz"))

wxWidgets provides "release" tarballs which are preferred to the
auto-generated git archive tarballs.  See the above-mentioned commit for
the proper URL :-)

[signature.asc (application/pgp-signature, inline)]

Message #29 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 30492 <at> debbugs.gnu.org
Subject: Re: [bug#30492] [PATCH 4/4] gnu: Add spatialite-gui.
Date: Sun, 18 Feb 2018 18:08:49 +0100

[Message part 1 (text/plain, inline)]

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:

> * gnu/packages/geo.scm (spatialite-gui): New variable.

LGTM.  Can you rebase this series on current 'master' and send updated
patches?

TIA!

[signature.asc (application/pgp-signature, inline)]

Message #32 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 30492 <at> debbugs.gnu.org
Subject: Re: [bug#30492] [PATCH 3/4] gnu: Add wxwidgets <at> 2.8.
Date: Sun, 18 Feb 2018 22:33:44 +0100

On Sun, 18 Feb 2018 18:07:38 +0100
Marius Bakke <mbakke <at> fastmail.com> wrote:

> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:
> 
> > * gnu/packages/wxwidgets.scm (wxwidgets-2.8): New variable.  
> 
> This is effectively a revert of
> 6f9ba4c91c096a2fb95da111be0657d99ef2b683.  However, it does some
> things differently, can you have a look and see if this patch needs
> adjustment?
> 
> [...]
>   
> > +(define-public wxwidgets-2.8
> > +  (package (inherit wxwidgets)
> > +           (version "2.8.12")
> > +           (source
> > +            (origin
> > +              (method url-fetch)
> > +              (uri (string-append
> > "https://github.com/wxWidgets/wxWidgets/archive/v"
> > +                                  version ".tar.gz"))  
> 
> wxWidgets provides "release" tarballs which are preferred to the
> auto-generated git archive tarballs.  See the above-mentioned commit
> for the proper URL :-)

Thanks Marius for reviewing that series.

I did not know that there was already a 2.8-version and haven't looked
into history. I copied the non-release URL from 3.1, which isn't
released yet :-)

I think I will just revert the commit you mentioned, as this worked
and was there in the past. How do I revert that, concerning the commit
message: Do I write a full, normal commmit like
"gnu/package/wxwidgets.scm: Add new variable"? Should I mention the
revert? Is it legitimate/necessary to add my copyright header,
although I haven't contributed any line?!

Thanks,

Björn

Message #35 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 30492 <at> debbugs.gnu.org
Subject: Re: [bug#30492] [PATCH 3/4] gnu: Add wxwidgets <at> 2.8.
Date: Mon, 19 Feb 2018 01:24:18 +0100

[Message part 1 (text/plain, inline)]

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:

> On Sun, 18 Feb 2018 18:07:38 +0100
> Marius Bakke <mbakke <at> fastmail.com> wrote:
>
>> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:
>> 
>> > * gnu/packages/wxwidgets.scm (wxwidgets-2.8): New variable.  
>> 
>> This is effectively a revert of
>> 6f9ba4c91c096a2fb95da111be0657d99ef2b683.  However, it does some
>> things differently, can you have a look and see if this patch needs
>> adjustment?
>> 
>> [...]
>>   
>> > +(define-public wxwidgets-2.8
>> > +  (package (inherit wxwidgets)
>> > +           (version "2.8.12")
>> > +           (source
>> > +            (origin
>> > +              (method url-fetch)
>> > +              (uri (string-append
>> > "https://github.com/wxWidgets/wxWidgets/archive/v"
>> > +                                  version ".tar.gz"))  
>> 
>> wxWidgets provides "release" tarballs which are preferred to the
>> auto-generated git archive tarballs.  See the above-mentioned commit
>> for the proper URL :-)
>
> Thanks Marius for reviewing that series.
>
> I did not know that there was already a 2.8-version and haven't looked
> into history. I copied the non-release URL from 3.1, which isn't
> released yet :-)
>
> I think I will just revert the commit you mentioned, as this worked
> and was there in the past. How do I revert that, concerning the commit
> message: Do I write a full, normal commmit like
> "gnu/package/wxwidgets.scm: Add new variable"? Should I mention the
> revert? Is it legitimate/necessary to add my copyright header,
> although I haven't contributed any line?!

Just the commit generated by "git revert" is fine IMO.

Thanks for packaging these!

[signature.asc (application/pgp-signature, inline)]

Message #38 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 30492 <at> debbugs.gnu.org
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 Marius Bakke <mbakke <at> fastmail.com>
Subject: Re: [bug#30492] [PATCH 1/4] gnu: Add libspatialite.
Date: Mon, 19 Feb 2018 23:04:04 +0530

Marius Bakke <mbakke <at> fastmail.com> writes:

> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:
>
>> * gnu/packages/geo.scm (libspatialite): New variable.
>
>> +    (arguments
>> +     `(#:tests? #f)) ; Test failures.
>
> Please also add some details about the test failures, if possible.

If possible, do disable the failing tests alone and run the other tests.

Message #41 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: 30492 <at> debbugs.gnu.org, Marius Bakke <mbakke <at> fastmail.com>
Subject: Re: [bug#30492] [PATCH 1/4] gnu: Add libspatialite.
Date: Mon, 19 Feb 2018 18:44:13 +0100

On Mon, 19 Feb 2018 23:04:04 +0530
Arun Isaac <arunisaac <at> systemreboot.net> wrote:

> Marius Bakke <mbakke <at> fastmail.com> writes:
> 
> > Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:
> >  
> >> * gnu/packages/geo.scm (libspatialite): New variable.  
> >  
> >> +    (arguments
> >> +     `(#:tests? #f)) ; Test failures.  
> >
> > Please also add some details about the test failures, if possible.  
> 
> If possible, do disable the failing tests alone and run the other
> tests.

I tried that first but somehow it didn't work properly. I will work again
on disabling the three failing tests and resubmit the patch-set.

Björn

Message #44 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 30492 <at> debbugs.gnu.org
Subject: [PATCH v2 0/4] Add libspatialite and spatialite-gui
Date: Thu, 22 Feb 2018 00:01:21 +0100

On Sun, 18 Feb 2018 18:08:49 +0100
Marius Bakke <mbakke <at> fastmail.com> wrote:

> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:
> 
> > * gnu/packages/geo.scm (spatialite-gui): New variable.  
> 
> LGTM.  Can you rebase this series on current 'master' and send updated
> patches?
> 
> TIA!

Here is the second version of the patchset with

* Rebased to current master.
* libspatialite: Just disabled the failing tests.
* wxwidgets: Used just a revert.




Björn Höfling (4):
  gnu: Add libspatialite.
  gnu: Add libgaiagraphics.
  Revert "gnu: Remove wxwidgets <at> 2.8."
  gnu: Add spatialite-gui.

 gnu/packages/geo.scm       | 115 ++++++++++++++++++++++++++++++++++++++++++++-
 gnu/packages/wxwidgets.scm |  28 +++++++++++
 2 files changed, 142 insertions(+), 1 deletion(-)

-- 
2.16.1

Message #47 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH v2 1/4] gnu: Add libspatialite.
Date: Thu, 22 Feb 2018 00:07:47 +0100

* gnu/packages/geo.scm (libspatialite): New variable.
---
 gnu/packages/geo.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d75416415..8f1b44aea 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016 Alex Griffin <a <at> ajgrf.com>
-;;; Copyright © 2017 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
+;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
@@ -202,6 +202,55 @@ writing GeoTIFF information tags.")
                    (license:non-copyleft "file://LICENSE"
                                          "See LICENSE in the distribution.")))))
 
+(define-public libspatialite
+  (package
+    (name "libspatialite")
+    (version "4.3.0a")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/libspatialite-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("freexl" ,freexl)
+       ("geos" ,geos)
+       ("libxml2" ,libxml2)
+       ("proj.4" ,proj.4)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; 3 tests are failing, ignore them:
+         (add-after 'unpack 'ignore-broken-tests
+           (lambda _
+             (substitute* '("test/Makefile.in")
+               (("\tcheck_sql_stm.*" all) "\tcheck_multithread$(EXEEXT) \\\n")
+               (("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n"))
+               (("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4)))
+             #t)))))
+    (synopsis "Library to extend SQLite to support Spatial SQL capabilities")
+    (description "SpatiaLite is a library intended to extend the SQLite core
+to support fully fledged Spatial SQL capabilities.  SpatiaLite is smoothly
+integrated into SQLite to provide a complete and powerful Spatial DBMS
+(mostly OGC-SFS compliant).")
+    (home-page "https://www.gaia-gis.it/fossil/libspatialite/index")
+    ;; For the genuine libspatialite-sources holds:
+    ;; Any of the licenses MPL1.1, GPL2+ or LGPL2.1+  may be picked.
+    ;; Files under src/control_points are from GRASS
+    ;; and are licensed under GPL2+ only.
+    ;; src/md5.[ch]: Placed into the public domain by Alexander Peslyak.
+    (license (list license:gpl2+
+                   license:lgpl2.1+
+                   license:mpl1.1
+                   license:public-domain))))
+
 (define-public proj.4
   (package
     (name "proj.4")
-- 
2.16.1

Message #50 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH v2 2/4] gnu: Add libgaiagraphics.
Date: Thu, 22 Feb 2018 00:08:41 +0100

* gnu/packages/geo.scm (libgaiagraphics): New variable.
---
 gnu/packages/geo.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 8f1b44aea..6fe5f95f7 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -153,6 +153,36 @@ and driving.")
     (home-page "https://wiki.gnome.org/Apps/Maps")
     (license license:gpl2+)))
 
+(define-public libgaiagraphics
+  (package
+    (name "libgaiagraphics")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/libgaiagraphics-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "076afqv417ag3hfvnif0qc7qscmnq1dsf6y431yygwgf34rjkayc"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("libpng" ,libpng)
+       ("libjepeg-turbo" ,libjpeg-turbo)
+       ("libtiff" ,libtiff)
+       ("libgeotiff" ,libgeotiff)
+       ("proj.4" ,proj.4)
+       ("libxml2" ,libxml2)
+       ("zlib" ,zlib)))
+     (synopsis "Gaia common graphics support")
+     (description "libgaiagraphics is a library supporting
+ common-utility raster handling methods.")
+    (home-page "https://www.gaia-gis.it/fossil/libgaiagraphics/index")
+    (license license:lgpl3+)))
+
 (define-public libgeotiff
   (package
     (name "libgeotiff")
-- 
2.16.1

Message #53 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH v2 3/4] Revert "gnu: Remove wxwidgets <at> 2.8."
Date: Thu, 22 Feb 2018 00:09:59 +0100

This reverts commit 6f9ba4c91c096a2fb95da111be0657d99ef2b683.
---
 gnu/packages/wxwidgets.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 84446d8ef..ca357ad01 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -97,6 +97,34 @@ a graphical user interface.  It has language bindings for Python, Perl, Ruby
 and many other languages.")
     (license (list l:lgpl2.0+ (l:fsf-free "file://doc/license.txt")))))
 
+(define-public wxwidgets-2
+  (package
+    (inherit wxwidgets)
+    (version "2.8.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/wxWidgets/wxWidgets/"
+                           "releases/download/v" version
+                           "/wxGTK-" version ".tar.gz"))
+       (sha256
+        (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"))))
+    (inputs
+     `(("gtk" ,gtk+-2)
+       ("libjpeg" ,libjpeg)
+       ("libtiff" ,libtiff)
+       ("libmspack" ,libmspack)
+       ("sdl" ,sdl)
+       ("unixodbc" ,unixodbc)))
+    (arguments
+     `(#:configure-flags
+       '("--enable-unicode" "--with-regex=sys" "--with-sdl")
+       #:make-flags
+       (list (string-append "LDFLAGS=-Wl,-rpath="
+                            (assoc-ref %outputs "out") "/lib"))
+       ;; No 'check' target.
+       #:tests? #f))))
+
 (define-public wxwidgets-gtk2
   (package (inherit wxwidgets)
            (inputs `(("gtk+" ,gtk+-2)
-- 
2.16.1

Message #56 received at 30492 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 30492 <at> debbugs.gnu.org
Subject: [PATCH v2 4/4] gnu: Add spatialite-gui.
Date: Thu, 22 Feb 2018 00:10:51 +0100

* gnu/packages/geo.scm (spatialite-gui): New variable.
---
 gnu/packages/geo.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 6fe5f95f7..d493e8faf 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -43,6 +43,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages webkit)
+  #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xml))
 
 (define-public geos
@@ -457,3 +458,36 @@ development.")
     (synopsis "Python bindings for Mapnik")
     (description "This package provides Python bindings for Mapnik.")
     (license license:lgpl2.1+)))
+
+(define-public spatialite-gui
+  (package
+    (name "spatialite-gui")
+    (version "1.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/spatialite_gui-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1r05dz9pyc8vsd2wbqxcsracpfbaamz470rcyp2myfpqwznv376b"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("freexl" ,freexl)
+       ("geos" ,geos)
+       ("libgaiagraphics" ,libgaiagraphics)
+       ("libspatialite" ,libspatialite)
+       ("libxml2" ,libxml2)
+       ("proj.4" ,proj.4)
+       ("sqlite" ,sqlite)
+       ("wxwidgets" ,wxwidgets-2)
+       ("zlib" ,zlib)))
+    (synopsis "Graphical user interface for SpatiaLite")
+    (description "Spatialite-gui provides a visual interface for viewing and
+ maintaining a spatialite database.  You can easily see the structure of the
+ tables and data contents using point and click functions, many of which
+ construct common SQL queries, or craft your own SQL queries.")
+    (home-page "https://www.gaia-gis.it/fossil/spatialite_gui/index")
+    (license license:gpl3+)))
-- 
2.16.1

Message #61 received at 30492-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 30492-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2 0/4] Add libspatialite and spatialite-gui
Date: Thu, 22 Feb 2018 14:39:05 +0100

[Message part 1 (text/plain, inline)]

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:

> On Sun, 18 Feb 2018 18:08:49 +0100
> Marius Bakke <mbakke <at> fastmail.com> wrote:
>
>> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> writes:
>> 
>> > * gnu/packages/geo.scm (spatialite-gui): New variable.  
>> 
>> LGTM.  Can you rebase this series on current 'master' and send updated
>> patches?
>> 
>> TIA!
>
> Here is the second version of the patchset with
>
> * Rebased to current master.
> * libspatialite: Just disabled the failing tests.
> * wxwidgets: Used just a revert.
>
>
>
>
> Björn Höfling (4):
>   gnu: Add libspatialite.
>   gnu: Add libgaiagraphics.
>   Revert "gnu: Remove wxwidgets <at> 2.8."
>   gnu: Add spatialite-gui.

Applied, thank you!

I slightly tweaked the synopsis and description of libspatialite, hope
that was okay (the second sentence seemed redundant to me).

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.