all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
To: 26924@debbugs.gnu.org
Subject: bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file.
Date: Mon, 15 May 2017 01:07:21 +1000	[thread overview]
Message-ID: <9ebee0d0-e6ab-0573-2974-5c501537efdd@openmailbox.org> (raw)
In-Reply-To: <a474bf3a-2be1-5d4a-28d8-0ef3267e29ce@openmailbox.org>

[-- 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


  parent reply	other threads:[~2017-05-14 15:08 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-14 15:00 bug#26924: [PATCH 0/12] Update Calibre to 2.85.1 Brendan Tildesley
2017-05-14 15:02 ` bug#26924: [PATCH 01/12] " Brendan Tildesley
2017-05-15 16:34   ` Marius Bakke
2017-05-14 15:03 ` bug#26924: [PATCH 02/12] " Brendan Tildesley
2017-05-14 15:16   ` Brendan Tildesley
2017-05-15 16:36   ` Marius Bakke
2017-05-14 15:05 ` bug#26924: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian Brendan Tildesley
2017-05-15 16:38   ` Marius Bakke
2017-05-14 15:05 ` bug#26924: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from Brendan Tildesley
2017-05-15 16:51   ` Marius Bakke
2017-05-14 15:06 ` bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown Brendan Tildesley
2017-05-15 16:56   ` Marius Bakke
2017-05-14 15:07 ` Brendan Tildesley [this message]
2017-05-15 17:00   ` bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file Marius Bakke
2017-05-16  1:02     ` Brendan Tildesley
2017-05-19 21:07       ` Marius Bakke
2017-05-14 15:08 ` bug#26924: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts Brendan Tildesley
2017-05-15 17:05   ` Marius Bakke
2017-05-14 15:09 ` bug#26924: [PATCH 08/12] gnu: calibre: Unbundle chardet Brendan Tildesley
2017-05-15 17:06   ` Marius Bakke
2017-05-14 15:09 ` bug#26924: [PATCH 09/12] gnu: calibre: Add missing dependencies Brendan Tildesley
2017-05-15 17:09   ` Marius Bakke
2017-05-14 15:10 ` bug#26924: [PATCH 10/12] gnu: chmlib: Use #:prefix license: Brendan Tildesley
2017-05-15 17:27   ` Marius Bakke
2017-05-14 15:11 ` bug#26924: [PATCH 11/12] gnu: calibre: Add exhaustive license list Brendan Tildesley
2017-05-15 17:23   ` Marius Bakke
2017-05-14 15:14 ` bug#26924: [PATCH 12/12] gnu: calibre: Don't create uninstaller Brendan Tildesley
2017-05-15 17:24   ` Marius Bakke
2017-05-15 16:32 ` bug#26924: [PATCH 0/12] Update Calibre to 2.85.1 Marius Bakke
2017-05-16  4:48 ` bug#26924: [PATCH 1/12] Update Calibre to 2.85.1 [REVISED] Brendan Tildesley
2017-05-16  4:50 ` bug#26924: [PATCH 02/10] gnu: calibre: Import dont-load-icons patch from debian Brendan Tildesley
2017-05-16  4:51 ` bug#26924: [PATCH 03/10] gnu: calibre: Import unbundle feedparser patch from Brendan Tildesley
2017-05-16  4:52 ` bug#26924: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown Brendan Tildesley
2017-05-16  4:53 ` bug#26924: [PATCH 05/10] gnu: calibre: Undelete GPLv2 icon file Brendan Tildesley
2017-05-16  4:54 ` bug#26924: [PATCH 06/10] gnu: calibre: Unbundle liberation fonts Brendan Tildesley
2017-05-16  4:55 ` bug#26924: [PATCH 07/10] gnu: calibre: Unbundle chardet Brendan Tildesley
2017-05-16  4:56 ` bug#26924: [PATCH 08/10] gnu: calibre: Add missing dependencies Brendan Tildesley
2017-05-16  4:58 ` bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list Brendan Tildesley
2017-05-19 21:58   ` Marius Bakke
2017-05-16  4:59 ` bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller Brendan Tildesley
2017-05-19 21:21   ` Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9ebee0d0-e6ab-0573-2974-5c501537efdd@openmailbox.org \
    --to=brendan.tildesley@openmailbox.org \
    --cc=26924@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.