[bug#30456] [PATCH 1/2] gnu: Add mapnik.

[bug#30456] [PATCH 1/2] gnu: Add mapnik.

[Arun Isaac]

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

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9c7f7c115..b37320e8b 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 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>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,16 +24,21 @@
 (define-module (gnu packages geo)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system scons)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
 
@@ -242,3 +248,46 @@ projections.")
                    (license:non-copyleft "http://www.epsg.org/TermsOfUse")
                    ;; cmake/*
                    license:boost1.0))))
+
+(define-public mapnik
+  (package
+    (name "mapnik")
+    (version "3.0.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/mapnik/mapnik/releases/download/v"
+                           version "/mapnik-v" version ".tar.bz2"))
+       (sha256
+        (base32
+         "1cdivxr6p1gs17ixvjny59sxxaj391fq7famflr24ad3s58n63ha"))))
+    (build-system scons-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("freetype" ,freetype)
+       ("harfbuzz" ,harfbuzz)
+       ("icu4c" ,icu4c)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("proj.4" ,proj.4)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:scons ,scons-python2
+       #:scons-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" %output)
+             (string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib"))))
+    (home-page "http://mapnik.org/")
+    (synopsis "Toolkit for developing mapping applications")
+    (description "Mapnik is a toolkit for developing mapping applications.  It
+is basically a collection of geographic objects like maps, layers,
+datasources, features, and geometries.  At its core is a C++ shared library
+providing algorithms and patterns for spatial data access and visualization.
+The library does not rely on any specific windowing system and can be deployed
+to any server environment.  It is intended to play fair in a multi-threaded
+environment and is aimed primarily, but not exclusively, at web-based
+development.")
+    (license license:lgpl2.1+)))
-- 
2.15.1

[bug#30456] [PATCH 2/2] gnu: Add python2-mapnik.

[Arun Isaac]

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

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index b37320e8b..cc6af8ce6 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -24,12 +24,14 @@
 (define-module (gnu packages geo)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system scons)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages glib)
@@ -291,3 +293,73 @@ to any server environment.  It is intended to play fair in a multi-threaded
 environment and is aimed primarily, but not exclusively, at web-based
 development.")
     (license license:lgpl2.1+)))
+
+(define-public python2-mapnik
+  (package
+    (name "python2-mapnik")
+    (version "3.0.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/mapnik/python-mapnik/archive/v"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0w7wg72gnwmbjani9sqk42p2jwqkrl9hsdkawahni5m05xsifcb4"))))
+    (build-system python-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("harfbuzz" ,harfbuzz)
+       ("icu4c" ,icu4c)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("mapnik" ,mapnik)
+       ("proj.4" ,proj.4)
+       ("python2-pycairo" ,python2-pycairo)))
+    (native-inputs
+     `(("python2-nose" ,python2-nose)
+       ;; Test data is released as separate tarballs
+       ("test-data"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "https://github.com/mapnik/test-data/archive/v"
+                               version ".tar.gz"))
+           (file-name (string-append "python2-mapnik-test-data-" version ".tar.gz"))
+           (sha256 (base32 "0wlkq7ywczh229kb608cnnccyvcly90krkq93ja9ggjhdq3ddn2y"))))
+       ("test-data-visual"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "https://github.com/mapnik/test-data-visual/archive/v"
+                               version ".tar.gz"))
+           (file-name (string-append "python2-mapnik-test-data-visual-"
+                                     version ".tar.gz"))
+           (sha256 (base32 "0l9wmkjbghr48vk06s0rzh4gps5zg3b0sz5j5ivkb9wiy014i6zm"))))))
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         ;; Unpack test data into the source tree
+         (add-after 'unpack 'unpack-submodules
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((unpack (lambda (source target)
+                             (with-directory-excursion target
+                               (invoke "tar" "xvf" (assoc-ref inputs source)
+                                       "--strip-components=1")))))
+               (unpack "test-data" "test/data")
+               (unpack "test-data-visual" "test/data-visual"))))
+         ;; Skip failing tests
+         (add-after 'unpack 'skip-tests
+           (lambda _
+             (let ((skipped-tests (list "test_vrt_referring_to_missing_files"
+                                        "test_proj_antimeridian_bbox"
+                                        "test_render_with_scale_factor")))
+               (substitute* "setup.cfg"
+                 (("\\[nosetests\\]" all)
+                  (string-append all "\nexclude=^("
+                                 (string-join skipped-tests "|") ")$")))))))))
+    (home-page "https://github.com/mapnik/python-mapnik")
+    (synopsis "Python bindings for Mapnik")
+    (description "This package provides Python bindings for Mapnik.")
+    (license license:lgpl2.1+)))
-- 
2.15.1

[bug#30456] [PATCH 1/2] gnu: Add mapnik.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

On Wed, Feb 14, 2018 at 09:59:03PM +0530, Arun Isaac wrote:
> * gnu/packages/geo.scm (mapnik): New variable.

Thanks!

> +    (version "3.0.16")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/mapnik/mapnik/releases/download/v"
> +                           version "/mapnik-v" version ".tar.bz2"))

I notice that 3.0.18 is available upstream. Please use that if possible,
otherwise leave a code comment explaining why we use an older release.

Otherwise LGTM

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30456] [PATCH 2/2] gnu: Add python2-mapnik.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

On Wed, Feb 14, 2018 at 10:08:30PM +0530, Arun Isaac wrote:
> * gnu/packages/geo.scm (python2-mapnik): New variable.

Thanks!

> +     `(#:python ,python-2

If it doesn't support Python 3, please leave a short comment saying so.
Otherwise can you add both variants?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30456] [PATCH 1/2] gnu: Add mapnik.

[Björn Höfling]

Thanks for adding this!

On Wed, 14 Feb 2018 21:59:03 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

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

[..]

> +    (inputs
> +     `(("boost" ,boost)
> +       ("freetype" ,freetype)
> +       ("harfbuzz" ,harfbuzz)
> +       ("icu4c" ,icu4c)
> +       ("libjpeg-turbo" ,libjpeg-turbo)
> +       ("libpng" ,libpng)
> +       ("libtiff" ,libtiff)
> +       ("proj.4" ,proj.4)
> +       ("zlib" ,zlib)))

Have you tried to add these dependencies to gain potentially more
rendering input/output:

libwebp
cairo
sqlite

[..]

> +    (license license:lgpl2.1+)))

Many files under ./demo are licensed under "license:gpl2.0+". Add that
license, too.

Furthermore, there are:

license:boost1.0 ;; deps/boost
license:bsd3 ;; deps/mapbox and deps/mapnik/sparsehash

Finally, dep/agg has another license. Is it expat or even less? Here it
is:

// Permission to copy, use, modify, sell and distribute this software
// is granted provided this copyright notice appears in all copies.
// This software is provided "as is" without express or implied
// warranty, and with no claim as to its suitability for any purpose.



Otherwise, LGTM.

Björn

[bug#30456] [PATCH 1/2] gnu: Add mapnik.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 695 bytes --]

On Wed, Feb 14, 2018 at 11:50:34PM +0100, Björn Höfling wrote:
> Finally, dep/agg has another license. Is it expat or even less? Here it
> is:
> 
> // Permission to copy, use, modify, sell and distribute this software
> // is granted provided this copyright notice appears in all copies.
> // This software is provided "as is" without express or implied
> // warranty, and with no claim as to its suitability for any purpose.

This is basically a permissive non-copyleft free software license. It's
not the Expat / MIT license.

I found a few other instances of it with Google, but I don't think it
has a name. In that case, it could be described with the non-copyleft
procedure.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30456] [PATCH 0/2] Mapnik

[Arun Isaac]

Thanks for the review.

I have made the following changes

* switched to the latest 3.0.18 release of mapnik
* added libxml2, libwebp, cairo and sqlite as inputs
* added the missing licenses
* added a comment saying that python-mapnik builds successfully only with
  python 2

I believe I have covered all issues raised. Are there any more?

Arun Isaac (2):
  gnu: Add mapnik.
  gnu: Add python2-mapnik.

 gnu/packages/geo.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

-- 
2.15.1

[bug#30456] [PATCH 1/2] gnu: Add mapnik.

[Arun Isaac]

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

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9c7f7c115..360e188b5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 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>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,16 +24,22 @@
 (define-module (gnu packages geo)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system scons)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
 
@@ -242,3 +249,59 @@ projections.")
                    (license:non-copyleft "http://www.epsg.org/TermsOfUse")
                    ;; cmake/*
                    license:boost1.0))))
+
+(define-public mapnik
+  (package
+    (name "mapnik")
+    (version "3.0.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/mapnik/mapnik/releases/download/v"
+                           version "/mapnik-v" version ".tar.bz2"))
+       (sha256
+        (base32
+         "06frcikaj2mgz3abfk5h0z4j3hbksi0zikwjngbjv4p5f3pwxf8q"))))
+    (build-system scons-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("cairo" ,cairo)
+       ("freetype" ,freetype)
+       ("harfbuzz" ,harfbuzz)
+       ("icu4c" ,icu4c)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("libwebp" ,libwebp)
+       ("libxml2" ,libxml2)
+       ("proj.4" ,proj.4)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:scons ,scons-python2
+       #:scons-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" %output)
+             (string-append "CUSTOM_LDFLAGS=-Wl,-rpath=" %output "/lib"))))
+    (home-page "http://mapnik.org/")
+    (synopsis "Toolkit for developing mapping applications")
+    (description "Mapnik is a toolkit for developing mapping applications.  It
+is basically a collection of geographic objects like maps, layers,
+datasources, features, and geometries.  At its core is a C++ shared library
+providing algorithms and patterns for spatial data access and visualization.
+The library does not rely on any specific windowing system and can be deployed
+to any server environment.  It is intended to play fair in a multi-threaded
+environment and is aimed primarily, but not exclusively, at web-based
+development.")
+    (license (list license:lgpl2.1+
+                   ;; demo/viewer, demo/python/rundemo.py
+                   license:gpl2+
+                   ;; deps/boost, deps/mapbox, deps/agg/include/agg_conv_offset.h
+                   license:boost1.0
+                   ;; deps/mapnik/sparsehash
+                   license:bsd-3
+                   ;; deps/agg
+                   (license:non-copyleft "file://deps/agg/copying")))))
+
-- 
2.15.1

[bug#30456] [PATCH 2/2] gnu: Add python2-mapnik.

[Arun Isaac]

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

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 360e188b5..6943fd1f1 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -24,12 +24,14 @@
 (define-module (gnu packages geo)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system scons)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages fontutils)
@@ -305,3 +307,73 @@ development.")
                    ;; deps/agg
                    (license:non-copyleft "file://deps/agg/copying")))))
 
+(define-public python2-mapnik
+  (package
+    (name "python2-mapnik")
+    (version "3.0.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/mapnik/python-mapnik/archive/v"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0w7wg72gnwmbjani9sqk42p2jwqkrl9hsdkawahni5m05xsifcb4"))))
+    (build-system python-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("harfbuzz" ,harfbuzz)
+       ("icu4c" ,icu4c)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("libwebp" ,libwebp)
+       ("mapnik" ,mapnik)
+       ("proj.4" ,proj.4)
+       ("python2-pycairo" ,python2-pycairo)))
+    (native-inputs
+     (let ((test-data-input
+            (lambda (repository version hash)
+              (origin
+                (method url-fetch)
+                (uri (string-append "https://github.com/mapnik/" repository
+                                    "/archive/v" version ".tar.gz"))
+                (file-name (string-append "python-mapnik-" repository
+                                          "-" version ".tar.gz"))
+                (sha256 (base32 hash))))))
+       `(("python2-nose" ,python2-nose)
+         ;; Test data is released as separate tarballs
+         ("test-data"
+          ,(test-data-input "test-data" "3.0.18"
+                            "10cvgn5gxn8ldrszj24zr1vzm5w76kqk4s7bl2zzp5yvkhh8lj1n"))
+         ("test-data-visual"
+          ,(test-data-input "test-data-visual" "3.0.18"
+                            "1cb9ghy8sis0w5fkp0dvwxdqqx44rhs9a9w8g9r9i7md1c40r80i")))))
+    (arguments
+     `(#:python ,python-2 ; Python 3 support is incomplete, and the build fails
+       #:phases
+       (modify-phases %standard-phases
+         ;; Unpack test data into the source tree
+         (add-after 'unpack 'unpack-submodules
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((unpack (lambda (source target)
+                             (with-directory-excursion target
+                               (invoke "tar" "xvf" (assoc-ref inputs source)
+                                       "--strip-components=1")))))
+               (unpack "test-data" "test/data")
+               (unpack "test-data-visual" "test/data-visual"))))
+         ;; Skip failing tests
+         (add-after 'unpack 'skip-tests
+           (lambda _
+             (let ((skipped-tests (list "test_vrt_referring_to_missing_files"
+                                        "test_proj_antimeridian_bbox"
+                                        "test_render_with_scale_factor")))
+               (substitute* "setup.cfg"
+                 (("\\[nosetests\\]" all)
+                  (string-append all "\nexclude=^("
+                                 (string-join skipped-tests "|") ")$")))))))))
+    (home-page "https://github.com/mapnik/python-mapnik")
+    (synopsis "Python bindings for Mapnik")
+    (description "This package provides Python bindings for Mapnik.")
+    (license license:lgpl2.1+)))
-- 
2.15.1

[bug#30456] [PATCH 0/2] Mapnik

[Björn Höfling]

On Fri, 16 Feb 2018 03:57:32 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

> Thanks for the review.
> 
> I have made the following changes
> 
> * switched to the latest 3.0.18 release of mapnik
> * added libxml2, libwebp, cairo and sqlite as inputs
> * added the missing licenses
> * added a comment saying that python-mapnik builds successfully only
> with python 2
> 
> I believe I have covered all issues raised. Are there any more?
> 
> Arun Isaac (2):
>   gnu: Add mapnik.
>   gnu: Add python2-mapnik.
> 
>  gnu/packages/geo.scm | 135
> +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> 135 insertions(+)
> 


Looks good. Thank you!

Björn

bug#30456: [PATCH 0/2] Mapnik

[Arun Isaac]

Pushed to master. Thank you both for the review!