Merge branch 'master' into core-updates

1 files changed, 113 insertions, 1 deletions

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d75416415c..9014cc3206 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@famulari.name>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2017 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -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
@@ -153,6 +154,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")
@@ -202,6 +233,54 @@ 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 "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.")
+    (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")
@@ -378,3 +457,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+)))