[PATCH 0/6] Update spatialite-gui

Done

Details

2 participants

Felix Gruber
Guillaume Le Vaillant

Owner: unassigned

Submitted by: Felix Gruber

Severity: normal

Felix Gruber wrote on 28 Mar 2021 10:34

Recipients:(address . guix-patches@gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328083408.3462-1-felgru@posteo.net

Hi Guix,

the following patches update spatialite-gui and some of its

dependencies.

I've packaged two new dependencies: libxlsxwriter and librasterlite2.

I've also removed the libgaiagraphics package since it was deprecated

upstream in 2014 in favor of librasterlite2 and after the update of

spatialite-gui there are no more packages that depend on

libgaiagraphics.

Felix Gruber (6):

gnu: libspatialite: Update dependencies.

gnu: Add libxlsxwriter.

licenses: Add Free Art License 1.3.

gnu: Add librasterlite2.

gnu: spatialite-gui: Update to 2.1.0-beta1.

gnu: libgaiagraphics: Remove package.

gnu/packages/geo.scm | 132 ++++++++++++++++++++++++++++--------------

gnu/packages/xml.scm | 42 ++++++++++++++

guix/import/utils.scm | 1 +

guix/licenses.scm | 7 +++

4 files changed, 138 insertions(+), 44 deletions(-)

2.30.2

Felix Gruber wrote on 28 Mar 2021 10:40

[PATCH 1/6] gnu: libspatialite: Update dependencies.

Recipients:(address . 47443@debbugs.gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328084023.3749-1-felgru@posteo.net

* gnu/packages/geo.scm (libspatialite, spatialite-tools): Update
dependencies.
[inputs] replace proj.4 with proj and remove zlib which is not used
anymore since libspatialite started using minizip.
(libspatialite)[arguments] fix regex to not disable more tests than
necessary.
---
 gnu/packages/geo.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Toggle diff (40 lines)diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 97fa83b86b..8c98534a4a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -442,9 +442,8 @@ writing GeoTIFF information tags.")
        ("librttopo" ,librttopo)
        ("libxml2" ,libxml2)
        ("minizip" ,minizip)
-       ("proj.4" ,proj.4)
-       ("sqlite" ,sqlite)
-       ("zlib" ,zlib)))
+       ("proj" ,proj)
+       ("sqlite" ,sqlite)))
     (arguments
      `(#:configure-flags
        '("--enable-rttopo=yes")
@@ -454,7 +453,7 @@ writing GeoTIFF information tags.")
          (add-after 'unpack 'ignore-broken-tests
            (lambda _
              (substitute* '("test/Makefile.in")
-               (("\tcheck_sql_stm.*" all) "\tcheck_multithread$(EXEEXT) \\\n")
+               (("\tcheck_sql_stmt.* (check_sql_.*)" all tiny) (string-append "\t" tiny))
                (("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n"))
                (("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4)))
              #t)))))
@@ -1748,10 +1747,9 @@ associated attribute file (@file{.dbf}).")
        ("libspatialite" ,libspatialite)
        ("libxml2" ,libxml2)
        ("minizip" ,minizip)
-       ("proj.4" ,proj.4)
+       ("proj" ,proj)
        ("readosm" ,readosm)
-       ("sqlite" ,sqlite)
-       ("zlib" ,zlib)))
+       ("sqlite" ,sqlite)))
     (synopsis "Collection of command line tools for SpatiaLite")
     (description
      "@code{spatialite-tools} is a collection of Command Line Interface (CLI)
-- 
2.30.2

Felix Gruber wrote on 28 Mar 2021 10:40

[PATCH 2/6] gnu: Add libxlsxwriter.

Recipients:(address . 47443@debbugs.gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328084023.3749-2-felgru@posteo.net

* gnu/packages/xml.scm (libxlsxwriter): New variable.

---

gnu/packages/xml.scm | 42 ++++++++++++++++++++++++++++++++++++++++++

1 file changed, 42 insertions(+)

Toggle diff (62 lines)diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index defc0323e6..a8b0d996cf 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -215,6 +216,47 @@ hierarchical form with variable field lengths.")
 project (but it is usable outside of the Gnome platform).")
     (license license:x11)))
 
+(define-public libxlsxwriter
+  (package
+    (name "libxlsxwriter")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+         (url "https://github.com/jmcnamara/libxlsxwriter")
+         (commit (string-append "RELEASE_" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+          "070pfqggia71z4ichr5yrwfndfz903z941ns72vy0lvb1mpp7g05"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Remove bundled minizip source
+        '(begin
+           (delete-file-recursively "third_party/minizip")
+           #t))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f                       ; tests require unpackaged ctest
+       #:test-target "test"
+       #:make-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             "USE_STANDARD_TMPFILE=1"
+             "USE_SYSTEM_MINIZIP=1")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))         ; no configure script
+    (inputs
+     `(("minizip" ,minizip)))
+    (home-page "https://github.com/jmcnamara/libxlsxwriter")
+    (synopsis "C library for creating Excel XLSX files")
+    (description
+     "Libxlsxwriter is a C library that can be used to write text, numbers,
+formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.")
+    (license (list license:bsd-2))))
+
 ;; This is the latest stable release.
 (define-public libxmlplusplus
   (package
-- 
2.30.2

Felix Gruber wrote on 28 Mar 2021 10:40

[PATCH 3/6] licenses: Add Free Art License 1.3.

Recipients:(address . 47443@debbugs.gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328084023.3749-3-felgru@posteo.net

* guix/licenses.scm (lal1.3): New variable.
* guix/import/utils.scm (spdx-string->license): Add LAL-1.3.
---
 guix/import/utils.scm | 1 +
 guix/licenses.scm     | 7 +++++++
 2 files changed, 8 insertions(+)

Toggle diff (46 lines)diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 64d1385164..6b85b3aa1d 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -169,6 +169,7 @@ of the string VERSION is replaced by the symbol 'version."
     ("Imlib2"                      'license:imlib2)
     ("IPA"                         'license:ipa)
     ("IPL-1.0"                     'license:ibmpl1.0)
+    ("LAL-1.3"                     'license:lal1.3)
     ("LGPL-2.0"                    'license:lgpl2.0)
     ("LGPL-2.0+"                   'license:lgpl2.0+)
     ("LGPL-2.1"                    'license:lgpl2.1)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 0a36067387..4718ccf83f 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2020 André Batista <nandre@riseup.net>
 ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -68,6 +69,7 @@
             imlib2
             ipa
             knuth
+            lal1.3
             lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+ llgpl
             lppl lppl1.0+ lppl1.1+ lppl1.2 lppl1.2+
             lppl1.3 lppl1.3+
@@ -411,6 +413,11 @@ at URI, which may be a file:// URI pointing the package's tree."
            "http://www.ctan.org/license/knuth"
            "Modification are only permitted under a different name."))
 
+(define lal1.3
+  (license "Free Art License 1.3"
+           "http://artlibre.org/licence/lal/en/"
+           "https://www.gnu.org/licenses/license-list#FreeArt"))
+
 (define lgpl2.0
   (license "LGPL 2.0"
            "https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html"
-- 
2.30.2

Felix Gruber wrote on 28 Mar 2021 10:40

[PATCH 4/6] gnu: Add librasterlite2.

Recipients:(address . 47443@debbugs.gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328084023.3749-4-felgru@posteo.net

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

---

gnu/packages/geo.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 66 insertions(+)

Toggle diff (79 lines)diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 8c98534a4a..a542f3905e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -373,6 +373,72 @@ writing GeoTIFF information tags.")
                    (license:non-copyleft "file://LICENSE"
                                          "See LICENSE in the distribution.")))))
 
+(define-public librasterlite2
+  (package
+    (name "librasterlite2")
+    (version "1.1.0-beta1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.gaia-gis.it/gaia-sins/librasterlite2-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1x24gqp4hsq97c31ncwxblab0x0863q8v1z42jil7lvsq3glqa7p"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; ignore failing test test_map_mono
+         (add-after 'unpack 'ignore-broken-tests
+           (lambda _
+             (substitute* '("test/Makefile.in")
+               (("(\ttest_map_.*) test_map_mono.*" all t)
+                (string-append t " \\\n")))
+             #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("curl" ,curl)
+       ("freetype" ,freetype)
+       ("freexl" ,freexl)
+       ("giflib" ,giflib)
+       ("libgeotiff" ,libgeotiff)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("librttopo" ,librttopo)
+       ("libspatialite" ,libspatialite)
+       ("libtiff" ,libtiff)
+       ("libwebp" ,libwebp)
+       ("libxml2" ,libxml2)
+       ("lz4" ,lz4)
+       ("minizip" ,minizip)
+       ("openjpeg" ,openjpeg)
+       ("proj" ,proj)
+       ("sqlite" ,sqlite)
+       ("zstd" ,zstd "lib")))
+    (synopsis "Library to work with huge raster coverages using a SpatiaLite")
+    (description
+     "librasterlite2 is a library that stores and retrieves huge raster
+coverages using a SpatiaLite DBMS.")
+    (home-page "https://www.gaia-gis.it/fossil/librasterlite2/index")
+    ;; For the genuine librasterlite-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.
+    ;; The tools supporting the library (both rl2tool and wmslite) are
+    ;; licensed under the GPL v3 (or any subsequent version) terms.
+    ;; The test/*.svg files are placed in the public domain, except for
+    ;; test/Car_Yellow.svg which is licensed under the Free Art License 1.3.
+    (license (list license:gpl2+
+                   license:gpl3+
+                   license:lal1.3
+                   license:lgpl2.1+
+                   license:mpl1.1
+                   license:public-domain))))
+
 (define-public librttopo
   (package
     (name "librttopo")
-- 
2.30.2

Felix Gruber wrote on 28 Mar 2021 10:40

[PATCH 5/6] gnu: spatialite-gui: Update to 2.1.0-beta1.

Recipients:(address . 47443@debbugs.gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328084023.3749-5-felgru@posteo.net

* gnu/packages/geo.scm (spatialite-gui): Update to 2.1.0-beta1.
[inputs] Replace proj.4 with proj and wxwidgets-2 with wxwidgets.
Add curl, giflib, librasterlite2, librttopo, libwebp, libxlsxwriter,
lz4, minizip, openjpeg, postgresql, virtualpg, zstd.
Remove libgaiagraphics and zlib.
---
 gnu/packages/geo.scm | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

Toggle diff (53 lines)diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a542f3905e..ade6601b6a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -751,7 +751,7 @@ development.")
 (define-public spatialite-gui
   (package
     (name "spatialite-gui")
-    (version "1.7.1")
+    (version "2.1.0-beta1")
     (source
      (origin
        (method url-fetch)
@@ -759,21 +759,31 @@ development.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "1r05dz9pyc8vsd2wbqxcsracpfbaamz470rcyp2myfpqwznv376b"))))
+         "0cyv4cycl073p9lnnnglcb72qn71g8h9g5zn4gzw7swcy5nxjj5s"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("freexl" ,freexl)
+     `(("curl" ,curl)
+       ("freexl" ,freexl)
        ("geos" ,geos)
-       ("libgaiagraphics" ,libgaiagraphics)
+       ("giflib" ,giflib)
        ("libjpeg-turbo" ,libjpeg-turbo)
+       ("librasterlite2" ,librasterlite2)
+       ("librttopo" ,librttopo)
        ("libspatialite" ,libspatialite)
+       ("libwebp" ,libwebp)
+       ("libxlsxwriter" ,libxlsxwriter)
        ("libxml2" ,libxml2)
-       ("proj.4" ,proj.4)
+       ("lz4" ,lz4)
+       ("minizip" ,minizip)
+       ("openjpeg" ,openjpeg)
+       ("postgresql" ,postgresql)
+       ("proj" ,proj)
        ("sqlite" ,sqlite)
-       ("wxwidgets" ,wxwidgets-2)
-       ("zlib" ,zlib)))
+       ("virtualpg" ,virtualpg)
+       ("wxwidgets" ,wxwidgets)
+       ("zstd" ,zstd "lib")))
     (arguments
      `(#:phases (modify-phases %standard-phases
                   (add-after 'unpack 'fix-gui
-- 
2.30.2

Felix Gruber wrote on 28 Mar 2021 10:40

[PATCH 6/6] gnu: libgaiagraphics: Remove package.

Recipients:(address . 47443@debbugs.gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)

Message-ID:20210328084023.3749-6-felgru@posteo.net

* gnu/packages/geo.scm (libgaiagraphics): Delete.

---

gnu/packages/geo.scm | 30 ------------------------------

1 file changed, 30 deletions(-)

Toggle diff (43 lines)diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index ade6601b6a..a2d9d47af5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -294,36 +294,6 @@ 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)
-       ("libjpeg-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.30.2

Guillaume Le Vaillant wrote on 29 Mar 2021 12:09

Re: [bug#47443] [PATCH 0/6] Update spatialite-gui

Recipients:(name . Felix Gruber)(address . felgru@posteo.net)(address . 47443-done@debbugs.gnu.org)

Message-ID:87wntqe0fn.fsf@yamatai

Patches pushed as 109f13c0981b8134c98a2326f22cc837ec523712 and
following with a few modifications:

 - libxslxwriter: I replaced the hard-coded "gcc" with "(cc-for-target)",
   and I enabled the tests by adding python-pytest to 'native-inputs'.
 - librasterlite2: I fixed the source URL and I didn't disable the
   test_map_mono test as it worked fine when I built the package.
 - spatialite-gui: I fixed the source URL.
 - libgaiagraphics: I added the explaination for the package removal in
   the commit message.

Thanks.

-----BEGIN PGP SIGNATURE-----

iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYGGnTA8cZ2x2QHBvc3Rl

by5uZXQACgkQa+ggit8h/j/TfgD9GbEbPnT8cFeytiae6/nqL/bC11jDK3TKTmHw

4PtQ0eYA/R4RrBsUpUo1Pmsrm9Zu/hvbdzgheABO5MuQJnaUKJ9B

=2JEl

-----END PGP SIGNATURE-----

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 47443@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 47443

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date