[bug#29136] [PATCH 0/5] gnu: calibre: Update to 3.11.1.

[bug#29136] [PATCH 0/5] gnu: calibre: Update to 3.11.1.

[Brendan Tildesley]

This updates Calibre to 3.11.1, adds two new inputs python2-dukpy, and
optipng, and fixes the build script to install a mimetype file, which I
missed when I initially packaged 3.6.0.
Calibre has had a huge number of changes since 3.6.0, but everything
seems to build just fine without any changes to [arguments].
The builder complains about not being able to make /homeless-shelter,
something in the Nix code I think, but when I set  a HOME, it changed
nothing in the resulting built package so I just left it.
I know nothing about the setuptools and shim wrapper stuff mentioned in
the FIXME.

[bug#29136] [PATCH 1/5] gnu: calibre: Update to 3.11.1.

[Brendan Tildesley]

* gnu/packages/ebook.scm (calibre): Update to 3.11.1.
---
 gnu/packages/ebook.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 4bcaa0abf..da7c9dc0f 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -72,7 +72,7 @@
 (define-public calibre
   (package
     (name "calibre")
-    (version "3.6.0")
+    (version "3.11.1")
     (source
       (origin
         (method url-fetch)
@@ -81,7 +81,7 @@
                             version ".tar.xz"))
         (sha256
          (base32
-          "0vp2nds4b5xbchsh1rpc1q7093gd26dnw7mgbnax97dcchvlc4sc"))
+          "0kwza7iyyyfhq476z5fk9962iyd0qpgmzm1k36nqcy8sfjbk8mrl"))
         ;; Remove non-free or doubtful code, see
         ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
         (modules '((guix build utils)))
-- 
2.14.3

[bug#29136] [PATCH 2/5] gnu: Add python-dukpy, python2-dukpy.

[Brendan Tildesley]

gnu/packages/python.scm (python-dukpy, python2-dukpy): New variables.
---
 gnu/packages/python.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e8a733919..664adfd58 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
+;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16871,3 +16872,26 @@ executed more than a given number of times during a given period.")
 
 (define-public python2-ratelimiter
   (package-with-python2 python-ratelimiter))
+
+(define-public python-dukpy
+  (package
+    (name "python-dukpy")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/kovidgoyal/dukpy/archive/v"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0pj39rfwlzivqm5hkrsza7gssg6ggpxlq5ivc8f3h7x5pfgc6y6c"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/kovidgoyal/dukpy")
+    (synopsis "Run JavaScript in python")
+    (description
+     "dukpy is a JavaScript runtime environment for Python using the duktape
+embeddable JavaScript engine.")
+    (license license:expat)))
+
+(define-public python2-dukpy
+  (package-with-python2 python-dukpy))
-- 
2.14.3

[bug#29136] [PATCH 2/5] gnu: Add python-dukpy, python2-dukpy.

[Marius Bakke]

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

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> gnu/packages/python.scm (python-dukpy, python2-dukpy): New variables.

[...]

> +    (description
> +     "dukpy is a JavaScript runtime environment for Python using the duktape
> +embeddable JavaScript engine.")
> +    (license license:expat)))

'errors.c' is actually GPL3.  I added it.

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

[bug#29136] [PATCH 3/5] gnu: calibre: Add python2-dukpy as an input.

[Brendan Tildesley]

* gnu/packages/ebook.scm (calibre)[inputs]: Add python2-dukpy. dukpy was
  unbundled from Calibre, so we need to to use the Guix version.
---
 gnu/packages/ebook.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index da7c9dc0f..a8c6f5975 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -126,6 +126,7 @@
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
        ("python2-dnspython" ,python2-dnspython)
+       ("python2-dukpy" ,python2-dukpy)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-html5-parser" ,python2-html5-parser)
        ("python2-lxml" ,python2-lxml)
-- 
2.14.3

[bug#29136] [PATCH 4/5] gnu: calibre: Add optipng as an input.

[Brendan Tildesley]

* gnu/packages/ebook.scm (calibre)[inputs]: Add optipng.
---
 gnu/packages/ebook.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a8c6f5975..659ec57d5 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -116,6 +116,7 @@
        ("libusb" ,libusb)
        ("libxrender" ,libxrender)
        ("openssl" ,openssl)
+       ("optipng" ,optipng)
        ("podofo" ,podofo)
        ("poppler" ,poppler)
        ("python" ,python-2)
-- 
2.14.3

[bug#29136] [PATCH 5/5] gnu: calibre: Install mimetypes.

[Brendan Tildesley]

* gnu/packages/ebook.scm (calibre)[arguments]: Install mimetypes xml file.
---
 gnu/packages/ebook.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 659ec57d5..5c392cc75 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -183,7 +183,12 @@
                        (find-files (string-append
                                     (assoc-ref inputs "font-liberation")
                                     "/share/fonts/truetype")))
-             #t)))))
+             #t))
+         (add-after 'install-font-liberation 'install-mimetypes
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "resources/calibre-mimetypes.xml"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/mime/packages")))))))
     (home-page "http://calibre-ebook.com/")
     (synopsis "E-book library management software")
     (description "Calibre is an ebook library manager.  It can view, convert
-- 
2.14.3

[bug#29136] [PATCH 5/5] gnu: calibre: Install mimetypes.

[Marius Bakke]

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

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> * gnu/packages/ebook.scm (calibre)[arguments]: Install mimetypes xml file.
> ---
>  gnu/packages/ebook.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
> index 659ec57d5..5c392cc75 100644
> --- a/gnu/packages/ebook.scm
> +++ b/gnu/packages/ebook.scm
> @@ -183,7 +183,12 @@
>                         (find-files (string-append
>                                      (assoc-ref inputs "font-liberation")
>                                      "/share/fonts/truetype")))
> -             #t)))))
> +             #t))
> +         (add-after 'install-font-liberation 'install-mimetypes
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (install-file "resources/calibre-mimetypes.xml"
> +                           (string-append (assoc-ref outputs "out")
> +                                          "/share/mime/packages")))))))

(install-file ...) has an unspecified return value, so I added a #t here.

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

bug#29136: [PATCH 0/5] gnu: calibre: Update to 3.11.1.

[Marius Bakke]

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

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> This updates Calibre to 3.11.1, adds two new inputs python2-dukpy, and
> optipng, and fixes the build script to install a mimetype file, which I
> missed when I initially packaged 3.6.0.

Applied all five patches!  Thank you for maintaining this package :)

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