bug#26924: [PATCH 0/12] Update Calibre to 2.85.1

bug#26924: [PATCH 0/12] Update Calibre to 2.85.1

[Brendan Tildesley]

There is still much to do, but I think if fixed more than I've broken,
so I'll post these patches now. I'm not sure if I should have rebased
them into fewer commits, but that's easier to do than to split them
apart again.

TODO

* Test numerous features of the program on GuixSD.

* .desktop files, icons. linux.py contains some .desktop files and other
data, but they don't seem to get installed. When installed,
/gnu/store/...-calibre-2.85.1/share/appdata/calibre-* contains .xml
files There does not appear to be any desktop files installed by default.

* MIME data stuff. Not sure how it works. Gentoo has loads of strange
hacks.

* Package & Unbundle:

** python2-cherrypi

** python2-routes

** Mathjax

** Seen in debian package definition:

*** jquery-ui-multiselect-widget

*** jquery-ui

*** Datejs-all-Alpha

* Not sure if dnspython is even used?

The last thread for this package is here: 
https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html

Unrar is removed, markdown unbundled, and I checked that the  "freeware"
icon data is actually GPLv2 (
http://www.zwahlendesign.ch/downloads2/openoffice_icons.zip )

bug#26924: [PATCH 01/12] Update Calibre to 2.85.1

[Brendan Tildesley]

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




[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Update-Calibre-to-2.85.1.patch --]
[-- Type: text/x-patch; name="0001-gnu-Update-Calibre-to-2.85.1.patch", Size: 1450 bytes --]

From 3f7aa793ef8debe9bb60d76a7ba491e66296a908 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 20:40:45 +1000
Subject: [PATCH 01/12] gnu: Update Calibre to 2.85.1

* gnu/packages/ebooks.scm (calibre): Bump version number to 2.85.1
---
 gnu/packages/ebook.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 0a53e6ca9..a2b26c931 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,7 +62,7 @@
 (define-public calibre
   (package
     (name "calibre")
-    (version "2.76.0")
+    (version "2.85.1")
     (source
       (origin
         (method url-fetch)
@@ -70,7 +71,7 @@
                             version ".tar.xz"))
         (sha256
          (base32
-          "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"))
+          "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
         ;; Remove non-free or doubtful code, see
         ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
         (modules '((guix build utils)))
-- 
2.12.2

bug#26924: [PATCH 02/12] Update Calibre to 2.85.1

[Brendan Tildesley]

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



[-- Attachment #2: 0002-gnu-calibre-Update-drop-unrar-patch.patch --]
[-- Type: text/x-patch, Size: 3772 bytes --]

From ca3299cceb5c5a35d70b25d647ce5db868fdc695 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 20:47:35 +1000
Subject: [PATCH 02/12] gnu: calibre: Update drop-unrar patch

* gnu/packages/patches/calibre-drop-unrar.patch
Delete incompatible patch file
Recreate debian patch file from the latest calibre git revision
---
 gnu/packages/patches/calibre-drop-unrar.patch | 48 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/patches/calibre-drop-unrar.patch b/gnu/packages/patches/calibre-drop-unrar.patch
index 4eb64404f..adf977b18 100644
--- a/gnu/packages/patches/calibre-drop-unrar.patch
+++ b/gnu/packages/patches/calibre-drop-unrar.patch
@@ -1,15 +1,20 @@
-Taken from Debian. Updated by Alex Griffin.
+Recreated old debian patch on the latest calibre version
 
-Author: Dmitry Shachnev <mitya57@gmail.com>
-Description: do not build unrar extension as we strip unrar from the tarball
-Forwarded: not-needed
-Last-Update: 2013-04-04
+From 6764e4c211e50d4f4633dbabfba7cbc3089c51dc Mon Sep 17 00:00:00 2001
+From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
+Date: Sat, 13 May 2017 21:12:12 +1000
+Subject: [PATCH] Remove unrar extension
 
-Index: calibre/setup/extensions.py
-===================================================================
---- calibre.orig/setup/extensions.json	2016-07-21 21:21:05.000000000 -0500
-+++ calibre/setup/extensions.json	2016-07-27 11:22:17.167710112 -0500
-@@ -211,14 +211,5 @@
+---
+ setup/extensions.json                  | 11 -----------
+ src/calibre/ebooks/metadata/archive.py |  2 +-
+ 2 files changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/setup/extensions.json b/setup/extensions.json
+index 1f6d1fb5fd..127390450f 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -211,16 +211,5 @@
          "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
          "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
          "libraries": "mtp"
@@ -20,22 +25,25 @@ Index: calibre/setup/extensions.py
 -        "inc_dirs": "unrar",
 -        "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
 -        "windows_defines": "SILENT RARDLL UNRAR",
+-        "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE",
+-        "haiku_libraries": "bsd",
 -        "optimize_level": 2,
 -        "windows_libraries": "User32 Advapi32 kernel32 Shell32"
      }
  ]
- 
- 
-Index: calibre/src/calibre/ebooks/metadata/archive.py
-===================================================================
---- calibre.orig/src/calibre/ebooks/metadata/archive.py	2016-07-21 21:21:05.000000000 -0500
-+++ calibre/src/calibre/ebooks/metadata/archive.py	2016-07-27 11:21:07.793616039 -0500
-@@ -42,7 +42,7 @@
-     description = _('Extract common e-book formats from archives '
-         '(zip/rar) files. Also try to autodetect if they are actually '
-         'cbz/cbr files.')
+diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
+index f5c0b7bed3..32257dcdae 100644
+--- a/src/calibre/ebooks/metadata/archive.py
++++ b/src/calibre/ebooks/metadata/archive.py
+@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin):
+     description = _('Extract common e-book formats from archive files '
+         '(ZIP/RAR). Also try to autodetect if they are actually '
+         'CBZ/CBR files.')
 -    file_types = set(['zip', 'rar'])
 +    file_types = set(['zip'])
      supported_platforms = ['windows', 'osx', 'linux']
      on_import = True
  
+-- 
+2.12.2
+
-- 
2.12.2

bug#26924: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian

[Brendan Tildesley]

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



[-- Attachment #2: 0003-gnu-calibre-Import-dont-load-icons-patch-from-debian.patch --]
[-- Type: text/x-patch, Size: 3733 bytes --]

From 169822860f83ad167cc25bae66d8c9cd58af34af Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 21:40:24 +1000
Subject: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian

* gnu/packages/patches/calibre-dont-load-remote-icons.patch: New file.
* gnu/packages/ebooks.scm (calibre): Add reference to patch file.
---
 gnu/packages/ebook.scm                             |  1 +
 .../patches/calibre-dont-load-remote-icons.patch   | 45 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 gnu/packages/patches/calibre-dont-load-remote-icons.patch

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a2b26c931..cc43259e2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -80,6 +80,7 @@
             (delete-file-recursively "src/unrar")
             (delete-file "src/odf/thumbnail.py")))
         (patches (search-patches "calibre-drop-unrar.patch"
+                                 "calibre-dont-load-remote-icons.patch"
                                  "calibre-no-updates-dialog.patch"))))
     (build-system python-build-system)
     (native-inputs
diff --git a/gnu/packages/patches/calibre-dont-load-remote-icons.patch b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
new file mode 100644
index 000000000..216826307
--- /dev/null
+++ b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
@@ -0,0 +1,45 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Mon, 14 Nov 2016 22:41:24 +0100
+Subject: content-server: Don't load external URLs for privacy
+
+Spotted by lintian.
+---
+ resources/content_server/browse/browse.html | 4 +---
+ resources/content_server/index.html         | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
+index 36f7199..e615707 100644
+--- a/resources/content_server/browse/browse.html
++++ b/resources/content_server/browse/browse.html
+@@ -7,7 +7,7 @@
+     <title>..:: calibre {library} ::.. {title}</title>
+     <meta http-equiv="X-UA-Compatible" content="IE=100" />
+     <meta name="robots" content="noindex" />
+-    <link rel="icon" type="image/x-icon" href="//calibre-ebook.com/favicon.ico" />
++    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+ 
+     <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
+     <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
+@@ -63,8 +63,6 @@
+                     <input type="image"
+                     src="{prefix}/static/button-donate.png"
+                         name="submit"></input>
+-                    <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
+-                        width="1" height="1"></img>
+                 </div>
+             </form>
+             <div id="calibre-home-link" title="Go to the calibre website"></div>
+diff --git a/resources/content_server/index.html b/resources/content_server/index.html
+index 51cc33a..e71d0e8 100644
+--- a/resources/content_server/index.html
++++ b/resources/content_server/index.html
+@@ -9,7 +9,7 @@
+         <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
+         <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
+         <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
+-		<link rel="icon" href="//calibre-ebook.com/favicon.ico" type="image/x-icon" />
++		<link rel="icon" href="favicon.ico" type="image/x-icon" />
+ 	</head>
+ 	<body>
+ 	    <div id="banner">
-- 
2.12.2

bug#26924: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from

[Brendan Tildesley]

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



[-- Attachment #2: 0004-gnu-calibre-Import-unbundle-feedparser-patch-from-de.patch --]
[-- Type: text/x-patch, Size: 4288 bytes --]

From ddfccc3e2d3f97342c0f25e00ac00f07ba7a9475 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 22:32:01 +1000
Subject: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from
 debian

* gnu/packages/ebook.scm
Use web module for python2-feedparser.
(calibre):
[source]: Reference new patch file.
[inputs]: Add python2-feedparser as an input.
* gnu/packages/patches/calibre-use-packaged-feedparser.patch: New file.
---
 gnu/packages/ebook.scm                             |  3 ++
 .../patches/calibre-use-packaged-feedparser.patch  | 51 ++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 gnu/packages/patches/calibre-use-packaged-feedparser.patch

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index cc43259e2..70ec9ed35 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xorg))
 
 (define-public chmlib
@@ -80,6 +81,7 @@
             (delete-file-recursively "src/unrar")
             (delete-file "src/odf/thumbnail.py")))
         (patches (search-patches "calibre-drop-unrar.patch"
+                                 "calibre-use-packaged-feedparser.patch"
                                  "calibre-dont-load-remote-icons.patch"
                                  "calibre-no-updates-dialog.patch"))))
     (build-system python-build-system)
