From patchwork Fri May 3 16:42:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13879 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D95616F96; Fri, 3 May 2019 17:48:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 67A7C16F91 for ; Fri, 3 May 2019 17:48:27 +0100 (BST) Received: from localhost ([127.0.0.1]:44511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMJ-0007fa-1T for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004ia-4z for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbI9-0003zZ-PY for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI4-0003vp-0d for guix-patches@gnu.org; Fri, 03 May 2019 12:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI3-0007Gd-SK for guix-patches@gnu.org; Fri, 03 May 2019 12:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 01/24] gnu: calibre: Update to 3.41.3. References: In-Reply-To: Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690183727825 (code B ref 35446); Fri, 03 May 2019 16:44:03 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:57 +0000 Received: from localhost ([127.0.0.1]:49474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHt-0007EL-7o for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:57 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHq-0007Dg-9v for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:51 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 2CC0AA0C04 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901824; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=4kG7xba2wy3IblXvTA+U2DfHkDulYPZjFuPHPtRrorM=; b=kAKaBdUacu+qM2HqPbSMrg0xGSZ4bxApZQX8KLOaqtk4Kr0UHWMtOpmBWYJbDiTpis6bYq wP4iqibzuGvhmrsYaaEayieWrFm/c4B34bSTFP1AZ0FYE8Ppon53tYxJKjGJhi6yD7V/bl 2hD1s+aulOL490l4PAT6x3h+PnXUOeRuAYYZXRGDM+NLum9dHb4v4SDP/xy+4xps2Pbsfy rJTrZQbPIhngy5bDvUyFkSePRylNdIiHxK7TyHVJ9N6B9uW2T0aDAaj7s/wix/3wDamdWf sm4UDEA9SHdtbBri597zjKyJabSVbdzMlfjLHiPLvaErxWaVyLJnrfE6id6w9A== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id Ol1Ksuf4Kw5e for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:32 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:09 +1000 Message-Id: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build until my followup patches. * Remove feedparser patch. Calibre deleted its bundled feedparser, so it's no longer needed. Remove calibre-use-packaged-feedparser.patch. gnu/packages/patches/calibre-use-packaged-feedparser.patch: Delete file. gnu/local.mk: Remove reference to deleted feedparser patch.. * [inputs]: Replace python2-cssutils with the python2-css-parser fork. * [snippet]: Markdown is nolonger bundled, remove the unbundling code. --- gnu/local.mk | 1 - gnu/packages/ebook.scm | 12 ++--- .../calibre-use-packaged-feedparser.patch | 51 ------------------- 3 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/calibre-use-packaged-feedparser.patch diff --git a/gnu/local.mk b/gnu/local.mk index a0f40d13ae..d7d1a3fed6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -690,7 +690,6 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ - %D%/packages/patches/calibre-use-packaged-feedparser.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 99e49bc172..a603519590 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -78,7 +78,7 @@ (define-public calibre (package (name "calibre") - (version "3.35.0") + (version "3.41.3") (source (origin (method url-fetch) @@ -87,20 +87,16 @@ version ".tar.xz")) (sha256 (base32 - "1gd15wjz4fhcra6d44xiy3hwbyk0miwb66a1pq5yldyy0hlb271z")) + "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "src/calibre/ebooks/markdown") (delete-file "src/odf/thumbnail.py") (delete-file-recursively "resources/fonts/liberation") - (substitute* (find-files "." "\\.py") - (("calibre\\.ebooks\\.markdown") "markdown")) #t)) - (patches (search-patches "calibre-use-packaged-feedparser.patch" - "calibre-no-updates-dialog.patch")))) + (patches (search-patches "calibre-no-updates-dialog.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -129,7 +125,7 @@ ("python2-apsw" ,python2-apsw) ("python2-chardet" ,python2-chardet) ("python2-cssselect" ,python2-cssselect) - ("python2-cssutils" ,python2-cssutils) + ("python2-css-parser" ,python2-css-parser) ("python2-dateutil" ,python2-dateutil) ("python2-dbus" ,python2-dbus) ("python2-dnspython" ,python2-dnspython) diff --git a/gnu/packages/patches/calibre-use-packaged-feedparser.patch b/gnu/packages/patches/calibre-use-packaged-feedparser.patch deleted file mode 100644 index 8f4bbc8248..0000000000 --- a/gnu/packages/patches/calibre-use-packaged-feedparser.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Martin Pitt -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'(&#\d+)([^0-9;])', r'\1;\2', raw_xml) From patchwork Fri May 3 16:42:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13862 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6015D16F96; Fri, 3 May 2019 17:44:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C72B816F91 for ; Fri, 3 May 2019 17:44:21 +0100 (BST) Received: from localhost ([127.0.0.1]:44381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIK-0004od-VD for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004id-5b for guix-patches@gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbI9-0003zf-RP for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI4-0003w9-Gz for guix-patches@gnu.org; Fri, 03 May 2019 12:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI4-0007Gs-Di for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 02/24] gnu: calibre: Use system mathjax. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690183727833 (code B ref 35446); Fri, 03 May 2019 16:44:04 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:57 +0000 Received: from localhost ([127.0.0.1]:49478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHx-0007Ep-Bj for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:57 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHt-0007Do-JD for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:53 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 2A724A0189 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901828; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nEwPEK7SKR4vyxs7fXnbceoir3YZZSDNCzuaEqyfP9M=; b=a4KVuWTsCl4nhzrps1aXKnjWCqrI4/jmVCEqHFZkqTIr8fN9OlebhnZp5I2b7kMg/sVdTV HhfJHXU1yI9wNKkvHlpAYz+IRoWMvrEiJafeUBe+RBxfuBZDK0LoyrnyXNatUm650NU2pv Fhxdbvuwdcf8lyP3H6VR12AdSyX6DdvL0IX9LEUUh2ZqP6kAdBQw68rj/VSfXa0YJKkReZ LbTyPWvB2JXL1hHDA9A7tjqH9kOyGhTc7E2QCR09usJ+EIOoHNJrCeSSbWe1bRstVe5W6e T/Vku7KrvTmZnuDkVVJ6wh3OLa4ARmxKKUjhuYkqM4LxbFEotRO+t24AlsKqqw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id j5cVSilKb0AL for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:34 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:10 +1000 Message-Id: <20190503164232.1799-2-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Use system mathjax. The build phase can be replaced because the install phase builds everything anyway. --- gnu/packages/ebook.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index a603519590..1d815489a6 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) @@ -113,6 +114,7 @@ ("fontconfig" ,fontconfig) ("glib" ,glib) ("icu4c" ,icu4c) + ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) @@ -181,6 +183,10 @@ (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) #t))) + (add-after 'build 'build-extra + (lambda* (#:key inputs #:allow-other-keys) + (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" + (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")))) (add-after 'install 'install-font-liberation (lambda* (#:key inputs outputs #:allow-other-keys) (for-each (lambda (file) From patchwork Fri May 3 16:42:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13866 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8A28716F93; Fri, 3 May 2019 17:44:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3966216F91 for ; Fri, 3 May 2019 17:44:34 +0100 (BST) Received: from localhost ([127.0.0.1]:44396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIX-00051W-M8 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004ie-6n for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbI9-0003yz-Cu for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI3-0003vL-Cp for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI3-0007GK-6T for guix-patches@gnu.org; Fri, 03 May 2019 12:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 03/24] gnu: calibre: Build rapydscript. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690183327800 (code B ref 35446); Fri, 03 May 2019 16:44:03 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:53 +0000 Received: from localhost ([127.0.0.1]:49472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHs-0007EI-TA for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:53 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHq-0007Di-I6 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:51 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 01AD74DE06 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901824; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UQJzgJbS2jFfeHR6/ra6JDv3lvKbcinwg21hvP+3QNg=; b=uhmp3kWGnZEvYoGlY6BzGXRORc8uYO0mW20aCl77PniR+MqZLEyAeCHBtwhmahw4Izk3hR g3mQtG3Q0vjGTNVj4Jx35XYtFmLRc1tGBclhnrYEMVlPLWZgA9coUlOTnVUZUwR4+EYcTI keBh3q/PMXPSdVPNYMC0j1YSyXTXJuyw+/Hzy5gmnSmwoSuGwb8FM1LbuXR/q0dPw5Z03o tbGgtnJ+0vrYc+obnx8vC1MVHRNdiVTq55P8d9omcjlxT/TxV/B3bT4P2kyvNerQBV/1DX acwzMxj5Ec8XflikuEQbNtvwt7pv3FtsTittzu3JKgwaLb68e2Bc0JoYlrHZoA== Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id MOq-M6PEPHdz for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:35 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:11 +1000 Message-Id: <20190503164232.1799-3-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre)[arguments]: Build rapydscript. --- gnu/packages/ebook.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 1d815489a6..62d1c3a72e 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -186,7 +186,8 @@ (add-after 'build 'build-extra (lambda* (#:key inputs #:allow-other-keys) (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" - (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")))) + (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")) + (invoke "python2" "setup.py" "rapydscript"))) (add-after 'install 'install-font-liberation (lambda* (#:key inputs outputs #:allow-other-keys) (for-each (lambda (file) From patchwork Fri May 3 16:42:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13864 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1BB8C16F91; Fri, 3 May 2019 17:44:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ABEF916F91 for ; Fri, 3 May 2019 17:44:23 +0100 (BST) Received: from localhost ([127.0.0.1]:44391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIN-0004r9-3E for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004ic-5U for guix-patches@gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbI9-0003yt-Ch for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35947) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI2-0003un-Oa for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI2-0007G8-GW for guix-patches@gnu.org; Fri, 03 May 2019 12:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 04/24] gnu: calibre: Add missing dependencies as indicated by tests. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690183127778 (code B ref 35446); Fri, 03 May 2019 16:44:02 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:51 +0000 Received: from localhost ([127.0.0.1]:49468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHq-0007Dw-Fs for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:50 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHo-0007Dd-8t for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:49 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id A4D964DB89 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:41 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901821; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hZAKhUUNn61QQnIH4RC/yH5M9k04SlnM6/SalzU6AWk=; b=l8Hl2YS5SJbwdeHH1F+qoU3x+YSHKCBQrGkIaVBfiP2Wr1cysk2QIDcz3gmFG0FkA0gHGm akNrQi3Cu+OlzNb+dk9Sby7iMVn+qFd3nAaozhyyK+8ZBLawhvyAUw5IJl74/pJHDpN5wT p4tLRRmCj6CQHKmsVecSWQLlwz/fV8mtoe5n/3Movz2jiylBFzNwyoJZ9tmTcOZqWMPHL3 tgTeNGHgN1PqVdnPvnzPhc0uJqQTEviqrNATTZVOTuifQMfEWD3TOlIc/+Z8fMXo7AlQzy KGh39CFF4BP/HbJlN7ZEYhS6pvFf4jEYWSzNI1f85I9vrvp8h5TojwTdXzLZSg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id KiJ79RrqRofu for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:37 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:12 +1000 Message-Id: <20190503164232.1799-4-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Add missing dependencies python2-html5lib and python2-psutil as indicated by tests. --- gnu/packages/ebook.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 62d1c3a72e..6bc3813725 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -134,6 +134,7 @@ ("python2-dukpy" ,python2-dukpy) ("python2-feedparser" ,python2-feedparser) ("python2-html5-parser" ,python2-html5-parser) + ("python2-html5lib" ,python2-html5lib) ("python2-lxml" ,python2-lxml) ("python2-markdown" ,python2-markdown) ("python2-mechanize" ,python2-mechanize) @@ -141,6 +142,7 @@ ("python2-msgpack" ,python2-msgpack) ("python2-netifaces" ,python2-netifaces) ("python2-pillow" ,python2-pillow) + ("python2-psutil" ,python2-psutil) ("python2-pygments" ,python2-pygments) ("python2-pyqt" ,python2-pyqt) ("python2-sip" ,python2-sip) From patchwork Fri May 3 16:42:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13863 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9FB6616F93; Fri, 3 May 2019 17:44:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0903C16F92 for ; Fri, 3 May 2019 17:44:23 +0100 (BST) Received: from localhost ([127.0.0.1]:44387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIM-0004qH-EN for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004kI-Rh for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIG-00044Z-Lg for guix-patches@gnu.org; Fri, 03 May 2019 12:44:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI8-0003y4-9L for guix-patches@gnu.org; Fri, 03 May 2019 12:44:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI5-0007HM-VY for guix-patches@gnu.org; Fri, 03 May 2019 12:44:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690184027874 (code B ref 35446); Fri, 03 May 2019 16:44:05 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:00 +0000 Received: from localhost ([127.0.0.1]:49487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI0-0007FU-AB for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:00 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHy-0007ER-L0 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:59 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 38D564D7D4 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901833; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yvVRyr15rosEqPmiVMy+ir8jQQnXTHG7lhEpF/1mlb0=; b=H0WIT3nozxRsRSbe72mHa8W8XZxVpvRjC++ABwEHr1C6YLc0iCw2RN0BKvlXkgbx1gjrZk z0CoaSbva+AlXGKSEMqW2kcvRcPRLW3mTVjXVeOvT6vbNGumbOolt1ExI26CJ4QEkiyXFB EbFpqEmh6IL88oriadiKPbwWkkMLEbHUltgLsCXQbITiAlXIFFP7c3NvyL9QKAQIKlISRD fEwQpFYi3Di0LmnuBK+Sl/nBI7cAxXTaBYBcGCNrshLzWaFBUZ0dIP50+4do+KM4BeoNBv COHTK4DehBCwgNpmQeDpjTroiucrLumzVQZAT6jSPfbSQbAmCPE7VV8zndnYRw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id gfNXvtPnQI9W for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:39 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:13 +1000 Message-Id: <20190503164232.1799-5-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre):[patches]: Patch out test_unrar. gnu/local.mk: Add reference to patch file. gnu/packages/patches/calibre-remove-test-unrar.patch: New file. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 3 ++- .../patches/calibre-remove-test-unrar.patch | 27 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/calibre-remove-test-unrar.patch diff --git a/gnu/local.mk b/gnu/local.mk index d7d1a3fed6..d5b7a2c5e5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -690,6 +690,7 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ + %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 6bc3813725..f2875ef2fc 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -97,7 +97,8 @@ (delete-file "src/odf/thumbnail.py") (delete-file-recursively "resources/fonts/liberation") #t)) - (patches (search-patches "calibre-no-updates-dialog.patch")))) + (patches (search-patches "calibre-no-updates-dialog.patch" + "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/calibre-remove-test-unrar.patch b/gnu/packages/patches/calibre-remove-test-unrar.patch new file mode 100644 index 0000000000..fdffb0c750 --- /dev/null +++ b/gnu/packages/patches/calibre-remove-test-unrar.patch @@ -0,0 +1,27 @@ +From a16f97b02bd8afd0ec05c471e156f631f2cc6eec Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Tue, 26 Mar 2019 22:17:03 +1100 +Subject: [PATCH] Remove test_unrar. + +--- + src/calibre/test_build.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py +index d67afd20a6..709132ef17 100644 +--- a/src/calibre/test_build.py ++++ b/src/calibre/test_build.py +@@ -220,10 +220,6 @@ class BuildTest(unittest.TestCase): + from calibre.gui2.win_file_dialogs import test + test() + +- def test_unrar(self): +- from calibre.utils.unrar import test_basic +- test_basic() +- + @unittest.skipUnless(iswindows, 'WPD is windows only') + def test_wpd(self): + wpd = plugins['wpd'][0] +-- +2.21.0 + From patchwork Fri May 3 16:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13870 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AF71016F96; Fri, 3 May 2019 17:45:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 37EF216F91 for ; Fri, 3 May 2019 17:45:11 +0100 (BST) Received: from localhost ([127.0.0.1]:44440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ8-0005Yd-Jo for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004k9-Pm for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIC-00041t-FT for guix-patches@gnu.org; Fri, 03 May 2019 12:44:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI5-0003wW-1E for guix-patches@gnu.org; Fri, 03 May 2019 12:44:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI4-0007Gz-UZ for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690183827840 (code B ref 35446); Fri, 03 May 2019 16:44:04 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:58 +0000 Received: from localhost ([127.0.0.1]:49480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHx-0007Es-LC for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:57 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHt-0007Dp-LX for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:54 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 34E2DA0199 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901828; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kTB9Rjw4cKuokRU7cm3MK0GcqfLUpz+1HK8U1ykPhq8=; b=mCszQ/qVeSBVXLU+wZifuVI9SZXubXLAa3uPVrRHNEwO2puOlhuPCFmLKTf0EGdccMCwlS QU2Fyzwo5/13FhkDV1u42sAv2CVBqvD9XHws9d/Ycc7BQRMA60qOl2/EAM53D86hapkmAI t2Ad3Dcpmq3cSWuHjucxQvj+9WjSzmGUR4PpZIC2QhXJkruiHrtMNBs+301xeo86v4vanl RxbNrchv67I+NpaeoHjni2BLtSoMlwsxUx6YRpck7ZHfCeu36vUZyjwVRBUwv1WvDTnH8P CVAFNgKAvMeOJmW3aVsjP0kTM/5Pl3SQVyVTDK2d0nOu2rnhXk1xW4YIgvFJew== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id TAmMMazCGZPq for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:40 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:14 +1000 Message-Id: <20190503164232.1799-6-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packagse/ebook.scm (calibre): Move font unbundling to after check phase. Some of the tests use the font files for various things. It's more convenient to just allow the font files to be there than to patche the tests. We also take the chance to switch from copying the font files in, to having font-liberation as an input and symlinking them. --- gnu/packages/ebook.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index f2875ef2fc..007ca9fc47 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -95,14 +95,12 @@ (snippet '(begin (delete-file "src/odf/thumbnail.py") - (delete-file-recursively "resources/fonts/liberation") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-unrar.patch")))) (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 @@ -113,6 +111,7 @@ (inputs `(("chmlib" ,chmlib) ("fontconfig" ,fontconfig) + ("font-liberation" ,font-liberation) ("glib" ,glib) ("icu4c" ,icu4c) ("js-mathjax" ,js-mathjax) @@ -191,17 +190,18 @@ (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")) (invoke "python2" "setup.py" "rapydscript"))) - (add-after 'install 'install-font-liberation + ;; The font TTF files are used in some miscellaneous tests, so we + ;; unbundle them here to avoid patching the tests. + (add-after 'install 'unbundle-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"))) + (let ((font-dest (string-append (assoc-ref outputs "out") + "/share/calibre/fonts/liberation")) + (font-src (string-append (assoc-ref inputs "font-liberation") + "/share/fonts/truetype"))) + (delete-file-recursively font-dest) + (symlink font-src font-dest)) #t)) - (add-after 'install-font-liberation 'install-mimetypes + (add-after 'unbundle-font-liberation 'install-mimetypes (lambda* (#:key outputs #:allow-other-keys) (install-file "resources/calibre-mimetypes.xml" (string-append (assoc-ref outputs "out") From patchwork Fri May 3 16:42:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13868 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E13A616F93; Fri, 3 May 2019 17:45:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 372E216F91 for ; Fri, 3 May 2019 17:45:03 +0100 (BST) Received: from localhost ([127.0.0.1]:44416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ0-0005R3-OV for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004kJ-SM for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIG-00044R-LY for guix-patches@gnu.org; Fri, 03 May 2019 12:44:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI9-0003yg-8a for guix-patches@gnu.org; Fri, 03 May 2019 12:44:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI9-0007Ho-5y for guix-patches@gnu.org; Fri, 03 May 2019 12:44:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 07/24] gnu: Add python-html2text, python2-html2text. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690184327930 (code B ref 35446); Fri, 03 May 2019 16:44:09 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:03 +0000 Received: from localhost ([127.0.0.1]:49494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI2-0007GH-Ur for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:03 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI0-0007Eg-BA for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:00 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id DCD6C4DED1 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901834; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xaCR07wuL8a8zHu74+9NbBsLJwlsFb7hzRD2yr6E3J0=; b=dP13SsRgndMjLuvkosjA7542ZIE17BvdMMWlS6jvxeeeADFiU1UcCHGGSWXe+I+XfDd7q5 /dahKDEtGneb7OPIXQuOzSgYdzA15nVT6E+MDTKerLqEYmP8U6e5OVHzAX4Gf6X6u+csPV ZZxr0myFn2QruEewvii52d0HxEW0LgXNgaBpprDUon7pHqaFzh1gklH1g48lC8VKDfsRO6 d8h2193rvv4AGZMqq0tinss4YIKMQ9iZwhd4nGQExYKLDjvjtB2L/YOYU4ERdW9++wLhWc S1rkyutY4fU8ZSB+XeZl08SLGahCVb4exDGLilTWgLDPTupM+L0G4cy00CaGEg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id B9j_lasRn7PS for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:42 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:15 +1000 Message-Id: <20190503164232.1799-7-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (python-html2text, python2-html2text.): New variables. --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 37da0fd669..839d444f7c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -299,6 +299,28 @@ other HTTP libraries.") (define-public python2-httplib2 (package-with-python2 python-httplib2)) +(define-public python-html2text + (package + (name "python-html2text") + (version "2018.1.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "html2text" version)) + (sha256 + (base32 + "1m6d7ciq30adc3d1n8g6r46072n7q8kdy039pqvnnmp763xi8xb2")))) + (build-system python-build-system) + (home-page "https://pypi.org/project/html2text/") + (synopsis "Convert HTML into plain text") + (description "html2text takes HTML and converts it into plain ASCII text +which is also valid markdown. html2text was originally written by Aaron +Swartz.") + (license license:gpl3+))) + +(define-public python2-html2text + (package-with-python2 python-html2text)) + (define-public python-mechanicalsoup (package (name "python-mechanicalsoup") From patchwork Fri May 3 16:42:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13880 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7DEC916F93; Fri, 3 May 2019 17:48:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3C46416F91 for ; Fri, 3 May 2019 17:48:32 +0100 (BST) Received: from localhost ([127.0.0.1]:44513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMN-0007hx-S0 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004kL-Sp for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIG-00044X-Lg for guix-patches@gnu.org; Fri, 03 May 2019 12:44:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI8-0003yS-Po for guix-patches@gnu.org; Fri, 03 May 2019 12:44:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI8-0007Hb-M0 for guix-patches@gnu.org; Fri, 03 May 2019 12:44:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 08/24] gnu: calibre: Add python2-html2text as an input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690184127885 (code B ref 35446); Fri, 03 May 2019 16:44:08 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:01 +0000 Received: from localhost ([127.0.0.1]:49490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI0-0007FX-Lw for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:00 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHz-0007ES-40 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:59 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id ABBB4A0AE9 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901833; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KqlkcTdALWrbRTGiclPQlMKH3oc3ZEDxFyUqbZjOuIw=; b=lbEAr8VHJMqWINgSmSZ7j43EY8oVMyN/NcSjnai4Fkx4VfUl/72C3PPOu97hFtmH18JS66 1UIPAqWGJFDuN7K9FWuhd+Gv/fr/YX+j48gpd4/uTmoaqe/vtseFzYylNPk89W714VUwfm hZIW/C5jprg68kEOflIthvPPmMn/Pn5vUTqK6RAkOwXrXoVAGzSLZkv5q8GCM616mHekqa C1mSfb65z6Tp1Iyr1wAgRjpPaZ4wVnxGJhX3h2Nq2Cf+9wxP8AFGbX3HK5yd9AYKKIaV52 xj1n1gApa5uBAAvKE4TYM0QHIki9KwKfglkLPqMtuc8yqZzlbpsmUJyQIZu1uw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id Nudz04FsAhWM for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:44 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:16 +1000 Message-Id: <20190503164232.1799-8-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre)[inputs]: Add python2-html2text, as required by tests. --- gnu/packages/ebook.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 007ca9fc47..79fa99cf4a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -133,6 +133,7 @@ ("python2-dnspython" ,python2-dnspython) ("python2-dukpy" ,python2-dukpy) ("python2-feedparser" ,python2-feedparser) + ("python2-html2text" ,python2-html2text) ("python2-html5-parser" ,python2-html5-parser) ("python2-html5lib" ,python2-html5lib) ("python2-lxml" ,python2-lxml) From patchwork Fri May 3 16:42:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13881 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC51016F93; Fri, 3 May 2019 17:48:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8240B16F91 for ; Fri, 3 May 2019 17:48:39 +0100 (BST) Received: from localhost ([127.0.0.1]:44515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMV-0007kL-5T for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIJ-0004n2-6e for guix-patches@gnu.org; Fri, 03 May 2019 12:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIH-00045j-6D for guix-patches@gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI9-0003zR-Rc for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI9-0007Hw-Kv for guix-patches@gnu.org; Fri, 03 May 2019 12:44:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 09/24] gnu: python-regex, python2-regex: Update to 2019.04.14. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690184427944 (code B ref 35446); Fri, 03 May 2019 16:44:09 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:04 +0000 Received: from localhost ([127.0.0.1]:49498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI3-0007GR-EZ for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:03 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI1-0007Eh-5U for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:01 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id B6DC04DC9C for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901835; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5r/Qb1UPaT8FboSH27expDZDJr/PQitAo1i1/nFn3zk=; b=xybdo4Aoubo+9aNTib8vTdAkffE3xxv+ZS+NDiktQnLsUyis1XtRNhqBo+2PB9RlTix+5R XQdTomA1TC5/qe8PFcdL1ojXPc1ADqBcHFsUfyYCA3ssuGplciw4SG63nvFUzoM6VN0ee1 nN99njAapgfSYeCp0gUz13P9qyKfqo2jqLiRevzBrPm3XQCgkzVUBX7BiQjaN9hWP5XuR4 QOnmidVsRKcBXpPbsU1ZS6/vC23M8GuGLgUJ5im26C3SvRl78ciACJB20zTQKaW6Oh4SLT G58lO9X7N3XlXLcgLckD0u6Ns6oKIKYLevvMShe/zJt78PfExiK1gyq/pTXt3A== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id 9xcWGeo7G6eL for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:45 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:17 +1000 Message-Id: <20190503164232.1799-9-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python.scm (python-regex, python2-regex): Update to 2019.04.14. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 35147ebfa7..31f3ea3688 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13061,13 +13061,15 @@ window memory map manager.") (define-public python-regex (package (name "python-regex") - (version "2017.06.07") + (version "2019.04.14") (source (origin (method url-fetch) (uri (pypi-uri "regex" version)) (sha256 (base32 - "06r6b7yigikbj3a72whl85r2b64pj1r0ypmw9yalmkm0wnxq8mz4")))) + "1a6hhfs6l6snr1z654ay6wzbmwdkmv282fzfkd5hk2d1n73y8v6m")))) + ;; TODO: Fix and enable regex_test.py tests that complain about the + ;; test.support module not existing. (build-system python-build-system) (home-page "https://bitbucket.org/mrabarnett/mrab-regex") (synopsis "Alternative regular expression module") From patchwork Fri May 3 16:42:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13871 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1393916F93; Fri, 3 May 2019 17:45:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2E5B516F92 for ; Fri, 3 May 2019 17:45:10 +0100 (BST) Received: from localhost ([127.0.0.1]:44438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ7-0005X6-JT for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ2-0005Sm-D6 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ1-0004sP-5v for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ0-0004rf-Us for guix-patches@gnu.org; Fri, 03 May 2019 12:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ0-0007MR-Sk for guix-patches@gnu.org; Fri, 03 May 2019 12:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 10/24] gnu: calibre: Disable tests that require networking. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185228080 (code B ref 35446); Fri, 03 May 2019 16:45:02 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:12 +0000 Received: from localhost ([127.0.0.1]:49520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIC-0007Il-0P for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI9-0007Gp-8Z for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:09 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id C7E60A10A5 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id NmtxaQIvs-9v for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:47 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:18 +1000 Message-Id: <20190503164232.1799-10-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre)[configure]: set CI=true so Bonjour test doesn't try to run without networking. --- gnu/packages/ebook.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 79fa99cf4a..2b557ab08d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -185,6 +185,9 @@ "/bin/pdftohtml\""))) (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) + ;; This informs the tests we are a continuous integration + ;; environment and thus have no networking. + (setenv "CI" "true") #t))) (add-after 'build 'build-extra (lambda* (#:key inputs #:allow-other-keys) From patchwork Fri May 3 16:42:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13865 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AC0216F93; Fri, 3 May 2019 17:44:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E531516F91 for ; Fri, 3 May 2019 17:44:32 +0100 (BST) Received: from localhost ([127.0.0.1]:44394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIW-00050G-Ex for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004k7-Pl for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIC-00041g-EG for guix-patches@gnu.org; Fri, 03 May 2019 12:44:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI5-0003ws-Iw for guix-patches@gnu.org; Fri, 03 May 2019 12:44:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI5-0007HE-F7 for guix-patches@gnu.org; Fri, 03 May 2019 12:44:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 11/24] gnu: Add python-soupsieve, python2-soupsieve Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690183927857 (code B ref 35446); Fri, 03 May 2019 16:44:05 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:59 +0000 Received: from localhost ([127.0.0.1]:49484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHz-0007FB-0C for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:59 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHx-0007EH-PQ for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:58 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 56F294DE77 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:52 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901830; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ae8hU7I3UxRwnuP8basjgc/pJS41oZuD6jm4VSE0liY=; b=fCcaoFPap/rsRE1GpzkMPNX/JVPzzNQwWL8p2ppJfo0MNK6rUx7YxspAiPr8NW1x9hhu0K iRfgSJUBZ9h+9R7Dj4SrjxVviKpl3d5iptsvf0img+31DHHNmoQSsTJkYquXlbxgYyKyK9 1SE7nsAuwQjALzVhCFdsl17XaB6nIPQxq2FOYWdi6lMbleuhQh2qMbdknaPSs6LzfLTc+x tdHNrl5F3EAazeBeU4yrwY6CzD01NhR53RWZfDIcDwP3edZNtVq5ds3QPWVoMGE4IzncEI 1CSOXbMJSPe+dvmajvljjEusvbGRtk9n/lW1A0R73nbZ1v+kr+u48nmKNPt70Q== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id hYztyBYM22R8 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:49 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:19 +1000 Message-Id: <20190503164232.1799-11-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-soupsieve, python2-soupsieve): New variables. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31f3ea3688..42e8a60b3a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5559,6 +5559,39 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (strip-python2-variant python-beautifulsoup4))) (arguments `(#:python ,python-2)))) +(define-public python-soupsieve + (package + (name "python-soupsieve") + (version "1.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "soupsieve" version)) + (sha256 + (base32 + "1jnzkiwmjl6yvqckc9mf689g87b6yz07sv868hap2aa5arggy3mj")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) + ;;XXX: 2 tests fail currently despite claming they were to be + ;;skipped. Also, beautifulsoup4 may depend on this in the future, so we + ;;don't want to create a circular dependency. + (home-page "https://github.com/facelessuser/soupsieve") + (synopsis "CSS selector library") + (description + "Soup Sieve is a CSS selector library designed to be used with Beautiful +Soup 4. It aims to provide selecting, matching, and filtering using modern +CSS selectors. Soup Sieve currently provides selectors from the CSS level 1 +specifications up through the latest CSS level 4 drafts and beyond (though +some are not yet implemented).") + (license license:expat))) + +(define-public python2-soupsieve + (let ((base (package-with-python2 python-soupsieve))) + (package + (inherit base) + (propagated-inputs + `(("python2-backports-functools-lru-cache" ,python2-backports-functools-lru-cache)))))) + (define-public python-netifaces (package (name "python-netifaces") From patchwork Fri May 3 16:42:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13876 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 114AA16F93; Fri, 3 May 2019 17:45:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 37DDD16F91 for ; Fri, 3 May 2019 17:45:34 +0100 (BST) Received: from localhost ([127.0.0.1]:44470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJV-00062M-P1 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ6-0005WF-24 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ4-0004xZ-DW for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ4-0004xE-3z for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ3-0007NB-Vh for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 12/24] gnu: calibre: Use linux.py to install desktop files. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690186228166 (code B ref 35446); Fri, 03 May 2019 16:45:05 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:22 +0000 Received: from localhost ([127.0.0.1]:49537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbII-0007K8-RC for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:22 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIG-0007Id-Od for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:17 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 522A74DB84 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901842; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7GZy+jZM947QnsWMSPboHmIylT+8KbZE9jCg4fsu8RU=; b=hO6Bbgm120c95ERCfaYUha9YFEIiHOFNqPS3YkhsQMmI1q/CXL71wiRgObbeXjHORgP8z2 6goSrOKhvO8Xo3ko4F/tSzK8cklvSO34vwWGJhRbNuCiMOaL8z7k1ZS3mqI5M5HvBkTe/5 IV1pBYzbGAn3r7/OCu85SRFeZgrQrxszs/5LYdN1kUdSYdvnL1D/z56b9+pzfzGwfwyOqX rrxBNV8+4vMoAbYDYRDoV4iPNwTfC2Loonps1Lxmwj3qV9VWDSsd+O5bhvgo/FN/LoEyaK 9f8xh+H/Sn8Zm5oqiC0ER+FHNYqfReBZ0RFD0/QAj4o3S96KpWfVzszsaEfSUw== Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id Ie0u26N3Mxxi for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:50 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:20 +1000 Message-Id: <20190503164232.1799-12-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre):[arguments]: linux.py is for installing various freedestkop files in one's home directory. Here we hack it to install into the /share folder in the output. This also installs the mimetypes.xml, so we no longer require that explicit phase. Note that the patch looks a little confusing as the diff thinks I've remove a #t)) line and left the other #t)))) line below it, but it all adds up. --- gnu/packages/ebook.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 2b557ab08d..964fdd7b75 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -102,9 +102,6 @@ (native-inputs `(("pkg-config" ,pkg-config) ("qtbase" ,qtbase) ; for qmake - ;; 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))) ;; Beautifulsoup3 is bundled but obsolete and not packaged, so just leave it bundled. @@ -174,15 +171,24 @@ "href=\"favicon.ico\"")) #t)) (add-before 'build 'configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let ((podofo (assoc-ref inputs "podofo")) - (pyqt (assoc-ref inputs "python2-pyqt"))) + (pyqt (assoc-ref inputs "python2-pyqt")) + (out (assoc-ref outputs "out"))) (substitute* "setup/build_environment.py" (("sys.prefix") (string-append "'" pyqt "'"))) (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler") - "/bin/pdftohtml\""))) + "/bin/pdftohtml\""))) + + ;; Calibre thinks we are installing desktop files into a home + ;; directory, but here we butcher the script in to installing + ;; to calibres /share directory. + (setenv "XDG_DATA_HOME" (string-append out "/share")) + (substitute* "src/calibre/linux.py" + (("'~/.local/share'") "''")) + (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) ;; This informs the tests we are a continuous integration @@ -204,12 +210,6 @@ "/share/fonts/truetype"))) (delete-file-recursively font-dest) (symlink font-src font-dest)) - #t)) - (add-after 'unbundle-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")) #t))))) (home-page "http://calibre-ebook.com/") (synopsis "E-book library management software") From patchwork Fri May 3 16:42:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13872 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32AAF16F93; Fri, 3 May 2019 17:45:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BA6B216F91 for ; Fri, 3 May 2019 17:45:21 +0100 (BST) Received: from localhost ([127.0.0.1]:44442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJJ-0005l0-6o for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ2-0005Sx-Jt for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ1-0004sK-5o for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ0-0004rB-DR for guix-patches@gnu.org; Fri, 03 May 2019 12:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ0-0007MK-8s for guix-patches@gnu.org; Fri, 03 May 2019 12:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 13/24] gnu: calibre: Disable bs4 test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185228074 (code B ref 35446); Fri, 03 May 2019 16:45:02 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:12 +0000 Received: from localhost ([127.0.0.1]:49518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIB-0007IX-Ds for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:11 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI8-0007GJ-5h for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:08 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id B9A5B4DBA7 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901842; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gLz+cpE7NJrtyBN4ajcSrqQhUzzSHxZ+9Zal2wxNtzM=; b=T9NKi6smRdrXiVLlMXMObbpiuHllSbcKJY5OuZfyOpG5RdzC/g15M/PAiQgLfJQrcxfG7A 2eZIbaYJ2cm8NMPB5/y9wpzmxqHGptqeFPlcQugAO9/IjxLz0sLD43RxOHg89QJEG6Ff59 NufYrNljIj4PYNnKSNSxLOqXiOMK/CP9e4cloZfMpNoskaiGo0JIMy5Qi3Nm6n1p1BnPL9 gkyZI5jHz5IQ8MfMbgneTOhH8YhDcmlojkPY4WjMLR+gRirSCTcvC11GsZXvThCpZ+HmK8 chHRECJjRojpSmKOI2gUpL89kDdMnKgtlk0BzZT1lKSXG/jLmeNKU/Px4rTH/w== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id pnkCunjLHrHa for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:52 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:21 +1000 Message-Id: <20190503164232.1799-13-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/local.mk: Reference patch gnu/packages/ebook.scm (calibre)[origin]: Enable patch. gnu/packages/patches/calibre-remove-test-bs4.patch: New file. In my efforts to fix all Calibre tests, this test would always complain about backports.functools_lru_cache not existing even after I packaged and added python2-soupsieve as an input and confirmed it was in the PYTHONPATH. Currently Calibre does not actually use it for anything other than testing it's there, so I assume they will start using it in future Calibre versions. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 1 + .../patches/calibre-remove-test-bs4.patch | 27 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 gnu/packages/patches/calibre-remove-test-bs4.patch diff --git a/gnu/local.mk b/gnu/local.mk index d5b7a2c5e5..9e31868281 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -690,6 +690,7 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ + %D%/packages/patches/calibre-remove-test-bs4.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 964fdd7b75..05a9b96d35 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -97,6 +97,7 @@ (delete-file "src/odf/thumbnail.py") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" + "calibre-remove-test-bs4.patch" ;; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs diff --git a/gnu/packages/patches/calibre-remove-test-bs4.patch b/gnu/packages/patches/calibre-remove-test-bs4.patch new file mode 100644 index 0000000000..2c566baeb6 --- /dev/null +++ b/gnu/packages/patches/calibre-remove-test-bs4.patch @@ -0,0 +1,27 @@ +From 2738dd42caebe55326c76922a12ba8740bdb22e7 Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Sat, 27 Apr 2019 00:42:39 +1000 +Subject: [PATCH] Remove test_bs4 + +--- + src/calibre/test_build.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py +index 73f1172e8c..07bdffd3e5 100644 +--- a/src/calibre/test_build.py ++++ b/src/calibre/test_build.py +@@ -73,10 +73,6 @@ class BuildTest(unittest.TestCase): + from html5_parser import parse + parse('

xxx') + +- def test_bs4(self): +- import soupsieve, bs4 +- del soupsieve, bs4 +- + def test_zeroconf(self): + if ispy3: + import zeroconf as z, ifaddr +-- +2.21.0 + From patchwork Fri May 3 16:42:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13867 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F1C7F16F93; Fri, 3 May 2019 17:44:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7867C16F91 for ; Fri, 3 May 2019 17:44:45 +0100 (BST) Received: from localhost ([127.0.0.1]:44404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIj-0005AZ-1o for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIJ-0004n0-5W for guix-patches@gnu.org; Fri, 03 May 2019 12:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIH-00045U-5m for guix-patches@gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbIA-000400-Bf for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbIA-0007I8-4d for guix-patches@gnu.org; Fri, 03 May 2019 12:44:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 14/24] gnu: calibre: Disable Qt test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690184527973 (code B ref 35446); Fri, 03 May 2019 16:44:10 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:05 +0000 Received: from localhost ([127.0.0.1]:49502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI4-0007H1-Uw for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:05 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI2-0007Ey-W1 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:03 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 8BED6A01ED for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901837; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Q8snYv3wen1O1+MAmdNXR3IS789JPvoHkEd6B0vEwE=; b=WHkydWTYXHReWsSLYa8UVzlZgvjcAfzvv+VuUZuNOWS1fieiPmhcCN8maGtpgLbb/eX6uq jZkx3lmDbc9ix0QRaoIfporgB+z+E4dRIwbTnUJAR3A7omkarsUeywcUnB4NxRwXpBPCC7 d9zH9/sYPcBUUJOMTrK3zVxxT3bEuKqZS7jx9Csq7Efi+kZkLe4QqB6Y7v87RLDXnqmzJ+ DLne1gMcA3G8JhyHRXUzTqM8cVc3lsFdLU92x6MJgBqzHpq1TR2ABVgGZ2I38DYtrD7LWz bZ/mgiKO0SVBV1/oX8bA8y3XZlHrlnBygMJqp78A6Rv5lIKNSOWfUyP+crio5w== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id LzCkxKPNI-L7 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:53 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:22 +1000 Message-Id: <20190503164232.1799-14-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calbre):[arguments]: Disable Qt test. The Qt test complains about being unable to load all image plugins, and I notice the available plugins list it shows lacks 'svg'. Adding qtsvg doesn't fix it, so I'm not sure how to fix it. --- gnu/packages/ebook.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 05a9b96d35..b0d14ece68 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -195,6 +195,7 @@ ;; This informs the tests we are a continuous integration ;; environment and thus have no networking. (setenv "CI" "true") + (setenv "SKIP_QT_BUILD_TEST" "true") ;; TODO: fix test and remove. #t))) (add-after 'build 'build-extra (lambda* (#:key inputs #:allow-other-keys) From patchwork Fri May 3 16:42:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13884 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C8DA416F93; Fri, 3 May 2019 17:48:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 487F016F91 for ; Fri, 3 May 2019 17:48:57 +0100 (BST) Received: from localhost ([127.0.0.1]:44537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMm-0007s8-U2 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ6-0005X3-Pi for guix-patches@gnu.org; Fri, 03 May 2019 12:45:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ4-0004yR-T6 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ4-0004xz-L6 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ4-0007NI-FZ for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 15/24] gnu: calibre: Disable sqlite test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690186228172 (code B ref 35446); Fri, 03 May 2019 16:45:06 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:22 +0000 Received: from localhost ([127.0.0.1]:49539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIM-0007KF-E4 for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:22 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIH-0007Ix-Ij for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 205F8A0206 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901852; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2QXRnpf0y+t2tVvry/jEqt1D3gyd/UXESeWbOMlmaU=; b=yv03shvuO2WGAlNrnqaJDwhIMfb0bGE6OYSVO8CZJ2gQijAN9kaAldoB3SmWNZ69lPQ2uo CO1TASJq8hVURlOUpDkHnGF09aDdsCwaHgbKWrQOiSykWNHNYpCsiNuvNrkOpH5JisKKrr nn/+MKMocQ1XvDtuDdlzWEguqN7APc3OfO7Pbo/TSvrK7ZY5NUGDB99tHWHM4aQXTtKW0o cb1I1UaHI7xSPOsgKOAJGgMErAZ7djaEs+q0l6mC2j1+UC2Ht+5X+6GeIlyjizjfmTx6Wg 1p+u5fAIzTjFV2568K3d9TIarMMzr1V5ATbctp3BL9vv4Bx7C2Ko9Ja9rYH2Jw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id zQ24NiEzbH2A for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:55 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:23 +1000 Message-Id: <20190503164232.1799-15-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/local.mk: Reference patch gnu/packages/ebook.scm (calibre)[origin]: Enable patch. gnu/packages/patches/calibre-remove-test-sqlite.patch: New file. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 1 + .../patches/calibre-remove-test-sqlite.patch | 29 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 gnu/packages/patches/calibre-remove-test-sqlite.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e31868281..d6f52ae87e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -691,6 +691,7 @@ dist_patch_DATA = \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ + %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b0d14ece68..1c0721798f 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -98,6 +98,7 @@ #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-bs4.patch" ;; TODO: fix test. + "calibre-remove-test-sqlite.patch" ;; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs diff --git a/gnu/packages/patches/calibre-remove-test-sqlite.patch b/gnu/packages/patches/calibre-remove-test-sqlite.patch new file mode 100644 index 0000000000..7bdd90874d --- /dev/null +++ b/gnu/packages/patches/calibre-remove-test-sqlite.patch @@ -0,0 +1,29 @@ +From a92e26359bd07743ab105819ed0b619e27e14017 Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Sat, 27 Apr 2019 03:30:53 +1000 +Subject: [PATCH] Disable test_sqlite. + +--- + src/calibre/test_build.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py +index 07bdffd3e5..740588c95b 100644 +--- a/src/calibre/test_build.py ++++ b/src/calibre/test_build.py +@@ -162,12 +162,6 @@ class BuildTest(unittest.TestCase): + au(x, 'strftime') + self.assertEqual(unicode_type(time.strftime(fmt.replace('%e', '%#d'), t)), x) + +- def test_sqlite(self): +- import sqlite3 +- conn = sqlite3.connect(':memory:') +- from calibre.library.sqlite import load_c_extensions +- self.assertTrue(load_c_extensions(conn, True), 'Failed to load sqlite extension') +- + def test_apsw(self): + import apsw + conn = apsw.Connection(':memory:') +-- +2.21.0 + From patchwork Fri May 3 16:42:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13874 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 706D616F93; Fri, 3 May 2019 17:45:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 088FD16F91 for ; Fri, 3 May 2019 17:45:24 +0100 (BST) Received: from localhost ([127.0.0.1]:44450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJL-0005mz-Hq for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ3-0005TJ-0d for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ1-0004tO-PP for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ1-0004sp-Hd for guix-patches@gnu.org; Fri, 03 May 2019 12:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ1-0007MZ-DD for guix-patches@gnu.org; Fri, 03 May 2019 12:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 16/24] gnu: calibre: Enable tests. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185328095 (code B ref 35446); Fri, 03 May 2019 16:45:03 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:13 +0000 Received: from localhost ([127.0.0.1]:49523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbID-0007J4-8v for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:13 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIA-0007HH-PL for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:11 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 5761A4DC57 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901845; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SSOlYUkAGoTmY6lq0EieKo6x9+AVuYrKnkiY9qy++6I=; b=fNiyNjtphMNT7/s9l4C23IeI7ZSgjjMv18LiDR+Wir+F+CauL+5+juXeWHv4B0qAv9gqwl qKJ2g4Z9t7zKFOQiOFJzyAUq4VmZ0xs2c1qwaU9825i29Mdr5jBjz5XpF6AyiufEAYsPcq EnvQmtGLsgwIKnm7cR1Yv7pCqwtt9OtTNwOqkjOf3mlJC0PDBJV136Gk0vcXHpdeINbZYE lHkIk5xuZ882WYFsOZISos3x+rQYDlhrIwZIygLfrmA8Fq9NRWRSqW/l/NTqBweiQB4T0b v8GMbUBDvM7YC6TKT9iJwW5dpGkk16KkpgxR1GTI+O49pXRIY2wJKeVVleiNsA== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id 6V6uQwMbSTSV for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:57 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:24 +1000 Message-Id: <20190503164232.1799-16-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Enable tests. --- gnu/packages/ebook.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 1c0721798f..d862be4402 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -153,8 +153,6 @@ ("sqlite" ,sqlite))) (arguments `(#:python ,python-2 - #:test-target "check" - #:tests? #f ; FIXME: enable once flake8 is packaged ;; Calibre is using setuptools by itself, but the setup.py is not ;; compatible with the shim wrapper (taken from pip) we are using. #:use-setuptools? #f From patchwork Fri May 3 16:42:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13882 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A256216F93; Fri, 3 May 2019 17:48:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 29C7A16F91 for ; Fri, 3 May 2019 17:48:47 +0100 (BST) Received: from localhost ([127.0.0.1]:44529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMc-0007nB-Q2 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ2-0005Sj-Ag for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ1-0004sD-5T for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbIz-0004qP-RP for guix-patches@gnu.org; Fri, 03 May 2019 12:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbIz-0007M8-O1 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 17/24] gnu: calibre: Remove some comments. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185128060 (code B ref 35446); Fri, 03 May 2019 16:45:01 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:11 +0000 Received: from localhost ([127.0.0.1]:49513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIA-0007IB-Ae for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:11 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI7-0007GE-V9 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:08 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 818D1A1061 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901842; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VSc+oTpd2216FUde8SKdJxoJFk04AF2gYXDOeYBXTGY=; b=ReFlODVH1+moEoIFEKR2HlOgWwugB8BaoAKHKX9d28hYhQ4iH/fsXZzp+IVU2bqkiJnEcG FVFbJG7x//W8bgp0jU8sZfpLv9lU5vsQJ0PJIS5ACzSufdMRXAFhb34w2uNcqihSLeWmtZ HjW/CQLWwRh6C42s/+BxnpvDAxxfE2reBcCCFBjBjNcONA6h/749wOX7iipfO2JqI4ixn5 uDBfXUvRyG0P5wggYv+8KYzm1AKjWmExurZ4+Gh+6V8xS8iYFce8BvBKmgbrNW+Ay7ytUo C274P/pUgiMqWvL6OlNjpAh+5YQC9sZmN/6GMxJSAerNBO9x9TfzL176lQ9ZNQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id WPUVUYe5pK_G for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:58 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:25 +1000 Message-Id: <20190503164232.1799-17-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): There is no unrar in Guix currently, and pdftohtml is in poppler, so we can remove this comment. --- gnu/packages/ebook.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index d862be4402..a4f9c8b495 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -147,9 +147,6 @@ ("python2-pyqt" ,python2-pyqt) ("python2-sip" ,python2-sip) ("python2-regex" ,python2-regex) - ;; python2-unrardll is needed for decompressing RAR files. - ;; A program called 'pdf2html' is needed for reading PDF books - ;; in the web interface. ("sqlite" ,sqlite))) (arguments `(#:python ,python-2 From patchwork Fri May 3 16:42:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13873 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C155216F93; Fri, 3 May 2019 17:45:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6172A16F91 for ; Fri, 3 May 2019 17:45:22 +0100 (BST) Received: from localhost ([127.0.0.1]:44444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJJ-0005lU-Uw for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ5-0005Vk-J2 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ3-0004x6-Vj for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ3-0004wL-LU for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ3-0007N4-FL for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 18/24] gnu: calibre: Unbundle python2-odfpy. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185528136 (code B ref 35446); Fri, 03 May 2019 16:45:05 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:15 +0000 Received: from localhost ([127.0.0.1]:49533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIF-0007Jg-HG for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:15 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIE-0007Hh-1D for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:14 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 95549A0182 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:08 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901848; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5HEw9orN2o+n295oeowkE49W42gA4RBLbZCOsBx1wo8=; b=vfAae5vUS1IeaZgJqbu+o1iojz1IAIt4OYieYRDO0nUQ2AUbFGIQO61p3yIRD2dyo1rFr5 66D4WXGNXD4iuNNzMNTGM7Gj37mv4yFjUOnLDVfeTBBV2Yp8oZoPzUKZ7B/UPJFwmsNnZv EVQY/X5wta0cnRSfayTB/WlAJou+lBiuG6v9ndTuMhjvE+sR4pdYcSiwMYhXefKl/DJdee 5Qa0fF3tP6W0xFxpuzGfmbj057Bwlsy4iAga94rHhYfdC91/GzawPUjqmM3pWWwiG8dMhe cgy1POHpg75j0p1FJXwb+EF/gxte89tJ0LnlUXzDytiRrUlpOlggEVfb1UQrjQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id WFlcYO4pecNR for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:00 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:26 +1000 Message-Id: <20190503164232.1799-18-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): [snippets]: Remove all of src/odf instead of just the thumbnail with the uncertain license (that was probably free anyway). [inputs]: Add python2-odfpy. --- gnu/packages/ebook.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index a4f9c8b495..6d94b41069 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -89,13 +89,13 @@ (sha256 (base32 "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) - ;; Remove non-free or doubtful code, see + ;; Unbundle python2-pdf. ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) (snippet '(begin - (delete-file "src/odf/thumbnail.py") - #t)) + (delete-file-recursively "src/odf") + #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-bs4.patch" ;; TODO: fix test. "calibre-remove-test-sqlite.patch" ;; TODO: fix test. @@ -141,6 +141,7 @@ ;; python2-msgpack is needed for the network content server to work. ("python2-msgpack" ,python2-msgpack) ("python2-netifaces" ,python2-netifaces) + ("python2-odfpy" ,python2-odfpy) ("python2-pillow" ,python2-pillow) ("python2-psutil" ,python2-psutil) ("python2-pygments" ,python2-pygments) From patchwork Fri May 3 16:42:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13883 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7752A16F93; Fri, 3 May 2019 17:48:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3D05516F91 for ; Fri, 3 May 2019 17:48:52 +0100 (BST) Received: from localhost ([127.0.0.1]:44533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMh-0007pd-S9 for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:48:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ3-0005U4-TS for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ2-0004ue-Ma for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ2-0004uP-Gy for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ2-0007Mp-E2 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 19/24] gnu: calibre: Remove libxrender as an input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185428109 (code B ref 35446); Fri, 03 May 2019 16:45:04 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:14 +0000 Received: from localhost ([127.0.0.1]:49527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbID-0007JD-Se for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:14 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIC-0007Gp-3g for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id D8B79A0151 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901851; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ejtYnwI1+cD7K+n42zFv3cVvtvaSf60Tr3kZ6sE8El4=; b=DvmbH3mFK9aWH1alFIAO+XRVavt7PkEw2SdvekkYbVvBTcBVD1yq3EZbimA4vVl4eYGSwC htrOiLYOacNMqlP1t3IXGNelHGeKwb/+7idnzKfh78uK1N1Pt1kOKmh7Szg/oNabb7VFCC c4rwjYQuM6LiqzD/bUZoGuKXZ4nPitFbf/QYB6OvZyAVDbODnpE9C4DhXK1uiV3avYIIZN VKGPmxytqQDFMvLmvamIPvP4ZmRvJvL8mdLOiA5TFu2k3J2biksONtfueI0cWGJWMi6Cxt IjH6dc2iK+Bz1CoJLCM52ATw8kwz13Kuhy5CS4+fpk9183Ke/BygL2IToLpcTg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 9HvHn0dLPuYp for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:02 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:27 +1000 Message-Id: <20190503164232.1799-19-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): [inputs]: Remove libxrender. I may be wrong but it doesn't appear libxrender is need as a direct input. --- gnu/packages/ebook.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 6d94b41069..5ed550a157 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -117,7 +117,6 @@ ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) - ("libxrender" ,libxrender) ("openssl" ,openssl) ("optipng" ,optipng) ("podofo" ,podofo) From patchwork Fri May 3 16:42:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13875 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C55D16F93; Fri, 3 May 2019 17:45:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9798016F91 for ; Fri, 3 May 2019 17:45:32 +0100 (BST) Received: from localhost ([127.0.0.1]:44465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJU-000602-4D for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ4-0005V3-Rr for guix-patches@gnu.org; Fri, 03 May 2019 12:45:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ3-0004vu-A1 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36010) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ3-0004v1-1g for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ2-0007Mw-Sx for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 20/24] gnu: calibre: Delete various junk from source. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185528130 (code B ref 35446); Fri, 03 May 2019 16:45:04 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:15 +0000 Received: from localhost ([127.0.0.1]:49531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIF-0007Jc-6T for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:15 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbID-0007Gp-V5 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:14 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id B453AA10C0 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:13 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901853; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DkoP/yid4CExOq4VjS6ec0T1FtycCM37ygKIkbXyWvo=; b=kJaCPTPMfM4gKBEFZCgKivDCz2seKmyLJCXl67KcH3DNnaOwO3cWws/RHiKZUuDPY9qwWH K4pf44BeT5oBJe4zT7Q7AWZo//Ep0VqhABnK46/IPO27jphqsY4Bb1wHcTJR340WZM1Q73 u2vo+iLamA/PuqXdZvjtXvzbeY/TbjDRocDGdwSLDNvRW/Oo+GO6JN0FRxokPFf3dSXWAf RleReq38rmj3rECteTUNSDgvtRqYn8nNyuTWu6RenDKCQDRYzwgqdIU2Cn0GQIVf4NDE5G wJWLN6oylYfzy+S1IrlYwRQ6XzTdOdjJgm/UBq1LnCIxoXvOl0Y1BW0a2wr2gQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id NauCcO3OP2iA for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:03 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:28 +1000 Message-Id: <20190503164232.1799-20-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Delete various junk from source. --- 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 5ed550a157..94d3b9a43a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -89,12 +89,17 @@ (sha256 (base32 "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) - ;; Unbundle python2-pdf. + ;; Unbundle python2-pdf. ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "src/odf") + (delete-file "resources/viewer.js") + (delete-file "resources/viewer.html") + (delete-file "resources/mozilla-ca-certs.pem") + (delete-file "resources/calibre-portable.bat") + (delete-file "resources/calibre-portable.sh") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-bs4.patch" ;; TODO: fix test. From patchwork Fri May 3 16:42:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13869 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8B2E16F96; Fri, 3 May 2019 17:45:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0512D16F91 for ; Fri, 3 May 2019 17:45:10 +0100 (BST) Received: from localhost ([127.0.0.1]:44436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ7-0005Wz-Ey for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ3-0005Te-G8 for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ2-0004u3-6N for guix-patches@gnu.org; Fri, 03 May 2019 12:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ2-0004tv-1E for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ1-0007Mg-TM for guix-patches@gnu.org; Fri, 03 May 2019 12:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 21/24] gnu: calibre: Install man pages. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185328102 (code B ref 35446); Fri, 03 May 2019 16:45:03 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:13 +0000 Received: from localhost ([127.0.0.1]:49525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbID-0007J6-HY for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:13 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:62298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIB-0007Gp-4o for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:11 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id E0F3DA014F for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901850; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F6mdr73kXzlyrQaxaRGJuWpZLX23/J6O/e8qbTtCrlA=; b=q47Eyqq0ZUe/wmgB8mJhUSjjkfvmjmJeQBgVeBj5aiNMk5EePFPbA8iktg5vMaact7FR3H QywbJ8+jUU2bgJnBixdONpGXcg/V09KxmSvqnwo8GLwktoxO+aGylELovmK8SePgt7xA8e PS5KPRIyrKCJh4Mar7AaHHgvsAWYOW+jCa+o6Ql41GYVjNXFz/zKJBjC42xpHSiCULVfGT fJDwWuKiN/8tSTLwbKNuHscPi9uF1VWafpyPiMa7i8LpHB749nJe3u1Cyj/FoemYcosIgQ xh3QMzy0pLjDKtzTV9XboOOhyQ5HwNUI1JEF9zk/2ZnI0ZzgG+fjxI2tuHZYUg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id JnL467uFUju5 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:05 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:29 +1000 Message-Id: <20190503164232.1799-21-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Install man pages. --- gnu/packages/ebook.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 94d3b9a43a..4bdba38c2a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -203,6 +203,12 @@ (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")) (invoke "python2" "setup.py" "rapydscript"))) + (add-after 'install 'install-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "man-pages" + (string-append (assoc-ref outputs "out") "/share/man")) + #t)) ;; The font TTF files are used in some miscellaneous tests, so we ;; unbundle them here to avoid patching the tests. (add-after 'install 'unbundle-font-liberation From patchwork Fri May 3 16:42:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13877 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B6AB316F93; Fri, 3 May 2019 17:45:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5FEF616F91 for ; Fri, 3 May 2019 17:45:41 +0100 (BST) Received: from localhost ([127.0.0.1]:44474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJc-00068c-VR for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ6-0005Wy-Oy for guix-patches@gnu.org; Fri, 03 May 2019 12:45:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ5-0004z2-Eu for guix-patches@gnu.org; Fri, 03 May 2019 12:45:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36014) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ5-0004ym-8U for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ5-0007NR-1H for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 22/24] gnu: calibre: Shorten long line. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690187128199 (code B ref 35446); Fri, 03 May 2019 16:45:06 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:31 +0000 Received: from localhost ([127.0.0.1]:49542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIU-0007Kl-Ru for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:31 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIT-0007KU-N1 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:30 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 474E94DEC1 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901864; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S+Wg/BABPlKpVUc4dLP2cXLt9c1GXCh53aCQ9/B0M9E=; b=Y4f2qoozY+JSJ/sXNqKoeicMXOgLxAHeWCQYIO7PYS8mrm3D7wIToc89YnD46A68hMLORG 4Ih3qEv9ogmknNLSvF/G2wKsa/ctgddAM5Gf4OvWfuTGFNcAP4z8BtooDnBoGeZUvU5bS9 Afb7m7HaFqg+OujFWu7cXXf+ItF6UNpQXNbdBdbE+b4zRoo6ulQ3JRzue62JrEdX2k/hH0 gldn4vTNrekKoF4/Ov7jFx/vAJ5coEiBp8wrYJp+/mxXFR4kRAi6BdmN7vkoB2RjdBTLcw 8py08DeL1oSysiKZA8/y/0ffyvUaUcBCH+yZM4GNkHtmNVtORpm/a8PiOKdUng== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id 9CKtOZJA1t1J for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:07 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:30 +1000 Message-Id: <20190503164232.1799-22-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Shorten long line in 'build-extra. --- gnu/packages/ebook.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 4bdba38c2a..572f69d0dc 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -200,8 +200,10 @@ #t))) (add-after 'build 'build-extra (lambda* (#:key inputs #:allow-other-keys) - (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" - (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")) + (invoke "python2" "setup.py" "mathjax""--system-mathjax" + "--path-to-mathjax" (string-append + (assoc-ref inputs "js-mathjax") + "/share/javascript/mathjax")) (invoke "python2" "setup.py" "rapydscript"))) (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys) From patchwork Fri May 3 16:42:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13885 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2640216F93; Fri, 3 May 2019 17:49:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B3AD016F91 for ; Fri, 3 May 2019 17:49:03 +0100 (BST) Received: from localhost ([127.0.0.1]:44539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbMt-0007uU-CD for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:49:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ7-0005Xq-Du for guix-patches@gnu.org; Fri, 03 May 2019 12:45:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ6-0004zf-1l for guix-patches@gnu.org; Fri, 03 May 2019 12:45:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36015) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ5-0004zJ-Qi for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ5-0007Na-Jg for guix-patches@gnu.org; Fri, 03 May 2019 12:45:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 23/24] gnu: calibre: Update to 3.42.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690187728218 (code B ref 35446); Fri, 03 May 2019 16:45:07 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:37 +0000 Received: from localhost ([127.0.0.1]:49545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIb-0007L3-6c for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:37 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIZ-0007Ke-7q for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:35 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id C85EC4DED3 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id HLZEKmrWcLia for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:08 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:31 +1000 Message-Id: <20190503164232.1799-23-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/ebook.scm (calibre): Update to 3.42.0. Fix a typo. --- gnu/packages/ebook.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 572f69d0dc..76c8a57d9c 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -79,7 +79,7 @@ (define-public calibre (package (name "calibre") - (version "3.41.3") + (version "3.42.0") (source (origin (method url-fetch) @@ -88,8 +88,8 @@ version ".tar.xz")) (sha256 (base32 - "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) - ;; Unbundle python2-pdf. + "0ymdhws3cb44p3fb24vln1wx6s7qnb8rr241jvm6qbj5rnp984dm")) + ;; Unbundle python2-odfpy. ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) (snippet From patchwork Fri May 3 16:42:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13878 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3954E16F96; Fri, 3 May 2019 17:45:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 73B1716F91 for ; Fri, 3 May 2019 17:45:44 +0100 (BST) Received: from localhost ([127.0.0.1]:44476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJg-00069y-2S for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ8-0005Zr-PB for guix-patches@gnu.org; Fri, 03 May 2019 12:45:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ6-000506-Fy for guix-patches@gnu.org; Fri, 03 May 2019 12:45:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ6-0004zu-8o for guix-patches@gnu.org; Fri, 03 May 2019 12:45:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ6-0007Nj-4T for guix-patches@gnu.org; Fri, 03 May 2019 12:45:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 24/24] Correct email and license info for Brendan Tildesley. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690189828254 (code B ref 35446); Fri, 03 May 2019 16:45:08 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:58 +0000 Received: from localhost ([127.0.0.1]:49548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIk-0007LP-I9 for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:58 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIf-0007L1-F6 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:44 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 0A8C04BC72 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:36 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901863; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cRRfaaTD2LlonXHsBd4tqZXYnGH/xgmpapd47lt85x4=; b=FWltt/ypV7xnKJAH2ExRLFNz3+nYHZaH6exHl/Ne70fBTsTNovj9QnwAQWYMjzkD8wMtQL nMltRqcoR+CleaUuAWBe2s4G69/e+2c1Z5MLu5zSh/SSSJtUOzPiVVBgJrWmRnt6Dl45UH nNQNgesQFtXAWBYwoT/9hsDwVHJgRdVRX0zddAvmYP7iqEGEGpexJWlkbG/nzASAqdBdLV BJdBKDl9H6Em6DM4mvQAMP/CEHfy1iDTlJCGRCMqWTc6GuMNveLbGW9VjSNghoNJwQfnrq D+sZ1FNpK8nsAuPoSm+1AnQGWSU7LcddBP5Jg/YQDtbBkE7rcnHkOdowkAglzg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id rW_0YDNxoTA0 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:10 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:32 +1000 Message-Id: <20190503164232.1799-24-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/audio.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/lxde.scm | 2 +- gnu/packages/python-web.scm | 1 + gnu/packages/python-xyz.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/web.scm | 1 + 12 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2ec873dab5..c897e30458 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Eric Bavier -;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2019 Rutger Helling diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 76c8a57d9c..841355ef5b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2019 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6405ce42bb..dc73c49018 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2017 Mohammed Sadiq ;;; Copyright © 2018 Charlie Ritter diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index fa8bb3cad1..4c47e0c3cb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e3b7a406a..692a215e0d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 nee ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Mohammed Sadiq -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0dfa2f173a..4ecb6bd490 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 8c0ac3a5f4..cc5e090f58 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 ison ;;; Copyright © 2018, 2019 Ludovic Courtès diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 839d444f7c..757f1058ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian +;;; Copyright © 2019 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42e8a60b3a..b0d2b105ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2019 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones ;;; Copyright © 2018 Vijayalakshmi Vedantham diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 57ced499cb..11f3aacf00 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones ;;; Copyright © 2018 Vijayalakshmi Vedantham diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 86c5870f8f..9d9804fa91 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018, 2019 Leo Famulari -;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018 Mark Meyer diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7242ede3be..52cc91a168 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;;