@@ -116,6 +118,7 @@
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
+       ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
diff --git a/gnu/packages/patches/calibre-use-packaged-feedparser.patch b/gnu/packages/patches/calibre-use-packaged-feedparser.patch
new file mode 100644
index 000000000..8f4bbc824
--- /dev/null
+++ b/gnu/packages/patches/calibre-use-packaged-feedparser.patch
@@ -0,0 +1,51 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Mon, 14 Nov 2016 22:41:23 +0100
+Subject: Use packaged instead of bundled feedparser Python module
+
+---
+ recipes/lenta_ru.recipe           | 4 +++-
+ src/calibre/web/feeds/__init__.py | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/recipes/lenta_ru.recipe b/recipes/lenta_ru.recipe
+index aa4dac4..4b6710c 100644
+--- a/recipes/lenta_ru.recipe
++++ b/recipes/lenta_ru.recipe
+@@ -4,11 +4,13 @@
+ Lenta.ru
+ '''
+ 
+-from calibre.web.feeds.feedparser import parse
+ from calibre.ebooks.BeautifulSoup import Tag
+ from calibre.web.feeds.news import BasicNewsRecipe
++from feedparser import parse
++from functools import partial
+ import re
+ 
++parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
+ 
+ class LentaRURecipe(BasicNewsRecipe):
+     title = u'Lenta.ru: \u041d\u043e\u0432\u043e\u0441\u0442\u0438'
+diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py
+index 8c9d748..f262604 100644
+--- a/src/calibre/web/feeds/__init__.py
++++ b/src/calibre/web/feeds/__init__.py
+@@ -11,7 +11,10 @@ from calibre.utils.logging import default_log
+ from calibre import entity_to_unicode, strftime, force_unicode
+ from calibre.utils.date import dt_factory, utcnow, local_tz
+ from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars
++from feedparser import parse
++from functools import partial
+ 
++parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
+ 
+ class Article(object):
+ 
+@@ -334,7 +337,6 @@ def feed_from_xml(raw_xml, title=None, oldest_article=7,
+                   max_articles_per_feed=100,
+                   get_article_url=lambda item: item.get('link', None),
+                   log=default_log):
+-    from calibre.web.feeds.feedparser import parse
+     # Handle unclosed escaped entities. They trip up feedparser and HBR for one
+     # generates them
+     raw_xml = re.sub(r'(&amp;#\d+)([^0-9;])', r'\1;\2', raw_xml)
-- 
2.12.2

bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown

[Brendan Tildesley]

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



[-- Attachment #2: 0005-gnu-calibre-Unbundle-python2-markdown.patch --]
[-- Type: text/x-patch, Size: 1649 bytes --]

From 9202987ba9aed6e7c503aca877110e0e27e3dbc0 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 23:24:06 +1000
Subject: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown

* gnu/packages/ebook.scm (calibre):
[snippet]: Replace python references to bundled markdown with packaged. Remove
markdown from source.
[inputs]: Add python2-markdown as a dependency.
---
 gnu/packages/ebook.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 70ec9ed35..d925504a2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -78,8 +78,11 @@
         (modules '((guix build utils)))
         (snippet
           '(begin
+            (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
-            (delete-file "src/odf/thumbnail.py")))
+            (delete-file "src/odf/thumbnail.py")
+            (substitute* (find-files "." "\\.py")
+              (("calibre\\.ebooks\\.markdown") "markdown"))))
         (patches (search-patches "calibre-drop-unrar.patch"
                                  "calibre-use-packaged-feedparser.patch"
                                  "calibre-dont-load-remote-icons.patch"
@@ -120,6 +123,7 @@
        ("python2-dbus" ,python2-dbus)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
+       ("python2-markdown" ,python2-markdown)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)
-- 
2.12.2

bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.

[Brendan Tildesley]

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



[-- Attachment #2: 0006-gnu-calibre-Undelete-GPLv2-icon-file.patch --]
[-- Type: text/x-patch, Size: 1314 bytes --]

From efcfd192fb22ab36054d41ba02ae3e5e32a9239c Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 23:34:59 +1000
Subject: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.

gnu/package/ebook.scm (calibre):  Undelete GPLv2 icon file from openoffice
(see thumbnail.py).
---
 gnu/packages/ebook.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index d925504a2..6b9934724 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -73,14 +73,12 @@
         (sha256
          (base32
           "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
-        ;; Remove non-free or doubtful code, see
-        ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
+        ;; Remove nonfree unrar and bundled dependencies.
         (modules '((guix build utils)))
         (snippet
           '(begin
             (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
-            (delete-file "src/odf/thumbnail.py")
             (substitute* (find-files "." "\\.py")
               (("calibre\\.ebooks\\.markdown") "markdown"))))
         (patches (search-patches "calibre-drop-unrar.patch"
-- 
2.12.2

bug#26924: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts

[Brendan Tildesley]

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



[-- Attachment #2: 0007-gnu-calibre-Unbundle-liberation-fonts.patch --]
[-- Type: text/x-patch, Size: 2724 bytes --]

From 8840dc34801e3717831fce82fe525b7a36b15f2f Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 16:36:13 +1000
Subject: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts

*gnu/packages/ebook.scm (calibre): Delete liberation .ttf files
[arguments]: Calibre still references the bundled fonts, so we install the
packaged fonts to the directory the bundled fonts would have been.
---
 gnu/packages/ebook.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 6b9934724..97e245291 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -28,6 +28,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
@@ -79,6 +80,7 @@
           '(begin
             (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
+            (delete-file-recursively "resources/fonts/liberation")
             (substitute* (find-files "." "\\.py")
               (("calibre\\.ebooks\\.markdown") "markdown"))))
         (patches (search-patches "calibre-drop-unrar.patch"
@@ -105,6 +107,7 @@
     (inputs
      `(("chmlib" ,chmlib)
        ("fontconfig" ,fontconfig)
+       ("font-liberation" ,font-liberation)
        ("glib" ,glib)
        ("icu4c" ,icu4c)
        ("libmtp" ,libmtp)
@@ -144,7 +147,16 @@
               (substitute* "setup/build_environment.py"
                 (("sys.prefix") (string-append "'" pyqt "'")))
               (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo"))
-              (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))))))))
+              (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))
+         (add-after 'install 'install-font-liberation
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (for-each (lambda (file)
+                         (install-file file (string-append
+                                             (assoc-ref outputs "out")
+                                             "/share/calibre/fonts/liberation")))
+                       (find-files (string-append
+                                    (assoc-ref inputs "font-liberation")
+                                    "/share/fonts/truetype"))))))))
     (home-page "http://calibre-ebook.com/")
     (synopsis "E-book library management software")
     (description "Calibre is an ebook library manager.  It can view, convert
-- 
2.12.2

bug#26924: [PATCH 08/12] gnu: calibre: Unbundle chardet

[Brendan Tildesley]

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



[-- Attachment #2: 0008-gnu-calibre-Unbundle-chardet.patch --]
[-- Type: text/x-patch, Size: 1544 bytes --]

From e6e476e6a2aff0aa17b1828837cb2ce69714a2fc Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 22:38:07 +1000
Subject: [PATCH 08/12] gnu: calibre: Unbundle chardet

* gnu/packages/ebook.scm (calibre): Unbundle python2-chardet.
---
 gnu/packages/ebook.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 97e245291..f38dba662 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
@@ -81,6 +82,7 @@
             (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
             (delete-file-recursively "resources/fonts/liberation")
+            (delete-file-recursively "src/chardet")
             (substitute* (find-files "." "\\.py")
               (("calibre\\.ebooks\\.markdown") "markdown"))))
         (patches (search-patches "calibre-drop-unrar.patch"
@@ -118,6 +120,7 @@
        ("podofo" ,podofo)
        ("python" ,python-2)
        ("python2-apsw" ,python2-apsw)
+       ("python2-chardet" ,python2-chardet)
        ("python2-cssselect" ,python2-cssselect)
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
-- 
2.12.2

bug#26924: [PATCH 09/12] gnu: calibre: Add missing dependencies.

[Brendan Tildesley]

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



[-- Attachment #2: 0009-gnu-calibre-Add-missing-dependencies.patch --]
[-- Type: text/x-patch, Size: 2392 bytes --]

From 2ee92d818744b1401a0495eb497363b1b2f445da Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 00:21:52 +1000
Subject: [PATCH 09/12] gnu: calibre: Add missing dependencies.

* gnu/packages/ebook.scm (calibre): Add poppler, python2-dnspython, and
  python2-pygments as inputs.
Remove old comments. libwmf and psutil are no longer used. Beautifulsoup3 is
  bundled but obsolete and not packaged, so just leave it bundled.
---
 gnu/packages/ebook.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index f38dba662..8a2a794e6 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -96,16 +96,8 @@
        ;; xdg-utils is supposed to be used for desktop integration, but it
        ;; also creates lots of messages
        ;; mkdir: cannot create directory '/homeless-shelter': Permission denied
+       ("python2-flake8" ,python2-flake8)
        ("xdg-utils" ,xdg-utils)))
-    ;; FIXME: The following are missing inputs according to the documentation,
-    ;; but the package can apparently be used without them,
-    ;; They may need to be added if a deficiency is detected.
-    ;; BeautifulSoup >= 3.0.5
-    ;; dnspython >= 1.6.0
-    ;; poppler >= 0.20.2
-    ;; libwmf >= 0.2.8
-    ;; psutil >= 0.6.1
-    ;; python-pygments >= 2.0.1 ; used for ebook editing
     (inputs
      `(("chmlib" ,chmlib)
        ("fontconfig" ,fontconfig)
@@ -118,6 +110,7 @@
        ("libxrender" ,libxrender)
        ("openssl" ,openssl)
        ("podofo" ,podofo)
+       ("poppler" ,poppler)
        ("python" ,python-2)
        ("python2-apsw" ,python2-apsw)
        ("python2-chardet" ,python2-chardet)
@@ -125,12 +118,14 @@
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
+       ("python2-dnspython" ,python2-dnspython)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
        ("python2-markdown" ,python2-markdown)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)
+       ("python2-pygments" ,python2-pygments)
        ("python2-pyqt" ,python2-pyqt)
        ("python2-sip" ,python2-sip)
        ("sqlite" ,sqlite)))
-- 
2.12.2

bug#26924: [PATCH 10/12] gnu: chmlib: Use #:prefix license:

[Brendan Tildesley]

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



[-- Attachment #2: 0010-gnu-chmlib-Use-prefix-license.patch --]
[-- Type: text/x-patch, Size: 1234 bytes --]

From 2b7482861c932ec85d5c8fb3645397cc4fea5a9c Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 17:01:06 +1000
Subject: [PATCH 10/12] gnu: chmlib: Use #:prefix license:

* gnu/packages/ebook.scm (chmlib): Use #:prefix license: instead of
  #:select (...) so any license can be used in ebook.scm
---
 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 8a2a794e6..135469279 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -20,7 +20,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages ebook)
-  #:use-module ((guix licenses) #:select (gpl3 lgpl2.1+))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -60,7 +60,7 @@
     (home-page "http://www.jedrea.com/chmlib/")
     (synopsis "Library for CHM files")
     (description "CHMLIB is a library for dealing with ITSS/CHM format files.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public calibre
   (package
-- 
2.12.2

bug#26924: [PATCH 11/12] gnu: calibre: Add exhaustive license list

[Brendan Tildesley]

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



[-- Attachment #2: 0011-gnu-calibre-Add-exhaustive-license-list.patch --]
[-- Type: text/x-patch, Size: 1363 bytes --]

From 7c026ea16987056a6c801b5a10a79743aad74c82 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 16:57:06 +1000
Subject: [PATCH 11/12] gnu: calibre: Add exhaustive license list

* gnu/packages/ebook.scm (calibre): Add exhaustive license list.
---
 gnu/packages/ebook.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 135469279..2e5863e6c 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -162,4 +162,13 @@ and catalog ebooks in most of the major ebook formats.  It can also talk
 to many ebook reader devices.  It can go out to the Internet and fetch
 metadata for books.  It can download newspapers and convert them into
 ebooks for convenient reading.")
-    (license gpl3))) ; some files are under various other licenses, see COPYRIGHT
+    (license (list license:gpl3 ; Too many files to detail here. See source.
+                   license:gpl2+
+                   license:gpl2
+                   license:bsd-3
+                   license:lgpl2.1+
+                   license:lgpl2.1
+                   license:expat
+                   license:asl2.0
+                   license:non-copyleft ; hyphenate license, and Info-Zip license.
+                   license:cc-by-sa3.0))))
-- 
2.12.2

bug#26924: [PATCH 12/12] gnu: calibre: Don't create uninstaller

[Brendan Tildesley]

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



[-- Attachment #2: 0012-gnu-calibre-Don-t-create-uninstaller.patch --]
[-- Type: text/x-patch, Size: 963 bytes --]

From 71da9cd2a9c030748bd537110935f67af2097430 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Mon, 15 May 2017 00:37:07 +1000
Subject: [PATCH 12/12] gnu: calibre: Don't create uninstaller

gnu/packages/ebook.scm (calibre). Don't create uninstaller
---
 gnu/packages/ebook.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 2e5863e6c..131cf77b3 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -84,6 +84,7 @@
             (delete-file-recursively "resources/fonts/liberation")
             (delete-file-recursively "src/chardet")
             (substitute* (find-files "." "\\.py")
+              (("self\\.create_uninstaller()") "")
               (("calibre\\.ebooks\\.markdown") "markdown"))))
         (patches (search-patches "calibre-drop-unrar.patch"
                                  "calibre-use-packaged-feedparser.patch"
-- 
2.12.2

bug#26924: [PATCH 02/12] Update Calibre to 2.85.1

[Brendan Tildesley]

On 2017-05-15 01:03, Brendan Tildesley wrote:

Naturally this should be

[PATCH 02/12] gnu: calibre: Update drop-unrar patch

bug#26924: [PATCH 0/12] Update Calibre to 2.85.1

[Marius Bakke]

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

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

> There is still much to do, but I think if fixed more than I've broken,
> so I'll post these patches now. I'm not sure if I should have rebased
> them into fewer commits, but that's easier to do than to split them
> apart again.

Thanks a lot for working on this! The series LGTM overall, I'll comment
on the patches individually.

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

bug#26924: [PATCH 01/12] Update Calibre to 2.85.1

[Marius Bakke]

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

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

> Subject: [PATCH 01/12] gnu: Update Calibre to 2.85.1

This should say "gnu: calibre: Update to 2.85.1."

> * gnu/packages/ebooks.scm (calibre): Bump version number to 2.85.1

And here "Update to 2.85.1.". When in doubt, see commit log ;-)

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

bug#26924: [PATCH 02/12] Update Calibre to 2.85.1

[Marius Bakke]

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

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

> From ca3299cceb5c5a35d70b25d647ce5db868fdc695 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 13 May 2017 20:47:35 +1000
> Subject: [PATCH 02/12] gnu: calibre: Update drop-unrar patch
>
> * gnu/packages/patches/calibre-drop-unrar.patch
> Delete incompatible patch file
> Recreate debian patch file from the latest calibre git revision

Great, thanks for sorting that out. Can you squash this into the
previous commit, since it's a related change?

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

bug#26924: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian

[Marius Bakke]

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

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

> From 169822860f83ad167cc25bae66d8c9cd58af34af Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 13 May 2017 21:40:24 +1000
> Subject: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian
>
> * gnu/packages/patches/calibre-dont-load-remote-icons.patch: New file.
> * gnu/packages/ebooks.scm (calibre): Add reference to patch file.

Please also add this patch to gnu/local.mk. Good catch!

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

bug#26924: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from

[Marius Bakke]

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

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

> From ddfccc3e2d3f97342c0f25e00ac00f07ba7a9475 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 13 May 2017 22:32:01 +1000
> Subject: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from
>  debian
>
> * gnu/packages/ebook.scm
> Use web module for python2-feedparser.
> (calibre):
> [source]: Reference new patch file.
> [inputs]: Add python2-feedparser as an input.
> * gnu/packages/patches/calibre-use-packaged-feedparser.patch: New file.

Same here, also add it to gnu/local.mk.

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

bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown

[Marius Bakke]

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

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

> From 9202987ba9aed6e7c503aca877110e0e27e3dbc0 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 13 May 2017 23:24:06 +1000
> Subject: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown
>
> * gnu/packages/ebook.scm (calibre):
> [snippet]: Replace python references to bundled markdown with packaged. Remove
> markdown from source.
> [inputs]: Add python2-markdown as a dependency.

Nice!

> @@ -78,8 +78,11 @@
>          (modules '((guix build utils)))
>          (snippet
>            '(begin
> +            (delete-file-recursively "src/calibre/ebooks/markdown")
>              (delete-file-recursively "src/unrar")
> -            (delete-file "src/odf/thumbnail.py")))
> +            (delete-file "src/odf/thumbnail.py")
> +            (substitute* (find-files "." "\\.py")
> +              (("calibre\\.ebooks\\.markdown") "markdown"))))

Can you add a #t after this substitution, since its return value is
unspecified?

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

bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.

[Marius Bakke]

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

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

> From efcfd192fb22ab36054d41ba02ae3e5e32a9239c Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 13 May 2017 23:34:59 +1000
> Subject: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.
>
> gnu/package/ebook.scm (calibre):  Undelete GPLv2 icon file from openoffice
> (see thumbnail.py).

[...]

> -        ;; Remove non-free or doubtful code, see
> -        ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
> +        ;; Remove nonfree unrar and bundled dependencies.
>          (modules '((guix build utils)))
>          (snippet
>            '(begin
>              (delete-file-recursively "src/calibre/ebooks/markdown")
>              (delete-file-recursively "src/unrar")
> -            (delete-file "src/odf/thumbnail.py")

I peeked in the git repository (not the release tarball) and this file
still says "License: Freeware" as the linked thread discusses. Am I
missing something?

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

bug#26924: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts

[Marius Bakke]

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

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

> From 8840dc34801e3717831fce82fe525b7a36b15f2f Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sun, 14 May 2017 16:36:13 +1000
> Subject: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts
>
> *gnu/packages/ebook.scm (calibre): Delete liberation .ttf files
> [arguments]: Calibre still references the bundled fonts, so we install the
> packaged fonts to the directory the bundled fonts would have been.

This should mention the new [input], but I think it should also be a
[native-input] since it's just extracted and thrown away.

[...]

> @@ -144,7 +147,16 @@
>                (substitute* "setup/build_environment.py"
>                  (("sys.prefix") (string-append "'" pyqt "'")))
>                (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo"))
> -              (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))))))))
> +              (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))
> +         (add-after 'install 'install-font-liberation
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (for-each (lambda (file)
> +                         (install-file file (string-append
> +                                             (assoc-ref outputs "out")
> +                                             "/share/calibre/fonts/liberation")))
> +                       (find-files (string-append
> +                                    (assoc-ref inputs "font-liberation")
> +                                    "/share/fonts/truetype"))))))))

Again, minor nitpicking: This phase should also end with a #t after
(for-each ...) since the return value is unspecified.

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

bug#26924: [PATCH 08/12] gnu: calibre: Unbundle chardet

[Marius Bakke]

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

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

> From e6e476e6a2aff0aa17b1828837cb2ce69714a2fc Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sun, 14 May 2017 22:38:07 +1000
> Subject: [PATCH 08/12] gnu: calibre: Unbundle chardet
>
> * gnu/packages/ebook.scm (calibre): Unbundle python2-chardet.

Here too, mention the change in [arguments] and [inputs].

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

bug#26924: [PATCH 09/12] gnu: calibre: Add missing dependencies.

[Marius Bakke]

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

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

> From 2ee92d818744b1401a0495eb497363b1b2f445da Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sun, 14 May 2017 00:21:52 +1000
> Subject: [PATCH 09/12] gnu: calibre: Add missing dependencies.
>
> * gnu/packages/ebook.scm (calibre): Add poppler, python2-dnspython, and
>   python2-pygments as inputs.

This should say "... (calibre)[inputs]: Add ...".

> Remove old comments. libwmf and psutil are no longer used. Beautifulsoup3 is
>   bundled but obsolete and not packaged, so just leave it bundled.

Can you move the sentence about Beautifulsoup3 here to a comment in the
code? That way it's apparent for the next person who embarks on this
journey!

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

bug#26924: [PATCH 11/12] gnu: calibre: Add exhaustive license list

[Marius Bakke]

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

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

> From 7c026ea16987056a6c801b5a10a79743aad74c82 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sun, 14 May 2017 16:57:06 +1000
> Subject: [PATCH 11/12] gnu: calibre: Add exhaustive license list
>
> * gnu/packages/ebook.scm (calibre): Add exhaustive license list.

"... (calibre)[license]: ..."

> ---
>  gnu/packages/ebook.scm | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
> index 135469279..2e5863e6c 100644
> --- a/gnu/packages/ebook.scm
> +++ b/gnu/packages/ebook.scm
> @@ -162,4 +162,13 @@ and catalog ebooks in most of the major ebook formats.  It can also talk
>  to many ebook reader devices.  It can go out to the Internet and fetch
>  metadata for books.  It can download newspapers and convert them into
>  ebooks for convenient reading.")
> -    (license gpl3))) ; some files are under various other licenses, see COPYRIGHT
> +    (license (list license:gpl3 ; Too many files to detail here. See source.
> +                   license:gpl2+
> +                   license:gpl2
> +                   license:bsd-3
> +                   license:lgpl2.1+
> +                   license:lgpl2.1
> +                   license:expat
> +                   license:asl2.0
> +                   license:non-copyleft ; hyphenate license, and Info-Zip license.
> +                   license:cc-by-sa3.0))))

Wow, that's quite the list! In practice, we are only required to list
the licenses that apply to the output. Since Calibre is largely GPL3,
which is stricter than say LGPL, it takes precedence over the more
permissive licenses when they are used together.

That said, determining what licenses apply to the various parts of the
output can be difficult, so I think this is fine. Note that non-copyleft
is a procedure that takes an URL or file path. Also, I suspect the GPL
license list can be flattened to just GPL3 and maybe also LGPL2.1+?

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

bug#26924: [PATCH 12/12] gnu: calibre: Don't create uninstaller

[Marius Bakke]

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

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

> From 71da9cd2a9c030748bd537110935f67af2097430 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Mon, 15 May 2017 00:37:07 +1000
> Subject: [PATCH 12/12] gnu: calibre: Don't create uninstaller
>
> gnu/packages/ebook.scm (calibre). Don't create uninstaller
> ---
>  gnu/packages/ebook.scm | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
> index 2e5863e6c..131cf77b3 100644
> --- a/gnu/packages/ebook.scm
> +++ b/gnu/packages/ebook.scm
> @@ -84,6 +84,7 @@
>              (delete-file-recursively "resources/fonts/liberation")
>              (delete-file-recursively "src/chardet")
>              (substitute* (find-files "." "\\.py")
> +              (("self\\.create_uninstaller()") "")
>                (("calibre\\.ebooks\\.markdown") "markdown"))))

Can you add a comment about what the uninstaller is, and why we are
removing it?

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

bug#26924: [PATCH 10/12] gnu: chmlib: Use #:prefix license:

[Marius Bakke]

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

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

> From 2b7482861c932ec85d5c8fb3645397cc4fea5a9c Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sun, 14 May 2017 17:01:06 +1000
> Subject: [PATCH 10/12] gnu: chmlib: Use #:prefix license:
>
> * gnu/packages/ebook.scm (chmlib): Use #:prefix license: instead of
>   #:select (...) so any license can be used in ebook.scm

This is small enough that it can be squashed into the other license
changing commit IMO.

I also think maybe we can squash all the unbundle commits, but it's
probably easier to have them separate for v2. Sorry for the nit-picks!
Can you send an updated series?

Thanks in advance! :-)

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

bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.

[Brendan Tildesley]

On 2017-05-16 03:00, Marius Bakke wrote:
> Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:
>
>> From efcfd192fb22ab36054d41ba02ae3e5e32a9239c Mon Sep 17 00:00:00 2001
>> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
>> Date: Sat, 13 May 2017 23:34:59 +1000
>> Subject: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.
>>
>> gnu/package/ebook.scm (calibre):  Undelete GPLv2 icon file from openoffice
>> (see thumbnail.py).
> [...]
>
>> -        ;; Remove non-free or doubtful code, see
>> -        ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
>> +        ;; Remove nonfree unrar and bundled dependencies.
>>          (modules '((guix build utils)))
>>          (snippet
>>            '(begin
>>              (delete-file-recursively "src/calibre/ebooks/markdown")
>>              (delete-file-recursively "src/unrar")
>> -            (delete-file "src/odf/thumbnail.py")
> I peeked in the git repository (not the release tarball) and this file
> still says "License: Freeware" as the linked thread discusses. Am I
> missing something?

If you look in thumbnail.py it's self, it says the icon is from
http://www.zwahlendesign.ch/en/node/20 Which has a .zip file, containing
the icons and a LICENSE.txt file stating they are GPLv2

bug#26924: [PATCH 1/12] Update Calibre to 2.85.1 [REVISED]

[Brendan Tildesley]

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



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-calibre-Update-to-2.85.1.patch --]
[-- Type: text/x-patch; name="0001-gnu-calibre-Update-to-2.85.1.patch", Size: 4941 bytes --]

From e94a7e49e318ba55caa5d517eb6aaa1ac2fc2033 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 20:40:45 +1000
Subject: [PATCH 01/10] gnu: calibre: Update to 2.85.1.

* gnu/packages/ebooks.scm (calibre): Update to 2.85.1.

* gnu/packages/patches/calibre-drop-unrar.patch
Delete incompatible patch file.
Recreate debian patch file from the latest calibre git revision.
---
 gnu/packages/ebook.scm                        |  5 +--
 gnu/packages/patches/calibre-drop-unrar.patch | 48 ++++++++++++++++-----------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 0a53e6ca9..a2b26c931 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,7 +62,7 @@
 (define-public calibre
   (package
     (name "calibre")
-    (version "2.76.0")
+    (version "2.85.1")
     (source
       (origin
         (method url-fetch)
@@ -70,7 +71,7 @@
                             version ".tar.xz"))
         (sha256
          (base32
-          "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"))
+          "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
         ;; Remove non-free or doubtful code, see
         ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
         (modules '((guix build utils)))
diff --git a/gnu/packages/patches/calibre-drop-unrar.patch b/gnu/packages/patches/calibre-drop-unrar.patch
index 4eb64404f..adf977b18 100644
--- a/gnu/packages/patches/calibre-drop-unrar.patch
+++ b/gnu/packages/patches/calibre-drop-unrar.patch
@@ -1,15 +1,20 @@
-Taken from Debian. Updated by Alex Griffin.
+Recreated old debian patch on the latest calibre version
 
-Author: Dmitry Shachnev <mitya57@gmail.com>
-Description: do not build unrar extension as we strip unrar from the tarball
-Forwarded: not-needed
-Last-Update: 2013-04-04
+From 6764e4c211e50d4f4633dbabfba7cbc3089c51dc Mon Sep 17 00:00:00 2001
+From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
+Date: Sat, 13 May 2017 21:12:12 +1000
+Subject: [PATCH] Remove unrar extension
 
-Index: calibre/setup/extensions.py
-===================================================================
---- calibre.orig/setup/extensions.json	2016-07-21 21:21:05.000000000 -0500
-+++ calibre/setup/extensions.json	2016-07-27 11:22:17.167710112 -0500
-@@ -211,14 +211,5 @@
+---
+ setup/extensions.json                  | 11 -----------
+ src/calibre/ebooks/metadata/archive.py |  2 +-
+ 2 files changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/setup/extensions.json b/setup/extensions.json
+index 1f6d1fb5fd..127390450f 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -211,16 +211,5 @@
          "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
          "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
          "libraries": "mtp"
@@ -20,22 +25,25 @@ Index: calibre/setup/extensions.py
 -        "inc_dirs": "unrar",
 -        "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
 -        "windows_defines": "SILENT RARDLL UNRAR",
+-        "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE",
+-        "haiku_libraries": "bsd",
 -        "optimize_level": 2,
 -        "windows_libraries": "User32 Advapi32 kernel32 Shell32"
      }
  ]
- 
- 
-Index: calibre/src/calibre/ebooks/metadata/archive.py
-===================================================================
---- calibre.orig/src/calibre/ebooks/metadata/archive.py	2016-07-21 21:21:05.000000000 -0500
-+++ calibre/src/calibre/ebooks/metadata/archive.py	2016-07-27 11:21:07.793616039 -0500
-@@ -42,7 +42,7 @@
-     description = _('Extract common e-book formats from archives '
-         '(zip/rar) files. Also try to autodetect if they are actually '
-         'cbz/cbr files.')
+diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
+index f5c0b7bed3..32257dcdae 100644
+--- a/src/calibre/ebooks/metadata/archive.py
++++ b/src/calibre/ebooks/metadata/archive.py
+@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin):
+     description = _('Extract common e-book formats from archive files '
+         '(ZIP/RAR). Also try to autodetect if they are actually '
+         'CBZ/CBR files.')
 -    file_types = set(['zip', 'rar'])
 +    file_types = set(['zip'])
      supported_platforms = ['windows', 'osx', 'linux']
      on_import = True
  
+-- 
+2.12.2
+
-- 
2.13.0

bug#26924: [PATCH 02/10] gnu: calibre: Import dont-load-icons patch from debian

[Brendan Tildesley]

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



[-- Attachment #2: 0002-gnu-calibre-Import-dont-load-icons-patch-from-debian.patch --]
[-- Type: text/x-patch, Size: 4371 bytes --]

From a8b461b4fc868bd3415b7ec199869eaba30692b9 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 21:40:24 +1000
Subject: [PATCH 02/10] gnu: calibre: Import dont-load-icons patch from debian

* gnu/packages/patches/calibre-dont-load-remote-icons.patch: New file.
* gnu/packages/ebooks.scm (calibre): Add reference to patch file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/ebook.scm                             |  1 +
 .../patches/calibre-dont-load-remote-icons.patch   | 45 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 gnu/packages/patches/calibre-dont-load-remote-icons.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 28a283ab7..4c5aabffa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -515,6 +515,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/byobu-writable-status.patch		\
   %D%/packages/patches/cairo-CVE-2016-9082.patch			\
   %D%/packages/patches/calibre-drop-unrar.patch			\
+  %D%/packages/patches/calibre-dont-load-remote-icons.patch	\
   %D%/packages/patches/calibre-no-updates-dialog.patch		\
   %D%/packages/patches/cdparanoia-fpic.patch			\
   %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch 	\
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a2b26c931..cc43259e2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -80,6 +80,7 @@
             (delete-file-recursively "src/unrar")
             (delete-file "src/odf/thumbnail.py")))
         (patches (search-patches "calibre-drop-unrar.patch"
+                                 "calibre-dont-load-remote-icons.patch"
                                  "calibre-no-updates-dialog.patch"))))
     (build-system python-build-system)
     (native-inputs
diff --git a/gnu/packages/patches/calibre-dont-load-remote-icons.patch b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
new file mode 100644
index 000000000..216826307
--- /dev/null
+++ b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
@@ -0,0 +1,45 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Mon, 14 Nov 2016 22:41:24 +0100
+Subject: content-server: Don't load external URLs for privacy
+
+Spotted by lintian.
+---
+ resources/content_server/browse/browse.html | 4 +---
+ resources/content_server/index.html         | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
+index 36f7199..e615707 100644
+--- a/resources/content_server/browse/browse.html
++++ b/resources/content_server/browse/browse.html
+@@ -7,7 +7,7 @@
+     <title>..:: calibre {library} ::.. {title}</title>
+     <meta http-equiv="X-UA-Compatible" content="IE=100" />
+     <meta name="robots" content="noindex" />
+-    <link rel="icon" type="image/x-icon" href="//calibre-ebook.com/favicon.ico" />
++    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+ 
+     <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
+     <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
+@@ -63,8 +63,6 @@
+                     <input type="image"
+                     src="{prefix}/static/button-donate.png"
+                         name="submit"></input>
+-                    <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
+-                        width="1" height="1"></img>
+                 </div>
+             </form>
+             <div id="calibre-home-link" title="Go to the calibre website"></div>
+diff --git a/resources/content_server/index.html b/resources/content_server/index.html
+index 51cc33a..e71d0e8 100644
+--- a/resources/content_server/index.html
++++ b/resources/content_server/index.html
+@@ -9,7 +9,7 @@
+         <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
+         <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
+         <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
+-		<link rel="icon" href="//calibre-ebook.com/favicon.ico" type="image/x-icon" />
++		<link rel="icon" href="favicon.ico" type="image/x-icon" />
+ 	</head>
+ 	<body>
+ 	    <div id="banner">
-- 
2.13.0

bug#26924: [PATCH 03/10] gnu: calibre: Import unbundle feedparser patch from

[Brendan Tildesley]

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



[-- Attachment #2: 0003-gnu-calibre-Import-unbundle-feedparser-patch-from-de.patch --]
[-- Type: text/x-patch, Size: 4947 bytes --]

From 359c51e1d2669770f1da546f2baebd0fb947bd4d Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 22:32:01 +1000
Subject: [PATCH 03/10] gnu: calibre: Import unbundle feedparser patch from
 debian.

* gnu/packages/ebook.scm
Use web module for python2-feedparser.
(calibre):
[source]: Reference new patch file.
[inputs]: Add python2-feedparser as an input.

* gnu/packages/patches/calibre-use-packaged-feedparser.patch: New file.

* gnu/local.mk: Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/ebook.scm                             |  3 ++
 .../patches/calibre-use-packaged-feedparser.patch  | 51 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 gnu/packages/patches/calibre-use-packaged-feedparser.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 4c5aabffa..74577c8e5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -517,6 +517,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/calibre-drop-unrar.patch			\
   %D%/packages/patches/calibre-dont-load-remote-icons.patch	\
   %D%/packages/patches/calibre-no-updates-dialog.patch		\
+  %D%/packages/patches/calibre-use-packaged-feedparser.patch	\
   %D%/packages/patches/cdparanoia-fpic.patch			\
   %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch 	\
   %D%/packages/patches/ceph-disable-cpu-optimizations.patch	\
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index cc43259e2..70ec9ed35 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xorg))
 
 (define-public chmlib
@@ -80,6 +81,7 @@
             (delete-file-recursively "src/unrar")
             (delete-file "src/odf/thumbnail.py")))
         (patches (search-patches "calibre-drop-unrar.patch"
+                                 "calibre-use-packaged-feedparser.patch"
                                  "calibre-dont-load-remote-icons.patch"
                                  "calibre-no-updates-dialog.patch"))))
     (build-system python-build-system)
@@ -116,6 +118,7 @@
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
+       ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
diff --git a/gnu/packages/patches/calibre-use-packaged-feedparser.patch b/gnu/packages/patches/calibre-use-packaged-feedparser.patch
new file mode 100644
index 000000000..8f4bbc824
--- /dev/null
+++ b/gnu/packages/patches/calibre-use-packaged-feedparser.patch
@@ -0,0 +1,51 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Mon, 14 Nov 2016 22:41:23 +0100
+Subject: Use packaged instead of bundled feedparser Python module
+
+---
+ recipes/lenta_ru.recipe           | 4 +++-
+ src/calibre/web/feeds/__init__.py | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/recipes/lenta_ru.recipe b/recipes/lenta_ru.recipe
+index aa4dac4..4b6710c 100644
+--- a/recipes/lenta_ru.recipe
++++ b/recipes/lenta_ru.recipe
+@@ -4,11 +4,13 @@
+ Lenta.ru
+ '''
+ 
+-from calibre.web.feeds.feedparser import parse
+ from calibre.ebooks.BeautifulSoup import Tag
+ from calibre.web.feeds.news import BasicNewsRecipe
++from feedparser import parse
++from functools import partial
+ import re
+ 
++parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
+ 
+ class LentaRURecipe(BasicNewsRecipe):
+     title = u'Lenta.ru: \u041d\u043e\u0432\u043e\u0441\u0442\u0438'
+diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py
+index 8c9d748..f262604 100644
+--- a/src/calibre/web/feeds/__init__.py
++++ b/src/calibre/web/feeds/__init__.py
+@@ -11,7 +11,10 @@ from calibre.utils.logging import default_log
+ from calibre import entity_to_unicode, strftime, force_unicode
+ from calibre.utils.date import dt_factory, utcnow, local_tz
+ from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars
++from feedparser import parse
++from functools import partial
+ 
++parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
+ 
+ class Article(object):
+ 
+@@ -334,7 +337,6 @@ def feed_from_xml(raw_xml, title=None, oldest_article=7,
+                   max_articles_per_feed=100,
+                   get_article_url=lambda item: item.get('link', None),
+                   log=default_log):
+-    from calibre.web.feeds.feedparser import parse
+     # Handle unclosed escaped entities. They trip up feedparser and HBR for one
+     # generates them
+     raw_xml = re.sub(r'(&amp;#\d+)([^0-9;])', r'\1;\2', raw_xml)
-- 
2.13.0

bug#26924: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown

[Brendan Tildesley]

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



[-- Attachment #2: 0004-gnu-calibre-Unbundle-python2-markdown.patch --]
[-- Type: text/x-patch, Size: 1666 bytes --]

From 00e6be6e4e5461424cd475120bc73eafa97b172e Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 23:24:06 +1000
Subject: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown

* gnu/packages/ebook.scm (calibre):
[snippet]: Replace python references to bundled markdown with packaged. Remove
markdown from source.
[inputs]: Add python2-markdown as a dependency.
---
 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 70ec9ed35..e75183185 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -78,8 +78,12 @@
         (modules '((guix build utils)))
         (snippet
           '(begin
+            (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
-            (delete-file "src/odf/thumbnail.py")))
+            (delete-file "src/odf/thumbnail.py")
+            (substitute* (find-files "." "\\.py")
+              (("calibre\\.ebooks\\.markdown") "markdown"))
+            #t))
         (patches (search-patches "calibre-drop-unrar.patch"
                                  "calibre-use-packaged-feedparser.patch"
                                  "calibre-dont-load-remote-icons.patch"
@@ -120,6 +124,7 @@
        ("python2-dbus" ,python2-dbus)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
+       ("python2-markdown" ,python2-markdown)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)
-- 
2.13.0

bug#26924: [PATCH 05/10] gnu: calibre: Undelete GPLv2 icon file.

[Brendan Tildesley]

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



[-- Attachment #2: 0005-gnu-calibre-Undelete-GPLv2-icon-file.patch --]
[-- Type: text/x-patch, Size: 1269 bytes --]

From d2cdfa11b01d747f146822dd23855e990946103e Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 23:34:59 +1000
Subject: [PATCH 05/10] gnu: calibre: Undelete GPLv2 icon file.

gnu/package/ebook.scm (calibre):  Undelete GPLv2 icon file from openoffice
(see thumbnail.py).
---
 gnu/packages/ebook.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index e75183185..5af0d0480 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -73,14 +73,12 @@
         (sha256
          (base32
           "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
-        ;; Remove non-free or doubtful code, see
-        ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
+        ;; Remove nonfree unrar and bundled dependencies.
         (modules '((guix build utils)))
         (snippet
           '(begin
             (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
-            (delete-file "src/odf/thumbnail.py")
             (substitute* (find-files "." "\\.py")
               (("calibre\\.ebooks\\.markdown") "markdown"))
             #t))
-- 
2.13.0

bug#26924: [PATCH 06/10] gnu: calibre: Unbundle liberation fonts.

[Brendan Tildesley]

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



[-- Attachment #2: 0006-gnu-calibre-Unbundle-liberation-fonts.patch --]
[-- Type: text/x-patch, Size: 2836 bytes --]

From cbefb7812c9309bd860f56ec79aa5755291c5261 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 16:36:13 +1000
Subject: [PATCH 06/10] gnu: calibre: Unbundle liberation fonts.

*gnu/packages/ebook.scm (calibre): Delete liberation .ttf files.
[native-inputs]: Add font-liberation.
[arguments]: Calibre still references the bundled fonts, so we install the
packaged fonts to the directory the bundled fonts would have been.
---
 gnu/packages/ebook.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 5af0d0480..3b241c670 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -28,6 +28,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
@@ -79,6 +80,7 @@
           '(begin
             (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
+            (delete-file-recursively "resources/fonts/liberation")
             (substitute* (find-files "." "\\.py")
               (("calibre\\.ebooks\\.markdown") "markdown"))
             #t))
@@ -89,6 +91,7 @@
     (build-system python-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("font-liberation" ,font-liberation)
        ("qtbase" ,qtbase) ; for qmake
        ;; xdg-utils is supposed to be used for desktop integration, but it
        ;; also creates lots of messages
@@ -145,7 +148,17 @@
               (substitute* "setup/build_environment.py"
                 (("sys.prefix") (string-append "'" pyqt "'")))
               (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo"))
-              (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))))))))
+              (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))
+         (add-after 'install 'install-font-liberation
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (for-each (lambda (file)
+                         (install-file file (string-append
+                                             (assoc-ref outputs "out")
+                                             "/share/calibre/fonts/liberation")))
+                       (find-files (string-append
+                                    (assoc-ref inputs "font-liberation")
+                                    "/share/fonts/truetype")))
+             #t)))))
     (home-page "http://calibre-ebook.com/")
     (synopsis "E-book library management software")
     (description "Calibre is an ebook library manager.  It can view, convert
-- 
2.13.0

bug#26924: [PATCH 07/10] gnu: calibre: Unbundle chardet.

[Brendan Tildesley]

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



[-- Attachment #2: 0007-gnu-calibre-Unbundle-chardet.patch --]
[-- Type: text/x-patch, Size: 1578 bytes --]

From 5973fe21292b9331e0bfd00b77f91809aeb2682b Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 22:38:07 +1000
Subject: [PATCH 07/10] gnu: calibre: Unbundle chardet.

* gnu/packages/ebook.scm (calibre): Unbundle python2-chardet.
[snippet]: Delete bundled chardet from source.
[inputs]: Add python2-chardet.
---
 gnu/packages/ebook.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 3b241c670..b5ce71ffb 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
@@ -81,6 +82,7 @@
             (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
             (delete-file-recursively "resources/fonts/liberation")
+            (delete-file-recursively "src/chardet")
             (substitute* (find-files "." "\\.py")
               (("calibre\\.ebooks\\.markdown") "markdown"))
             #t))
@@ -119,6 +121,7 @@
        ("podofo" ,podofo)
        ("python" ,python-2)
        ("python2-apsw" ,python2-apsw)
+       ("python2-chardet" ,python2-chardet)
        ("python2-cssselect" ,python2-cssselect)
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
-- 
2.13.0

bug#26924: [PATCH 08/10] gnu: calibre: Add missing dependencies.

[Brendan Tildesley]

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



[-- Attachment #2: 0008-gnu-calibre-Add-missing-dependencies.patch --]
[-- Type: text/x-patch, Size: 2402 bytes --]

From 409f835e46329c789a6ff45ec779326946993cd9 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 00:21:52 +1000
Subject: [PATCH 08/10] gnu: calibre: Add missing dependencies.

* gnu/packages/ebook.scm (calibre):
[inputs]: Add poppler, python2-dnspython, and python2-pygments.
Remove old TODO comments. libwmf and psutil are no longer used.
---
 gnu/packages/ebook.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index b5ce71ffb..5f3e778ad 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -98,16 +98,9 @@
        ;; xdg-utils is supposed to be used for desktop integration, but it
        ;; also creates lots of messages
        ;; mkdir: cannot create directory '/homeless-shelter': Permission denied
+       ("python2-flake8" ,python2-flake8)
        ("xdg-utils" ,xdg-utils)))
-    ;; FIXME: The following are missing inputs according to the documentation,
-    ;; but the package can apparently be used without them,
-    ;; They may need to be added if a deficiency is detected.
-    ;; BeautifulSoup >= 3.0.5
-    ;; dnspython >= 1.6.0
-    ;; poppler >= 0.20.2
-    ;; libwmf >= 0.2.8
-    ;; psutil >= 0.6.1
-    ;; python-pygments >= 2.0.1 ; used for ebook editing
+    ;; Beautifulsoup3 is bundled but obsolete and not packaged, so just leave it bundled.
     (inputs
      `(("chmlib" ,chmlib)
        ("fontconfig" ,fontconfig)
@@ -119,6 +112,7 @@
        ("libxrender" ,libxrender)
        ("openssl" ,openssl)
        ("podofo" ,podofo)
+       ("poppler" ,poppler)
        ("python" ,python-2)
        ("python2-apsw" ,python2-apsw)
        ("python2-chardet" ,python2-chardet)
@@ -126,12 +120,14 @@
        ("python2-cssutils" ,python2-cssutils)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
+       ("python2-dnspython" ,python2-dnspython)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
        ("python2-markdown" ,python2-markdown)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)
+       ("python2-pygments" ,python2-pygments)
        ("python2-pyqt" ,python2-pyqt)
        ("python2-sip" ,python2-sip)
        ("sqlite" ,sqlite)))
-- 
2.13.0

bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list

[Brendan Tildesley]

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




[-- Attachment #2: 0009-gnu-calibre-Add-exhaustive-license-list.patch --]
[-- Type: text/x-patch, Size: 2123 bytes --]

From 7e36409c4464bc10af90a2075f202dc22007b23c Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 17:01:06 +1000
Subject: [PATCH 09/10] gnu: calibre: Add exhaustive license list

* gnu/packages/ebook.scm (calibre): Add exhaustive license list.

* gnu/packages/ebook.scm (chmlib): Use #:prefix license: instead of
  #:select (...) so any license can be used in ebook.scm
---
 gnu/packages/ebook.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 5f3e778ad..289c2d07d 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -20,7 +20,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages ebook)
-  #:use-module ((guix licenses) #:select (gpl3 lgpl2.1+))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -60,7 +60,7 @@
     (home-page "http://www.jedrea.com/chmlib/")
     (synopsis "Library for CHM files")
     (description "CHMLIB is a library for dealing with ITSS/CHM format files.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public calibre
   (package
@@ -165,4 +165,13 @@ and catalog ebooks in most of the major ebook formats.  It can also talk
 to many ebook reader devices.  It can go out to the Internet and fetch
 metadata for books.  It can download newspapers and convert them into
 ebooks for convenient reading.")
-    (license gpl3))) ; some files are under various other licenses, see COPYRIGHT
+    (license (list license:gpl3 ; Too many files to detail here. See source.
+                   license:gpl2+
+                   license:gpl2
+                   license:bsd-3
+                   license:lgpl2.1+
+                   license:lgpl2.1
+                   license:expat
+                   license:asl2.0
+                   license:non-copyleft ; hyphenate license, and Info-Zip license.
+                   license:cc-by-sa3.0))))
-- 
2.13.0

bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller.

[Brendan Tildesley]

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



[-- Attachment #2: 0010-gnu-calibre-Don-t-create-uninstaller.patch --]
[-- Type: text/x-patch, Size: 981 bytes --]

From 9317684cdc23bcf6edb8f38abf5f057b319a0a68 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Tue, 16 May 2017 10:53:44 +1000
Subject: [PATCH 10/10] gnu: calibre: Don't create uninstaller.

gnu/packages/ebook.scm (calibre). Don't create uninstaller.
---
 gnu/packages/ebook.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 289c2d07d..cca5e7895 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -84,6 +84,8 @@
             (delete-file-recursively "resources/fonts/liberation")
             (delete-file-recursively "src/chardet")
             (substitute* (find-files "." "\\.py")
+              ;; We can't use the uninstaller in Guix. Don't build it.
+              (("self\\.create_uninstaller()") "")
               (("calibre\\.ebooks\\.markdown") "markdown"))
             #t))
         (patches (search-patches "calibre-drop-unrar.patch"
-- 
2.13.0

bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.

[Marius Bakke]

[-- Attachment #1.1: Type: text/plain, Size: 1848 bytes --]

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

> On 2017-05-16 03:00, Marius Bakke wrote:
>> Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:
>>
>>> From efcfd192fb22ab36054d41ba02ae3e5e32a9239c Mon Sep 17 00:00:00 2001
>>> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
>>> Date: Sat, 13 May 2017 23:34:59 +1000
>>> Subject: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.
>>>
>>> gnu/package/ebook.scm (calibre):  Undelete GPLv2 icon file from openoffice
>>> (see thumbnail.py).
>> [...]
>>
>>> -        ;; Remove non-free or doubtful code, see
>>> -        ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
>>> +        ;; Remove nonfree unrar and bundled dependencies.
>>>          (modules '((guix build utils)))
>>>          (snippet
>>>            '(begin
>>>              (delete-file-recursively "src/calibre/ebooks/markdown")
>>>              (delete-file-recursively "src/unrar")
>>> -            (delete-file "src/odf/thumbnail.py")
>> I peeked in the git repository (not the release tarball) and this file
>> still says "License: Freeware" as the linked thread discusses. Am I
>> missing something?
>
> If you look in thumbnail.py it's self, it says the icon is from
> http://www.zwahlendesign.ch/en/node/20 Which has a .zip file, containing
> the icons and a LICENSE.txt file stating they are GPLv2

I downloaded the icons from that page, and the picture embedded in
thumbnail.py is not there. However, there is one *very* similar.

See attached. Since this appears to be a derivative work, but with
a different license ("freeware"), I'm not sure if we can include it.
Are we in a position to enforce the GPL like that?

Maybe we could track down the commit that added it and ask the author?

I've applied the other patches, thanks a lot for this
unbundling work!


[-- Attachment #1.2: thumbnail.png --]
[-- Type: image/png, Size: 23157 bytes --]

[-- Attachment #1.3: iworks.png --]
[-- Type: image/png, Size: 23313 bytes --]

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

bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller.

[Marius Bakke]

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

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

> From 9317684cdc23bcf6edb8f38abf5f057b319a0a68 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Tue, 16 May 2017 10:53:44 +1000
> Subject: [PATCH 10/10] gnu: calibre: Don't create uninstaller.
>
> gnu/packages/ebook.scm (calibre). Don't create uninstaller.
> ---
>  gnu/packages/ebook.scm | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
> index 289c2d07d..cca5e7895 100644
> --- a/gnu/packages/ebook.scm
> +++ b/gnu/packages/ebook.scm
> @@ -84,6 +84,8 @@
>              (delete-file-recursively "resources/fonts/liberation")
>              (delete-file-recursively "src/chardet")
>              (substitute* (find-files "." "\\.py")
> +              ;; We can't use the uninstaller in Guix. Don't build it.
> +              (("self\\.create_uninstaller()") "")

I moved this to a phase instead since 'snippets' affects the result of
`guix build -S`. We try to keep the original source code as original as
possible, and apply guix-specific tweaks in phases instead. 

Sorry I missed it the first round, and thanks for finding it!

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

bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list

[Marius Bakke]

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

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

> From 7e36409c4464bc10af90a2075f202dc22007b23c Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sun, 14 May 2017 17:01:06 +1000
> Subject: [PATCH 09/10] gnu: calibre: Add exhaustive license list

[...]

> @@ -165,4 +165,13 @@ and catalog ebooks in most of the major ebook formats.  It can also talk
>  to many ebook reader devices.  It can go out to the Internet and fetch
>  metadata for books.  It can download newspapers and convert them into
>  ebooks for convenient reading.")
> -    (license gpl3))) ; some files are under various other licenses, see COPYRIGHT
> +    (license (list license:gpl3 ; Too many files to detail here. See source.
> +                   license:gpl2+
> +                   license:gpl2
> +                   license:bsd-3
> +                   license:lgpl2.1+
> +                   license:lgpl2.1
> +                   license:expat
> +                   license:asl2.0
> +                   license:non-copyleft ; hyphenate license, and Info-Zip license.
> +                   license:cc-by-sa3.0))))

I removed hyphenate (which appears to be MIT) and info-ZIP (a weird BSD
variant only used in the windows installer). I also added zpl2.1,
public-domain and silofl1.1; and dropped the GPL2 and GPL3 only
variants (AFAICT everything installed is covered by "or later").

I also did some style changes in the commit messages. Pushed everything
but the icon patch with 1326166ebe15be3936c1a0497fd860f2fe69b5fa !

Closing this bug, but it would be great to find out about that
openoffice icon.

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