From unknown Sat Aug 16 13:41:58 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#35446 <35446@debbugs.gnu.org> To: bug#35446 <35446@debbugs.gnu.org> Subject: Status: [PATCH 0/26] Calibre: Update to 3.41.3 Reply-To: bug#35446 <35446@debbugs.gnu.org> Date: Sat, 16 Aug 2025 20:41:58 +0000 retitle 35446 [PATCH 0/26] Calibre: Update to 3.41.3 reassign 35446 guix-patches submitter 35446 Brendan Tildesley severity 35446 normal tag 35446 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:28:24 2019 Received: (at submit) by debbugs.gnu.org; 27 Apr 2019 09:28:24 +0000 Received: from localhost ([127.0.0.1]:34321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJdA-0000lT-1G for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:28:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKGxC-0005AA-CF for submit@debbugs.gnu.org; Sat, 27 Apr 2019 02:36:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:58361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKGx7-0003Lk-8G for submit@debbugs.gnu.org; Sat, 27 Apr 2019 02:36:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKGx6-0006we-9W for guix-patches@gnu.org; Sat, 27 Apr 2019 02:36:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKGx5-0003LL-DI for guix-patches@gnu.org; Sat, 27 Apr 2019 02:36:48 -0400 Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2]:24768 helo=mx2.mailbox.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKGx5-0003Jr-35 for guix-patches@gnu.org; Sat, 27 Apr 2019 02:36:47 -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 62294A012B for ; Sat, 27 Apr 2019 08:36: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=1556346999; 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: references; bh=B+f4Qi7j257jOWAVY1wG8sTNzwGV7H8lm+33OWtdF1A=; b=XKFAXtnqLnWhoJLVG8fAwLDm2uPDCs5tw1g+ZoHXaD+SmPWnyYjwbx+Q0AZifUsKh3juy3 Q9zlWzmOmAmCynJZ2GYBRTRedwZ3mVfUCi6zs4jDS/VxRv0VfH6MjOi/MapQhCdzxbRjXu cP7VfALbR9az9H/5EWR7S6BnIjBumA30kXXSkiVJTZtjTZVsJCK8svT3EEo8P6t229KrnU S8roGP8U6EsseSqkqA5Tf2gL5l4bZwRG+imz10v0XFp3WX6vgJFH00cSI4vgrieQfue8M7 HcYNA3YxbxUy6DO/O+claJgpyKvTInBtodpi250Pggglf7Q5WUs/CYPd0i0w4w== 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 ccllohvnF-LJ for ; Sat, 27 Apr 2019 08:36:38 +0200 (CEST) To: guix-patches@gnu.org From: Brendan Tildesley Subject: [PATCH 0/26] Calibre: Update to 3.41.3 Message-ID: Date: Sat, 27 Apr 2019 16:36:35 +1000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-AU Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:67c:2050:104:0:2:25:2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 27 Apr 2019 05:28:22 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) This patch series brings Calibre up to date, installs desktop files and enables most tests. There are still 3 tests that fail. Qt test, loading sqlite, and loading soupsieve. I'm not sure if there are any actual bugs behind these test failures. I'd greatly appreciate if someone with python experience could get to the bottom of them. Soupsieve isn't actually used yet but it looks=C2=A0 like it may become a part of=C2=A0 beautifulsoup4 and used by Calibre in the=C2=A0 future. Calibre may begin= the slow transition to python3, or use some monstrous hybrid of both. From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:37 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:37 +0000 Received: from localhost ([127.0.0.1]:34354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJm5-00011S-4u for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:37 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:11892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJm2-000117-RB for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37: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 mx2.mailbox.org (Postfix) with ESMTPS id 7C5E5A0199 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:28 +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=1556357848; 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=0Go9iyZAjQYlljGZHqdouzfJgFBM0R0UuZof4aQ2JC0=; b=GwOOVZ2aNiFbPgup2z0WhzyEfQbVq+KO8K0ecXVOHxNMNs5I9uRTtCTe4UgrADJOX6lBJ1 SL+0+8DtiOy0INP2CnUksEcbVudIzon/iqXYM6SEGKVsvs1g/A9Wk+3omFz0GLDQ53r9sj GrvU9vK26M7fy5oHX3P/2czIOoNwuRwHytsUhju2UaqOzKVT/bTEIg14H/pVJ8gQRzk9Zl 6wit3WSWveivaQSrQdlJu/q9Fo6sH4h1Mr/RkFiz+1K1XGvDDLkPzXu7E8SNaO++XJZdbe op2AyRIUri826hrSnMobtOU3Nr1GiVUfjmHMbrL3lpVsg9ueJB6d3RARkFPycQ== 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 v7kFYSxWuSQI for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:21 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 02/26] gnu: Add python-css-parser, python2-css-parser. Date: Sat, 27 Apr 2019 19:36:35 +1000 Message-Id: <20190427093659.21851-2-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/python-web.scm (python-css-parser, python2-css-parser): 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 b7d03acb4b..91c5e3892a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -637,6 +637,28 @@ options.") (define-public python2-cssutils (package-with-python2 python-cssutils)) +(define-public python-css-parser + (package + (inherit python-cssutils) + (name "python-css-parser") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "css-parser" version ".tar.gz")) + (sha256 + (base32 + "0i4xfykiffxzr4f6y0m2ggqvx1rzam6pw6krlr5k6ldf29akbay7")))) + (home-page "https://github.com/ebook-utils/css-parser") + (synopsis "Fork of cssutils modified for parsing ebooks") + (description + "Css-parser is a fork of cssutils 1.0.2, updated and modified for parsing +ebooks, due to cssutils not receiving updates as of 1.0.2.") + (license license:lgpl3+))) + +(define-public python2-css-parser + (package-with-python2 python-css-parser)) + (define-public python-cssselect (package (name "python-cssselect") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:39 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:39 +0000 Received: from localhost ([127.0.0.1]:34357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJm7-00011l-GC for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:39 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:12048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJm5-00011B-6L for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:37 -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 B0A98A01F1 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:31 +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=1556357851; 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=oA68MduoWukUnhY9Du5YaA49y/R8Rd92ISLr/2qv+hk=; b=s5p7XPmWMAsssBqWdpVxNO1FkbYzKQe6jE3NqjbZfnIAu1YTzKDC36o+h/MNvsBlJC0GSo 359xYTTgDWqf0w0FETbePGmSsvL11bHgKt4JDW4m1HCA9jwcB62BpGwNHghc7ZMz1QqjuD hhu7aYamLXFG12x+E9rppI9tx3zpiOEtZYYMtXfGi5ipx0Y7k1nORx8go/TSqlafA0sNms fGsb/dHoZlOiCXT8p1an2PmL2RtVV9uajvgYPOBbD+YIU1EkXkkttU3MPQ0zbadMnr8Vyl yecNb9LMvEMRxwyUfMUI29Ds/ZgEoKMRPHS08ajxu6bpnvufMf2ASSyPfY4+sA== 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 OD8RIIIK2Alb for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:22 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 03/26] gnu: calibre: Update to 3.41.3. Date: Sat, 27 Apr 2019 19:36:36 +1000 Message-Id: <20190427093659.21851-3-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build until my followup patches. --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 99e49bc172..be30388b82 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,7 +87,7 @@ 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))) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:43 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:43 +0000 Received: from localhost ([127.0.0.1]:34360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmA-000122-Qo for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:43 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:36992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJm9-00011G-4X for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:41 -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 1AEC94D605 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:35 +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=1556357855; 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=Df3PXvqMC1JBe/EpXK9dg8PenYd6wtdgLdOds2CH8gk=; b=JTaqy3yPJBX5JwKD9+UUud/p0V+eQMrTRpsLme5KriijnEbmfDtIMGKlF0yUF7OTyD/Rap zSRbvv917ifeShEJUOxkxswm/IbZuQYmk1/ofq19a7+Cp7RR9P2pPsPmnD2gQdcSitFPG8 wZrM1aSl27zKTpsd/nF5xAYYF2XBRuC8v9ovFBHA6b29UDWIKzBxjskdhyycPg+7pimd/t LzF0LVdSuw+lThCga9cJzlLkVv0JTZV7gUwOEG9pcG+tUtj0fzuiHwG7ZlqfxihLEwi46S Fl4Fkd0QDae+6a4W/T4f6PKXb2Eq3OhweKWCgwY7AS2OQo7g7rCK6eaOEE9hqw== 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 0Y4zJBrmq05e for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:24 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 04/26] gnu: calibre: Remove feedparser patch. Date: Sat, 27 Apr 2019 19:36:37 +1000 Message-Id: <20190427093659.21851-4-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ebook.scm [origin]: Remove calibre-use-packaged-feedparser.patch. Calibre deleted its bundled feedparser. * gnu/packages/patches/calibre-use-packaged-feedparser.patch: Delete file. * gnu/local.mk: Remove reference to deleted feedparser patch.. --- gnu/local.mk | 1 - gnu/packages/ebook.scm | 3 +- .../calibre-use-packaged-feedparser.patch | 51 ------------------- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 gnu/packages/patches/calibre-use-packaged-feedparser.patch diff --git a/gnu/local.mk b/gnu/local.mk index b6b6259438..3248619175 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -688,7 +688,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 be30388b82..c194ed881b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -99,8 +99,7 @@ (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) 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:47 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:47 +0000 Received: from localhost ([127.0.0.1]:34367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmF-00012a-DC for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:47 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmB-00011f-5E for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:43 -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 B84004CA79 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:37 +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=1556357857; 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=c6pWpPjGbfs32fD5PzCcd7E5VTHedILTIIEQIBYzzVk=; b=rjVgKM2g6PSxWKoxoFbSf2NoYg+RA/H6kIUFhFL3VlC3/n3Bt6k7vF+tkEs9pA3xr9bYvl VBpK2UboIqsVfcIzlY+o2vmqY7uvPQnh+PUHcLc+mFAcLy/HNlkK54QBFMpFDgHpo5uSdN ZitIugEbQQqMNEDUx9+ScOrs8elRlSE9Z6RYIzDT3/Oz/yQr0IhEH9OhDwyk/fBPcK7ZN+ AF3858n3QDs27+sCGdybkaZbqTNmHrzo2H8ruHMvbdDus8s1dSd2paXT8PPlW9L2dSr5lq hsjdmc/ns/T/HBQBnUiQbbwSEU4sFSSeMrtS4gVt32P15H7k9/txsWk/clrDtw== 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 waA1WSrS3Tfy for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:29 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 07/26] gnu: calibre: Remove markdown unbundling code. Date: Sat, 27 Apr 2019 19:36:40 +1000 Message-Id: <20190427093659.21851-7-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ebooks.scm (calibre)[snippet]: Markdown is nolonger bundled, --- gnu/packages/ebook.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 3c7baa6e9c..45a456a63b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -93,11 +93,8 @@ (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-no-updates-dialog.patch")))) (build-system python-build-system) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:49 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:49 +0000 Received: from localhost ([127.0.0.1]:34369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmG-00012k-Nc for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:48 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmC-00011h-5V for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:44 -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 BB60B4CC41 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:38 +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=1556357858; 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=TS112YmrqUKnaTnn9Ldi2rOzeToNRCmVbMESXyfL3AY=; b=BwPcBtmUCkPeWD9iipKxhLohlzsdf86CLJDUCQ7va70Ibevdd3qrhUep0LW/mq786Wgl1B MDazoND5fEdmgbeglDtni5m4It6I0y6IMgsQLmE9jBLAI1KqWRMqfQKZiEKq6gxwoDUr2Q uNYumCsJQOysBx1+9FBzoBUdlgALKmDH1h4ThTfU0I73Hy7VBQh6k87pk67Yrvs7uENGti wPgsyKN5vZ9cInuqZaWA2UldaaaIijI2aLA/QzlXOK9udBRvB7wAOHTF1b8zeI+CREGrxB LGEIAHkDbkhXcM/o9Nv/NhG2L+V49+l1SWyd1tYzAmk39l6JpuEpPEYRx1qp+w== 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 NuAUhk63Eq4S for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:31 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 08/26] gnu: calibre: Use system mathjax. Date: Sat, 27 Apr 2019 19:36:41 +1000 Message-Id: <20190427093659.21851-8-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 45a456a63b..e5bc023f33 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-mathjax + (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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:49 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:49 +0000 Received: from localhost ([127.0.0.1]:34371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmH-00012n-0i for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:49 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmD-00011u-Mq for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:46 -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 48FE74C839 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:40 +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=1556357860; 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=UwGD+WVScbJaDc4KMNc9lCbBE6gJFx47vefyWDPI1e0=; b=woT0ErMDCIXChGyuTl8ueLhckHjVuzuwle2nKIfkvzZP462bNJsLShQLTK4HG5NZ+HtqQK 6rRYzfTZLHH4OMf1iCI/Zp3ISAQug7ZRkMRXJApFDSToODZL2cy7ThpH8drgbudxhEhd0Q /usupqdoGBQHuLsDkhctLeJoUxwg79cIN0ElgYkj0Jkwd/BouW5ytdlzsomNkl9k/foKq+ M146o3G1CJOpl8cJ+4F+brfD1gRXqHx2aq+eeoGa10ZZufBCPngaz6bX3cokcUz2dho/2b uPzBM7f55cPrkFiZAbYtkO/aa6QT1O42RX1oulHohe9trr7ZNFxX7O8HWrMUQQ== 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 a26tjIPj0I1m for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:36 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 11/26] gnu: calibre: Add missing dependencies as indicated by tests. Date: Sat, 27 Apr 2019 19:36:44 +1000 Message-Id: <20190427093659.21851-11-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 d944e39f33..9f6a2bf52e 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:37:49 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:49 +0000 Received: from localhost ([127.0.0.1]:34373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmH-00012z-9k for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:49 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmD-00011r-2K for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:46 -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 A0E9D4C3AF for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:39 +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=1556357859; 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=SX/ZMzPCKcXruK9VfvQyQIQnZMeF2nbxoH558LO9+7M=; b=DdpiB6PVawTWk/8zAn57FgjfQRcEPYxXw8RlipkVWThdUB/4GCmelv17E890y8yjfSjLGG GI9Qj1izsBwK2hJlahi8E9D+q5OZ/KYxyhDf/apncpi2QTm6LMaVxWA6/9vt4dGUmRDdav /Ivhj/LY0tyqg7exnnLGkDZWlWox0aldOV1XtRRsy39x0PNAWlCBFFnh9nskW5QVJLZIwu VsFaNIPAG/bxGFr1H3iVCdJAg/qLDj4LvzrUoUB3l8TmAcJmdIwDTJAFpSeQmVsaC62h2j RBXgwUsBym2ADDsM/chUirWh2ueaxQPuiDFu8+MANn82RNenkFmlej1xz8s8rg== 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 wrHY8RmBvWCV for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:32 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 09/26] gnu: calibre: Build rapydscript. Date: Sat, 27 Apr 2019 19:36:42 +1000 Message-Id: <20190427093659.21851-9-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 e5bc023f33..e7f58ec7c0 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -186,7 +186,8 @@ (add-after 'build 'build-mathjax (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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:04 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:04 +0000 Received: from localhost ([127.0.0.1]:34378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmN-00013c-K9 for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:04 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:12428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmA-00011T-Ju for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37: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 mx2.mailbox.org (Postfix) with ESMTPS id 308BAA0158 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:37 +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=1556357857; 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=c+xY+oGDG4S8hye9HSGtn4YHIY3C2LOHaLXWUAkVJsw=; b=qo1FyzLHABKmCAjX50AXNIEAFQM85HmBt87QM0AE4n4tB8FBTCfL8jsdYN3GCIHzHK6JNF m9l8866wlJHlZzjNXoXN2LfV6MTkORSWhHdgHP4pY1/DSr5iXXIZiy5NE6qnP8H4yav35f EF7ga7+w8gosgU5yoFcT73Nxlc6K3WPf3C181AwMDayhCCOCSoABRko/7Auw5fbl8GkhAa NRK2KgvqVkCPY5TTzVKe6j2yVwilknq07sH4942oSiOuRzxcE73H90HcWQrO7g/tzT8mTo l+Z0ls06VuodJjSIA2Ke5jxcwwDGTshpO82SP9oZWkw9KEr+JHixe3jJqc1Kpw== 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 N5v6CQ9E9NZa for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:18 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 01/26] gnu: Use 'license:' prefix in (gnu packages web). Date: Sat, 27 Apr 2019 19:36:34 +1000 Message-Id: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/web.scm: Change all uses of l: to license:. --- gnu/packages/web.scm | 378 +++++++++++++++++++++---------------------- 1 file changed, 189 insertions(+), 189 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7d8e51b5af..7242ede3be 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -49,7 +49,7 @@ (define-module (gnu packages web) #:use-module (ice-9 match) - #:use-module ((guix licenses) #:prefix l:) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -158,7 +158,7 @@ freely-available source code implementation of an HTTP (Web) server. The project is jointly managed by a group of volunteers located around the world, using the Internet and the Web to communicate, plan, and develop the server and its related documentation.") - (license l:asl2.0) + (license license:asl2.0) (home-page "https://httpd.apache.org/"))) (define-public mod-wsgi @@ -189,7 +189,7 @@ and its related documentation.") "The mod_wsgi module for the Apache HTTPD Server adds support for running applications that support the Python @acronym{WSGI, Web Server Gateway Interface} specification.") - (license l:asl2.0) + (license license:asl2.0) (home-page "https://modwsgi.readthedocs.io/"))) (define-public nginx @@ -285,7 +285,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") ;; * The 'nginx-http-push' module is covered by the expat license. ;; * The 'nginx-development-kit' module is mostly covered by bsd-3, ;; except for two source files which are bsd-4 licensed. - (license (list l:bsd-2 l:expat l:bsd-3 l:bsd-4)))) + (license (list license:bsd-2 license:expat license:bsd-3 license:bsd-4)))) (define nginx-xslscript (let ((revision 11) @@ -327,7 +327,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") "XSLScript is a terse notation for writing complex XSLT stylesheets. This is modified version, specifically intended for use with the NGinx documentation.") - (license l:bsd-2)))) + (license license:bsd-2)))) (define-public nginx-documentation ;; This documentation should be relevant for nginx@1.15.9. @@ -380,7 +380,7 @@ documentation.") (synopsis "Documentation for the nginx web server") (description "This package provides HTML documentation for the nginx web server.") - (license l:bsd-2)))) + (license license:bsd-2)))) (define-public fcgi (package @@ -408,7 +408,7 @@ that provides high performance without the limitations of server specific APIs.") ;; This package is released under the Open Market License, a variant of ;; the Expat license, incompatible with the GPL. - (license (l:non-copyleft "file://LICENSE.TERMS")))) + (license (license:non-copyleft "file://LICENSE.TERMS")))) (define-public fcgiwrap (package @@ -438,7 +438,7 @@ APIs.") (description "Fcgiwrap is a simple server for running CGI applications over FastCGI. It hopes to provide clean CGI support to Nginx (and other web servers that may need it).") - (license l:expat))) + (license license:expat))) (define-public starman (package @@ -470,7 +470,7 @@ servers that may need it).") (description "Starman is a PSGI perl web server that has unique features such as high performance, preforking, signal support, superdaemon awareness, and UNIX socket support.") - (license l:perl-license))) + (license license:perl-license))) (define-public icedtea-web (package @@ -506,7 +506,7 @@ Protocol}, also known as Java Web Start. This package provides tools and libraries for working with JNLP applets.") ;; The program is mainly GPL2+, with some individual files under LGPL2.1+ ;; or dual licenses. - (license l:gpl2+))) + (license license:gpl2+))) (define-public jansson (package @@ -528,7 +528,7 @@ libraries for working with JNLP applets.") (description "Jansson is a C library for encoding, decoding and manipulating JSON data.") - (license l:expat))) + (license license:expat))) (define-public json-c (package @@ -559,7 +559,7 @@ data.") easily construct JSON objects in C, output them as JSON-formatted strings and parse JSON-formatted strings back into the C representation of JSON objects. It aims to conform to RFC 7159.") - (license l:x11))) + (license license:x11))) ;; TODO: remove this old version when all dependents have been updated. (define-public json-c-0.12 @@ -616,7 +616,7 @@ project) @item Never recurses or allocates more memory than it needs @item Very simple API with operator sugar for C++ @end itemize") - (license l:bsd-2))) + (license license:bsd-2))) (define-public qjson (package @@ -656,7 +656,7 @@ project) @code{QVariant} objects. JSON arrays will be mapped to @code{QVariantList} instances, while JSON's objects will be mapped to @code{QVariantMap}.") ;; Only version 2.1 of the license - (license l:lgpl2.1))) + (license license:lgpl2.1))) (define-public krona-tools (package @@ -743,7 +743,7 @@ hierarchical data, such as metagenomic classifications, using a radial, space-filling display. It is implemented using HTML5 and JavaScript, allowing charts to be explored locally or served over the Internet, requiring only a current version of any major web browser.") - (license l:bsd-3))) + (license license:bsd-3))) (define-public rapidjson (package @@ -783,7 +783,7 @@ current version of any major web browser.") (description "RapidJSON is a fast JSON parser/generator for C++ with both SAX/DOM style API.") - (license l:expat))) + (license license:expat))) (define-public libyajl (package @@ -812,7 +812,7 @@ style API.") (description "Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON parser written in ANSI C and a small validating JSON generator.") - (license l:isc))) + (license license:isc))) (define-public libwebsockets (package @@ -848,7 +848,7 @@ for efficient socket-like bidirectional reliable communication channels.") (home-page "http://libwebsockets.org/") ;; This is LGPLv2.1-only with extra exceptions specified in 'LICENSE'. - (license l:lgpl2.1))) + (license license:lgpl2.1))) (define-public libpsl (package @@ -886,7 +886,7 @@ domain verification, finds the longest public part of a given domain, finds the shortest private part of a given domain, works with international domains (UTF-8 and IDNA2008 Punycode), is thread-safe, and handles IDNA2008 UTS#46.") - (license l:x11))) + (license license:x11))) (define-public tidy (package @@ -922,7 +922,7 @@ UTS#46.") (description "HTML Tidy is a command-line tool and C library that can be used to validate and fix HTML data.") (home-page "http://tidy.sourceforge.net/") - (license (l:x11-style "file:///include/tidy.h")))) + (license (license:x11-style "file:///include/tidy.h")))) (define-public tinyproxy (package @@ -957,7 +957,7 @@ daemon. Designed from the ground up to be fast and yet small, it is an ideal solution for use cases such as embedded deployments where a full featured HTTP proxy is required, but the system resources for a larger proxy are unavailable.") - (license l:gpl2+))) + (license license:gpl2+))) (define-public polipo (package @@ -990,7 +990,7 @@ unavailable.") "Polipo is a small caching web proxy (web cache, HTTP proxy, and proxy server). It was primarily designed to be used by one person or a small group of people.") - (license l:expat))) + (license license:expat))) (define-public websockify (package @@ -1020,7 +1020,7 @@ of people.") traffic. Websockify accepts the WebSockets handshake, parses it, and then begins forwarding traffic between the client and the target in both directions.") - (license l:lgpl3))) + (license license:lgpl3))) (define-public wwwoffle (package @@ -1048,7 +1048,7 @@ intermittent internet links. It can cache HTTP, HTTPS, FTP, and finger protocols, and supports browsing and requesting pages while offline, indexing, modifying pages and incoming and outgoing headers, monitoring pages for changes, and much more.") - (license l:gpl2+))) + (license license:gpl2+))) (define-public liboauth (package @@ -1076,7 +1076,7 @@ specifications and offers high-level functionality built on top to sign requests or verify signatures using either NSS or OpenSSL for calculating the hash/signatures.") ;; Source code may be distributed under either license. - (license (list l:expat l:gpl2+)))) + (license (list license:expat license:gpl2+)))) (define-public libyaml (package @@ -1096,7 +1096,7 @@ hash/signatures.") (synopsis "YAML 1.1 parser and emitter written in C") (description "LibYAML is a YAML 1.1 parser and emitter written in C.") - (license l:expat))) + (license license:expat))) (define-public libquvi-scripts (package @@ -1115,7 +1115,7 @@ hash/signatures.") (synopsis "Media stream URL parser") (description "This package contains support scripts called by libquvi to parse media stream properties.") - (license l:lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libquvi (package @@ -1149,7 +1149,7 @@ parse media stream properties.") (synopsis "Media stream URL parser") (description "libquvi is a library with a C API for parsing media stream URLs and extracting their actual media files.") - (license l:lgpl2.1+))) + (license license:lgpl2.1+))) (define-public quvi (package @@ -1172,7 +1172,7 @@ URLs and extracting their actual media files.") (synopsis "Media stream URL parser") (description "quvi is a command-line-tool suite to extract media files from streaming URLs. It is a command-line wrapper for the libquvi library.") - (license l:lgpl2.1+))) + (license license:lgpl2.1+))) (define-public serf (package @@ -1250,7 +1250,7 @@ communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation.") ;; Most of the code is covered by the Apache License, Version 2.0, but the ;; bundled CuTest framework uses a different non-copyleft license. - (license (list l:asl2.0 (l:non-copyleft "file://test/CuTest-README.txt"))))) + (license (list license:asl2.0 (license:non-copyleft "file://test/CuTest-README.txt"))))) (define-public libsass (package @@ -1284,7 +1284,7 @@ minimum to provide high performance operation.") library designed for portability and efficiency. To actually compile SASS stylesheets, you'll need to use another program that uses this library, @var{sassc} for example.") - (license l:expat))) + (license license:expat))) (define-public sassc (package @@ -1333,7 +1333,7 @@ stylesheets, you'll need to use another program that uses this library, (description "SassC is a compiler written in C for the CSS pre-processor language known as SASS.") (home-page "http://sass-lang.com/libsass") - (license l:expat))) + (license license:expat))) (define-public perl-apache-logformat-compiler @@ -1361,7 +1361,7 @@ language known as SASS.") (synopsis "Compile a log format string to perl-code") (description "This module provides methods to compile a log format string to perl-code, for faster generation of access_log lines.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-authen-sasl (package @@ -1389,7 +1389,7 @@ to perl-code, for faster generation of access_log lines.") (home-page "https://metacpan.org/release/Authen-SASL") (synopsis "SASL authentication framework") (description "Authen::SASL provides an SASL authentication framework.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-action-renderview (package @@ -1416,7 +1416,7 @@ to perl-code, for faster generation of access_log lines.") (synopsis "Sensible default Catalyst action") (description "This Catalyst action implements a sensible default end action, which will forward to the first available view.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-action-rest (package @@ -1452,7 +1452,7 @@ REST requests. It takes a normal Catalyst action, and changes the dispatch to append an underscore and method name. First it will try dispatching to an action with the generated name, and failing that it will try to dispatch to a regular method.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-authentication-store-dbix-class (package @@ -1488,7 +1488,7 @@ regular method.") (description "The Catalyst::Authentication::Store::DBIx::Class class provides access to authentication information stored in a database via DBIx::Class.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-component-instancepercontext (package @@ -1514,7 +1514,7 @@ DBIx::Class.") (synopsis "Create only one instance of Moose component per context") (description "Catalyst::Component::InstancePerContext returns a new instance of a component on each request.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-devel (package @@ -1556,7 +1556,7 @@ to run them. Catalyst-Devel includes the Catalyst::Helper system, which autogenerates scripts and tests; Module::Install::Catalyst, a Module::Install extension for Catalyst; and requirements for a variety of development-related modules.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-dispatchtype-regex (package @@ -1586,7 +1586,7 @@ core. It is recommend that you use Chained methods or other techniques instead. As part of the refactoring, the dispatch priority of Regex vs Regexp vs LocalRegex vs LocalRegexp may have changed. Priority is now influenced by when the dispatch type is first seen in your application.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-model-dbic-schema (package @@ -1632,7 +1632,7 @@ when the dispatch type is first seen in your application.") (synopsis "DBIx::Class::Schema Model Class") (description "This is a Catalyst Model for DBIx::Class::Schema-based Models.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-accesslog (package @@ -1657,7 +1657,7 @@ Models.") (description "This Catalyst plugin enables you to create \"access logs\" from within a Catalyst application instead of requiring a webserver to do it for you. It will work even with Catalyst debug logging turned off.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-authentication (package @@ -1693,7 +1693,7 @@ for you. It will work even with Catalyst debug logging turned off.") Catalyst apps. It is the basis for both authentication (checking the user is who they claim to be), and authorization (allowing the user to do what the system authorises them to do).") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-authorization-roles (package @@ -1723,7 +1723,7 @@ system authorises them to do).") (synopsis "Role-based authorization for Catalyst") (description "Catalyst::Plugin::Authorization::Roles provides role-based authorization for Catalyst based on Catalyst::Plugin::Authentication.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-captcha (package @@ -1747,7 +1747,7 @@ authorization for Catalyst based on Catalyst::Plugin::Authentication.") (synopsis "Captchas for Catalyst") (description "This plugin creates and validates Captcha images for Catalyst.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-configloader (package @@ -1776,7 +1776,7 @@ Catalyst.") (description "This module will attempt to load find and load configuration files of various types. Currently it supports YAML, JSON, XML, INI and Perl formats.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-session (package @@ -1807,7 +1807,7 @@ formats.") (synopsis "Catalyst generic session plugin") (description "This plugin links the two pieces required for session management in web applications together: the state, and the store.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-session-state-cookie (package @@ -1838,7 +1838,7 @@ management in web applications together: the state, and the store.") ID needs to be stored on the client, and the session data needs to be stored on the server. This plugin stores the session ID on the client using the cookie mechanism.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-session-store-fastmmap (package @@ -1868,7 +1868,7 @@ cookie mechanism.") (description "Catalyst::Plugin::Session::Store::FastMmap is a fast session storage plugin for Catalyst that uses an mmap'ed file to act as a shared memory interprocess cache. It is based on Cache::FastMmap.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-stacktrace (package @@ -1895,7 +1895,7 @@ memory interprocess cache. It is based on Cache::FastMmap.") including a stack trace of your application up to the point where the error occurred. Each stack frame is displayed along with the package name, line number, file name, and code context surrounding the line number.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-plugin-static-simple (package @@ -1927,7 +1927,7 @@ looking at the file extension in the URL (such as .css or .png or .js). The plugin uses the lightweight MIME::Types module to map file extensions to IANA-registered MIME types, and will serve your static files with the correct MIME type directly to the browser, without being processed through Catalyst.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-runtime (package @@ -1987,7 +1987,7 @@ MIME type directly to the browser, without being processed through Catalyst.") It is designed to make it easy to manage the various tasks you need to do to run an application on the web, either by doing them itself, or by letting you \"plug in\" existing Perl modules that do what you need.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-traitfor-request-proxybase (package @@ -2019,7 +2019,7 @@ run an application on the web, either by doing them itself, or by letting you flexibility in your application's deployment configurations when deployed behind a proxy. Using this module, the request base ($c->req->base) is replaced with the contents of the X-Request-Base header.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-view-download (package @@ -2046,7 +2046,7 @@ replaced with the contents of the X-Request-Base header.") (description "The purpose of this module is to provide a method for downloading data into many supportable formats. For example, downloading a table based report in a variety of formats (CSV, HTML, etc.).") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-view-json (package @@ -2072,7 +2072,7 @@ table based report in a variety of formats (CSV, HTML, etc.).") (synopsis "Catalyst JSON view") (description "Catalyst::View::JSON is a Catalyst View handler that returns stash data in JSON format.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalyst-view-tt (package @@ -2099,7 +2099,7 @@ stash data in JSON format.") (synopsis "Template View Class") (description "This module is a Catalyst view class for the Template Toolkit.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalystx-component-traits (package @@ -2132,7 +2132,7 @@ Catalyst component base class that reads the optional \"traits\" parameter from app and component config and instantiates the component subclass with those traits using \"new_with_traits\" in MooseX::Traits from MooseX::Traits::Pluggable.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalystx-roleapplicator (package @@ -2155,7 +2155,7 @@ MooseX::Traits::Pluggable.") (synopsis "Apply roles to Catalyst classes") (description "CatalystX::RoleApplicator applies roles to Catalyst application classes.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-catalystx-script-server-starman (package @@ -2183,7 +2183,7 @@ application classes.") (synopsis "Catalyst development server with Starman") (description "This module provides a Catalyst extension to replace the development server with Starman.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-cgi (package @@ -2211,7 +2211,7 @@ processing and preparing HTTP requests and responses. Major features include processing form submissions, file uploads, reading and writing cookies, query string generation and manipulation, and processing and preparing HTTP headers.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-cgi-formbuilder (package @@ -2235,7 +2235,7 @@ headers.") (description "@code{CGI::FormBuilder} provides an easy way to generate and process CGI form-based applications.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-cgi-session (package @@ -2262,7 +2262,7 @@ form-based applications.") (description "@code{CGI::Session} provides modular session management system across HTTP requests.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-cgi-simple (package @@ -2286,7 +2286,7 @@ HTTP requests.") (description "CGI::Simple provides a relatively lightweight drop in replacement for CGI.pm. It shares an identical OO interface to CGI.pm for parameter parsing, file upload, cookie handling and header generation.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-cgi-struct (package @@ -2307,7 +2307,7 @@ parameter parsing, file upload, cookie handling and header generation.") (synopsis "Build structures from CGI data") (description "This is a module for building structured data from CGI inputs, in a manner reminiscent of how PHP does.") - (license l:bsd-2))) + (license license:bsd-2))) (define-public perl-datetime-format-http (package @@ -2331,7 +2331,7 @@ inputs, in a manner reminiscent of how PHP does.") (synopsis "Date conversion routines") (description "This module provides functions that deal with the date formats used by the HTTP protocol.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-digest-md5-file (package @@ -2352,7 +2352,7 @@ formats used by the HTTP protocol.") (synopsis "MD5 sums for files and urls") (description "Digest::MD5::File is a Perl extension for getting MD5 sums for files and urls.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-encode-locale (package @@ -2367,7 +2367,7 @@ for files and urls.") (base32 "1h8fvcdg3n20c2yp7107yhdkkx78534s9hnvn7ps8hpmf4ks0vqp")))) (build-system perl-build-system) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl locale encoding determination") (description "The POSIX locale system is used to specify both the language @@ -2409,7 +2409,7 @@ with Encode::decode(locale => $string).") (description "@code{Feed::Find} implements feed auto-discovery for finding syndication feeds, given a URI. It will discover the following feed formats: RSS 0.91, RSS 1.0, RSS 2.0, Atom.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-file-listing (package @@ -2426,7 +2426,7 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom.") (build-system perl-build-system) (propagated-inputs `(("perl-http-date" ,perl-http-date))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl directory listing parser") (description "The File::Listing module exports a single function called parse_dir(), @@ -2464,7 +2464,7 @@ which can be used to parse directory listings.") (description "Finance::Quote gets stock quotes from various internet sources, including Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange.") - (license l:gpl2))) + (license license:gpl2))) (define-public perl-gssapi (package @@ -2487,7 +2487,7 @@ Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange.") (synopsis "Perl extension providing access to the GSSAPIv2 library") (description "This is a Perl extension for using GSSAPI C bindings as described in RFC 2744.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-html-element-extended (package @@ -2509,7 +2509,7 @@ described in RFC 2744.") (description "HTML::Element::Extended is a Perl extension for manipulating a table composed of HTML::Element style components.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-html-form (package @@ -2534,7 +2534,7 @@ composed of HTML::Element style components.") (synopsis "Perl class representing an HTML form element") (description "Objects of the HTML::Form class represents a single HTML
...
instance.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-html-scrubber (package @@ -2566,7 +2566,7 @@ composed of HTML::Element style components.") "Perl extension for scrubbing/sanitizing html") (description "@code{HTML::Scrubber} Perl extension for scrubbing/sanitizing HTML.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-html-lint (package @@ -2588,7 +2588,7 @@ composed of HTML::Element style components.") (synopsis "Check for HTML errors in a string or file") (description "HTML::Lint is a pure-Perl HTML parser and checker for syntactic legitmacy.") - (license l:artistic2.0))) + (license license:artistic2.0))) (define-public perl-html-tableextract (package @@ -2611,7 +2611,7 @@ syntactic legitmacy.") (description "HTML::TableExtract is a Perl module for extracting the content contained in tables within an HTML document, either as text or encoded element trees.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-html-tree (package @@ -2637,7 +2637,7 @@ in tables within an HTML document, either as text or encoded element trees.") (synopsis "Work with HTML in a DOM-like tree structure") (description "This distribution contains a suite of modules for representing, creating, and extracting information from HTML syntax trees.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-html-parser (package @@ -2655,7 +2655,7 @@ representing, creating, and extracting information from HTML syntax trees.") (inputs `(("perl-html-tagset" ,perl-html-tagset) ("perl-http-message" ,perl-http-message))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl HTML parser class") (description "Objects of the HTML::Parser class will recognize markup and separate @@ -2677,7 +2677,7 @@ are invoked.") (base32 "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd")))) (build-system perl-build-system) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl data tables useful in parsing HTML") (description "The HTML::Tagset module contains several data tables useful in various @@ -2708,7 +2708,7 @@ It extends standard HTML with a few new HTML-esque tags: @code{}, these new tags is called a template. Using this module you fill in the values for the variables, loops and branches declared in the template. This allows you to separate design from the data.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-body (package @@ -2733,7 +2733,7 @@ you to separate design from the data.") (description "HTTP::Body parses chunks of HTTP POST data and supports application/octet-stream, application/json, application/x-www-form-urlencoded, and multipart/form-data.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-cookiejar (package @@ -2760,7 +2760,7 @@ and multipart/form-data.") (synopsis "Minimalist HTTP user agent cookie jar") (description "This module implements a minimalist HTTP user agent cookie jar in conformance with RFC 6265 .") - (license l:asl2.0))) + (license license:asl2.0))) (define-public perl-http-cookies (package @@ -2777,7 +2777,7 @@ jar in conformance with RFC 6265 .") (build-system perl-build-system) (propagated-inputs `(("perl-http-message" ,perl-http-message))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl HTTP cookie jars") (description "The HTTP::Cookies class is for objects that represent a cookie jar, @@ -2801,7 +2801,7 @@ object knows about.") (propagated-inputs `(("perl-http-message" ,perl-http-message) ("perl-lwp-mediatypes" ,perl-lwp-mediatypes))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl simple http server class") (description "Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen @@ -2822,7 +2822,7 @@ IO::Socket::INET, so you can perform socket operations directly on it too.") (base32 "0cz357kafhhzw7w59iyi0wvhw7rlh5g1lh38230ckw7rl0fr9fg8")))) (build-system perl-build-system) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl date conversion routines") (description "The HTTP::Date module provides functions that deal with date formats @@ -2850,7 +2850,7 @@ used by the HTTP protocol (and then some more).") ("perl-io-html" ,perl-io-html) ("perl-lwp-mediatypes" ,perl-lwp-mediatypes) ("perl-uri" ,perl-uri))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl HTTP style message") (description "An HTTP::Message object contains some headers and a content body.") @@ -2871,7 +2871,7 @@ used by the HTTP protocol (and then some more).") (build-system perl-build-system) (propagated-inputs `(("perl-http-message" ,perl-http-message))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl http content negotiation") (description "The HTTP::Negotiate module provides a complete implementation of the @@ -2904,7 +2904,7 @@ fields in the request.") received and returns a @code{hint} as to what is required, or returns the HTTP::Request when a complete request has been read. HTTP/1.1 chunking is supported.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-parser-xs (package @@ -2925,7 +2925,7 @@ supported.") (synopsis "Fast HTTP request parser") (description "HTTP::Parser::XS is a fast, primitive HTTP request/response parser.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-request-ascgi (package @@ -2947,7 +2947,7 @@ parser.") (synopsis "Set up a CGI environment from an HTTP::Request") (description "This module provides a convenient way to set up a CGI environment from an HTTP::Request.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-server-simple (package @@ -2982,7 +2982,7 @@ environment from an HTTP::Request.") (description "HTTP::Server::Simple is a simple standalone HTTP daemon with no non-core module dependencies. It can be used for building a standalone http-based UI to your existing tools.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-tiny (package @@ -3008,7 +3008,7 @@ http-based UI to your existing tools.") (description "This is a very simple HTTP/1.1 client, designed for doing simple requests without the overhead of a large framework like LWP::UserAgent. It supports proxies and redirection. It also correctly resumes after EINTR.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-http-tinyish (package @@ -3035,7 +3035,7 @@ It supports proxies and redirection. It also correctly resumes after EINTR.") @code{HTTP::Tiny}, curl and wget. It provides an API compatible to HTTP::Tiny.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-io-html (package @@ -3050,7 +3050,7 @@ It provides an API compatible to HTTP::Tiny.") (base32 "06nj3a0xgp5jxwxx6ayglfk2v7npf5a7gwkqsjlkapjkybarzqh4")))) (build-system perl-build-system) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl module to open an HTML file with automatic charset detection") (description "IO::HTML provides an easy way to open a file containing HTML while @@ -3076,7 +3076,7 @@ algorithm specified in section 8.2.2.1 of the draft standard.") (synopsis "Family-neutral IP socket supporting both IPv4 and IPv6") (description "This module provides a protocol-independent way to use IPv4 and IPv6 sockets, intended as a replacement for IO::Socket::INET.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-io-socket-ssl (package @@ -3103,7 +3103,7 @@ necessary functionality into the familiar IO::Socket interface and providing secure defaults whenever possible. This way existing applications can be made SSL-aware without much effort, at least if you do blocking I/O and don't use select or poll.") - (license l:perl-license) + (license license:perl-license) (home-page "https://github.com/noxxi/p5-io-socket-ssl"))) (define-public perl-libwww @@ -3136,7 +3136,7 @@ select or poll.") ("perl-try-tiny" ,perl-try-tiny) ("perl-uri" ,perl-uri) ("perl-www-robotrules" ,perl-www-robotrules))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl modules for the WWW") (description "The libwww-perl collection is a set of Perl modules which provides a @@ -3174,7 +3174,7 @@ of the nastiest technical questions there is: am I on the internet? A host of networking and security issues make this problem very difficult. There are firewalls, proxies (both well behaved and badly behaved). We might not have DNS. We might not have a network card at all!") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-lwp-mediatypes (package @@ -3189,7 +3189,7 @@ not have DNS. We might not have a network card at all!") (base32 "0xmnblp962qy02akah30sji8bxrqcyqlff2w95l199ghql60ny8q")))) (build-system perl-build-system) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl module to guess the media type for a file or a URL") (description "The LWP::MediaTypes module provides functions for handling media (also @@ -3224,7 +3224,7 @@ exists it is used instead.") (synopsis "HTTPS support for LWP::UserAgent") (description "The LWP::Protocol::https module provides support for using https schemed URLs with LWP.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-lwp-useragent-determined (package @@ -3247,7 +3247,7 @@ https schemed URLs with LWP.") except that when you use it to get a web page but run into a possibly-temporary error (like a DNS lookup timeout), it'll wait a few seconds and retry a few times.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-net-amazon-s3 (package @@ -3290,7 +3290,7 @@ and retry a few times.") (home-page "https://metacpan.org/release/Net-Amazon-S3") (synopsis "Perl interface to Amazon S3") (description "This module provides a Perlish interface to Amazon S3.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-net-http (package @@ -3308,7 +3308,7 @@ and retry a few times.") (propagated-inputs `(("perl-io-socket-ssl" ,perl-io-socket-ssl) ("perl-uri" ,perl-uri))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl low-level HTTP connection (client)") (description "The Net::HTTP class is a low-level HTTP client. An instance of the @@ -3342,7 +3342,7 @@ children (Net::Server::PreForkSimple), or as a managed preforking server which maintains the number of children based on server load (Net::Server::PreFork). In all but the inetd type, the server provides the ability to connect to one or to multiple server ports.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-net-smtp-ssl (package @@ -3362,7 +3362,7 @@ or to multiple server ports.") (home-page "https://metacpan.org/release/Net-SMTP-SSL") (synopsis "SSL support for Net::SMTP") (description "SSL support for Net::SMTP.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack (package @@ -3400,7 +3400,7 @@ or to multiple server ports.") contains middleware components, a reference server, and utilities for Web application frameworks. Plack is like Ruby's Rack or Python's Paste for WSGI.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack-middleware-deflater (package @@ -3429,7 +3429,7 @@ in gzip or deflate, based on \"Accept-Encoding\" HTTP request header. It would save the bandwidth a little bit but should increase the Plack server load, so ideally you should handle this on the frontend reverse proxy servers.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack-middleware-fixmissingbodyinredirect (package @@ -3454,7 +3454,7 @@ servers.") (synopsis "Plack::Middleware which sets body for redirect response") (description "This module sets the body in redirect response, if it's not already set.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack-middleware-methodoverride (package @@ -3479,7 +3479,7 @@ already set.") something else: by adding either a header named X-HTTP-Method-Override to the request, or a query parameter named x-tunneled-method to the URI, the client can say what method it actually meant.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack-middleware-removeredundantbody (package @@ -3501,7 +3501,7 @@ can say what method it actually meant.") (synopsis "Plack::Middleware which removes body for HTTP response") (description "This module removes the body in an HTTP response if it's not required.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack-middleware-reverseproxy (package @@ -3525,7 +3525,7 @@ required.") (description "Plack::Middleware::ReverseProxy resets some HTTP headers, which are changed by reverse-proxy. You can specify the reverse proxy address and stop fake requests using @code{enable_if} directive in your app.psgi.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-plack-test-externalserver (package @@ -3546,7 +3546,7 @@ and stop fake requests using @code{enable_if} directive in your app.psgi.") (description "This module allows your to run your Plack::Test tests against an external server instead of just against a local application through either mocked HTTP or a locally spawned server.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-test-tcp (package @@ -3566,7 +3566,7 @@ either mocked HTTP or a locally spawned server.") (home-page "https://metacpan.org/release/Test-TCP") (synopsis "Testing TCP programs") (description "Test::TCP is test utilities for TCP/IP programs.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-test-www-mechanize (package @@ -3592,7 +3592,7 @@ either mocked HTTP or a locally spawned server.") (synopsis "Testing-specific WWW::Mechanize subclass") (description "Test::WWW::Mechanize is a subclass of the Perl module WWW::Mechanize that incorporates features for web application testing.") - (license l:artistic2.0))) + (license license:artistic2.0))) (define-public perl-test-www-mechanize-catalyst (package @@ -3627,7 +3627,7 @@ WWW::Mechanize that incorporates features for web application testing.") (description "The Test::WWW::Mechanize::Catalyst module meshes the Test::WWW:Mechanize module and the Catalyst web application framework to allow testing of Catalyst applications without needing to start up a web server.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-test-www-mechanize-psgi (package @@ -3654,7 +3654,7 @@ from web application framework code. Test::WWW::Mechanize is a subclass of WWW::Mechanize that incorporates features for web application testing. The Test::WWW::Mechanize::PSGI module meshes the two to allow easy testing of PSGI applications.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-uri (package @@ -3671,7 +3671,7 @@ applications.") (native-inputs ;; For tests. `(("perl-test-needs" ,perl-test-needs))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl Uniform Resource Identifiers (absolute and relative)") (description "The URI module implements the URI class. Objects of this class @@ -3702,7 +3702,7 @@ and updated by RFC 2732.") (description "@code{URI::Fetch} is a smart client for fetching HTTP pages, notably syndication feeds (RSS, Atom, and others), in an intelligent, bandwidth- and time-saving way.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-uri-find (package @@ -3727,7 +3727,7 @@ and time-saving way.") considers a URI) in plain text. It only finds URIs which include a scheme (http:// or the like), for something a bit less strict, consider URI::Find::Schemeless. For a command-line interface, urifind is provided.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-uri-ws (package @@ -3748,7 +3748,7 @@ URI::Find::Schemeless. For a command-line interface, urifind is provided.") (synopsis "WebSocket support for URI package") (description "With this module, the URI package provides the same set of methods for WebSocket URIs as it does for HTTP URIs.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-uri-template (package @@ -3773,7 +3773,7 @@ methods for WebSocket URIs as it does for HTTP URIs.") (synopsis "Object for handling URI templates") (description "This perl module provides a wrapper around URI templates as described in RFC 6570.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-www-curl (package @@ -3807,7 +3807,7 @@ RFC 6570.") (description "This is a Perl extension interface for the libcurl file downloading library.") - (license l:perl-license) + (license license:perl-license) (home-page "https://metacpan.org/release/WWW-Curl"))) (define-public perl-www-mechanize @@ -3841,7 +3841,7 @@ library.") (synopsis "Web browsing in a Perl object") (description "WWW::Mechanize is a Perl module for stateful programmatic web browsing, used for automating interaction with websites.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-www-opensearch (package @@ -3879,7 +3879,7 @@ web browsing, used for automating interaction with websites.") (description "@code{WWW::OpenSearch} is a module to search @url{A9's OpenSearch, http://opensearch.a9.com} compatible search engines.") - (license l:perl-license))) + (license license:perl-license))) (define-public perl-www-robotrules (package @@ -3896,7 +3896,7 @@ http://opensearch.a9.com} compatible search engines.") (build-system perl-build-system) (propagated-inputs `(("perl-uri" ,perl-uri))) - (license l:perl-license) + (license license:perl-license) (synopsis "Perl database of robots.txt-derived permissions") (description "The WWW::RobotRules module parses /robots.txt files as specified in @@ -3926,8 +3926,8 @@ their web site.") (description "Universal feed parser which handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds.") - (license (list l:bsd-2 ; source code - l:freebsd-doc)))) ; documentation + (license (list license:bsd-2 ; source code + license:freebsd-doc)))) ; documentation (define-public python2-feedparser (package-with-python2 python-feedparser)) @@ -3957,7 +3957,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (description "Gumbo is an implementation of the HTML5 parsing algorithm implemented as a pure C99 library.") - (license l:asl2.0))) + (license license:asl2.0))) (define-public uwsgi (package @@ -4031,7 +4031,7 @@ embedded_plugins = "uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. It uses the uwsgi protocol for all the networking/interprocess communications.") - (license l:gpl2+))) ; with linking exception + (license license:gpl2+))) ; with linking exception (define-public jq (package @@ -4061,7 +4061,7 @@ grep and friends let you play with text. It is written in portable C. jq can mangle the data format that you have into the one that you want with very little effort, and the program to do so is often shorter and simpler than you'd expect.") - (license (list l:expat l:cc-by3.0)))) + (license (list license:expat license:cc-by3.0)))) (define-public uhttpmock (package @@ -4090,7 +4090,7 @@ you'd expect.") "Uhttpmock is a project for mocking web service APIs which use HTTP or HTTPS. It provides a library, libuhttpmock, which implements recording and playback of HTTP request/response traces.") - (license l:lgpl2.1+))) + (license license:lgpl2.1+))) (define-public woof (package @@ -4126,7 +4126,7 @@ playback of HTTP request/response traces.") (description "Woof (Web Offer One File) is a small simple web server that can easily be invoked on a single file. Your partner can access the file with tools they trust (e.g. wget).") - (license l:gpl2+))) + (license license:gpl2+))) (define netsurf-buildsystem (package @@ -4153,7 +4153,7 @@ tools they trust (e.g. wget).") (description "This package provides the shared build system for Netsurf project libraries.") - (license l:expat))) + (license license:expat))) (define netsurf-buildsystem-arguments `(#:make-flags `("COMPONENT_TYPE=lib-shared" @@ -4190,7 +4190,7 @@ libraries.") (description "LibParserUtils is a library for building efficient parsers, written in C. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public hubbub (package @@ -4221,7 +4221,7 @@ C. It is developed as part of the NetSurf project.") "Hubbub is an HTML5 compliant parsing library, written in C, which can parse both valid and invalid web content. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public ikiwiki (package @@ -4304,7 +4304,7 @@ NetSurf project.") "Ikiwiki is a wiki compiler, capable of generating a static set of web pages, but also incorporating dynamic features like a web based editor and commenting.") - (license l:gpl2+))) + (license license:gpl2+))) (define-public libwapcaplet (package @@ -4330,7 +4330,7 @@ commenting.") "LibWapcaplet provides a reference counted string internment system designed to store small strings and allow rapid comparison of them. It is developed as part of the Netsurf project.") - (license l:expat))) + (license license:expat))) (define-public libcss (package @@ -4358,7 +4358,7 @@ developed as part of the Netsurf project.") (description "LibCSS is a CSS (Cascading Style Sheet) parser and selection engine, written in C. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public libdom (package @@ -4394,7 +4394,7 @@ written in C. It is developed as part of the NetSurf project.") (description "LibDOM is an implementation of the W3C DOM, written in C. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public libsvgtiny (package @@ -4425,7 +4425,7 @@ developed as part of the NetSurf project.") which can be rendered easily, as defined in @url{http://www.w3.org/TR/SVGMobile/}. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public libnsbmp (package @@ -4448,7 +4448,7 @@ project.") (description "Libnsbmp is a decoding library for BMP and ICO image file formats, written in C. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public libnsgif (package @@ -4471,7 +4471,7 @@ written in C. It is developed as part of the NetSurf project.") (description "Libnsgif is a decoding library for the GIF image file format, written in C. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public libnsutils (package @@ -4494,7 +4494,7 @@ C. It is developed as part of the NetSurf project.") (description "Libnsutils provides a small number of useful utility routines. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public libnspsl (package @@ -4517,7 +4517,7 @@ developed as part of the NetSurf project.") (description "Libnspsl is a library to generate a static code representation of the Public Suffix List. It is developed as part of the NetSurf project.") - (license l:expat))) + (license license:expat))) (define-public nsgenbind (package @@ -4545,7 +4545,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (description "@code{nsgenbind} is a tool to generate JavaScript to DOM bindings from w3c webidl files and a binding configuration file.") - (license l:expat))) + (license license:expat))) (define-public netsurf (package @@ -4660,7 +4660,7 @@ w3c webidl files and a binding configuration file.") "NetSurf is a lightweight web browser that has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today.") - (license l:gpl2+))) + (license license:gpl2+))) (define-public surfraw (package @@ -4703,7 +4703,7 @@ handling many of the web standards in use today.") provides a unix command line interface to a variety of popular www search engines and similar services.") (home-page "https://surfraw.alioth.debian.org/") - (license l:public-domain))) + (license license:public-domain))) (define-public darkhttpd (package @@ -4735,7 +4735,7 @@ and similar services.") standalone and does not need inetd or ucspi-tcp. It does not need any config files---you only have to specify the www root.") (home-page "https://unix4lyfe.org/darkhttpd/") - (license l:isc))) + (license license:isc))) (define-public goaccess (package @@ -4768,7 +4768,7 @@ config files---you only have to specify the www root.") runs in a terminal or through your browser. It provides fast and valuable HTTP statistics for system administrators that require a visual server report on the fly.") - (license l:x11))) + (license license:x11))) (define-public httptunnel (package @@ -4806,7 +4806,7 @@ tunnelled through HTTP (HyperText Transfer Protocol) requests. This can be useful for users behind restrictive firewalls. As long as Web traffic is allowed, even through a HTTP-only proxy, httptunnel can be combined with other tools like SSH (Secure Shell) to reach the outside world.") - (license l:gpl2+))) + (license license:gpl2+))) (define-public stunnel (package @@ -4853,7 +4853,7 @@ functionality to existing clients and servers without any changes in the programs' code. Its architecture is optimized for security, portability, and scalability (including load-balancing), making it suitable for large deployments.") - (license l:gpl2+))) + (license license:gpl2+))) (define-public varnish (package @@ -4923,10 +4923,10 @@ deployments.") reverse proxy and load balancer. You install it in front of any server that speaks HTTP and configure it to cache the contents through an extensive configuration language.") - (license (list l:bsd-2 ;main distribution - l:zlib ;lib/libvgz/* - l:public-domain ;bin/varnishncsa/as64.c, include/miniobj.h - l:bsd-3)))) ;include/vqueue.h, lib/libvarnishcompat/daemon.c + (license (list license:bsd-2 ;main distribution + license:zlib ;lib/libvgz/* + license:public-domain ;bin/varnishncsa/as64.c, include/miniobj.h + license:bsd-3)))) ;include/vqueue.h, lib/libvarnishcompat/daemon.c (define-public varnish-modules (package @@ -4952,7 +4952,7 @@ configuration language.") "This package provides a collection of modules (@dfn{vmods}) for the Varnish cache server, extending the @dfn{Varnish Configuration Language} (VCL) with additional capabilities.") - (license l:bsd-2))) + (license license:bsd-2))) (define-public xinetd (package @@ -4982,7 +4982,7 @@ listens for incoming requests over a network and launches the appropriate service for that request. Requests are made using port numbers as identifiers and xinetd usually launches another daemon to handle the request. It can be used to start services with both privileged and non-privileged port numbers.") - (license (l:fsf-free "file://COPYRIGHT")))) + (license (license:fsf-free "file://COPYRIGHT")))) (define-public tidy-html (package @@ -5030,7 +5030,7 @@ legacy code to modern standards. Tidy also provides @code{libtidy}, a C static and dynamic library that developers can integrate into their applications to make use of the functions of Tidy.") - (license l:bsd-3))) + (license license:bsd-3))) (define-public hiawatha (package @@ -5091,7 +5091,7 @@ functions of Tidy.") "Hiawatha has been written with security in mind. Features include the ability to stop SQL injections, XSS and CSRF attacks and exploit attempts.") - (license l:gpl2))) + (license license:gpl2))) (define-public python-httpbin (package @@ -5117,7 +5117,7 @@ exploit attempts.") @code{RequestBin} is fantastic for testing POST requests, but doesn't let you control the response. This exists to cover all kinds of HTTP scenarios. All endpoint responses are JSON-encoded.") - (license l:isc))) + (license license:isc))) (define-public python2-httpbin (package-with-python2 python-httpbin)) @@ -5146,7 +5146,7 @@ JSON-encoded.") "@code{Pytest-httpbin} creates a @code{pytest} fixture that is dependency-injected into your tests. It automatically starts up a HTTP server in a separate thread running @code{httpbin} and provides your test with the URL in the fixture.") - (license l:expat))) + (license license:expat))) (define-public python2-pytest-httpbin (package-with-python2 python-pytest-httpbin)) @@ -5181,7 +5181,7 @@ high-performance HTTP applications. It does not make any syscalls nor allocations, it does not buffer data, it can be interrupted at anytime. Depending on your architecture, it only requires about 40 bytes of data per message stream (in a web server that is per connection).") - (license l:expat))) + (license license:expat))) (define-public python-httpretty (package @@ -5211,7 +5211,7 @@ message stream (in a web server that is per connection).") (synopsis "HTTP client mock for Python") (description "@code{httpretty} is a helper for faking web requests, inspired by Ruby's @code{fakeweb}.") - (license l:expat))) + (license license:expat))) (define-public python2-httpretty (package @@ -5260,7 +5260,7 @@ inspired by Ruby's @code{fakeweb}.") (synopsis "HTTP client mock for Python") (description "@code{httpretty} is a helper for faking web requests, inspired by Ruby's @code{fakeweb}.") - (license l:expat))) + (license license:expat))) (define-public jo (package @@ -5280,8 +5280,8 @@ inspired by Ruby's @code{fakeweb}.") (description "jo is a command-line utility to create JSON objects or arrays. It creates a JSON string on stdout from words provided as command-line arguments or read from stdin.") - (license (list l:gpl2+ - l:expat)))) ; json.c, json.h + (license (list license:gpl2+ + license:expat)))) ; json.c, json.h (define-public python-internetarchive (package @@ -5331,7 +5331,7 @@ command-line arguments or read from stdin.") internetarchive python module for programatic access to archive.org.") (properties `((python2-variant . ,(delay python2-internetarchive)))) - (license l:agpl3+))) + (license license:agpl3+))) (define-public python2-internetarchive (package-with-python2 @@ -5385,7 +5385,7 @@ internetarchive python module for programatic access to archive.org.") (synopsis "Search code snippets on @url{https://commandlinefu.com}") (description "@code{clf} is a command line tool for searching code snippets on @url{https://commandlinefu.com}.") - (license l:expat)))) + (license license:expat)))) (define-public python2-clf (package-with-python2 python-clf)) @@ -5421,8 +5421,8 @@ snippets on @url{https://commandlinefu.com}.") (description "rss-bridge generates Atom feeds for social networking websites lacking feeds. Supported websites include Facebook, Twitter, Instagram and YouTube.") - (license (list l:public-domain - l:expat)))) ;; vendor/simplehtmldom/simple_html_dom.php + (license (list license:public-domain + license:expat)))) ;; vendor/simplehtmldom/simple_html_dom.php (define-public linkchecker (package @@ -5478,11 +5478,11 @@ links in websites. It is recursive and multithreaded providing output in colored or normal text, HTML, SQL, CSV, XML or as a sitemap graph. It supports checking HTTP/1.1, HTTPS, FTP, mailto, news, nntp, telnet and local file links.") - (license (list l:gpl2+ - l:bsd-2 ; linkcheck/better_exchook2.py - l:bsd-3 ; linkcheck/colorama.py - l:psfl ; linkcheck/gzip2.py - l:expat)))) ; linkcheck/mem.py + (license (list license:gpl2+ + license:bsd-2 ; linkcheck/better_exchook2.py + license:bsd-3 ; linkcheck/colorama.py + license:psfl ; linkcheck/gzip2.py + license:expat)))) ; linkcheck/mem.py (define-public cadaver (package @@ -5514,7 +5514,7 @@ file links.") "Cadaver is a command-line WebDAV client for Unix. It supports file upload, download, on-screen display, namespace operations (move/copy), collection creation and deletion, and locking operations.") - (license l:gpl2))) + (license license:gpl2))) (define-public python-py-ubjson (package @@ -5533,7 +5533,7 @@ collection creation and deletion, and locking operations.") (description "Py-ubjson is a Python module providing an Universal Binary JSON encoder/decoder based on the draft-12 specification for UBJSON.") - (license l:asl2.0))) + (license license:asl2.0))) (define-public java-tomcat (package @@ -5598,7 +5598,7 @@ WebSocket") (description "Apache Tomcat is a free implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket technologies.") - (license l:asl2.0))) + (license license:asl2.0))) (define-public java-eclipse-jetty-test-helper (package @@ -5650,7 +5650,7 @@ technologies.") (description "This packages contains helper classes for testing the Jetty Web Server.") ;; This program is licensed under both epl and asl. - (license (list l:epl1.0 l:asl2.0)))) + (license (list license:epl1.0 license:asl2.0)))) (define-public java-eclipse-jetty-perf-helper (package @@ -5713,7 +5713,7 @@ Web Server.") (description "The Jetty Web Server provides an HTTP server and Servlet container capable of serving static and dynamic content either from a standalone or embedded instantiation. This package provides utility classes.") - (license (list l:epl1.0 l:asl2.0)))) + (license (list license:epl1.0 license:asl2.0)))) ;; This version is required by maven-wagon (define-public java-eclipse-jetty-util-9.2 @@ -6205,7 +6205,7 @@ container."))) (description "Jsoup is a Java library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jQuery-like methods.") - (license l:expat))) + (license license:expat))) (define-public tidyp (package @@ -6231,7 +6231,7 @@ libtidyp is the library on which the program is based. It can be used by any other program that can interface to it. The Perl module @code{HTML::Tidy} is based on this library, allowing Perl programmers to easily validate HTML.") ;; See htmldoc/license.html - (license l:bsd-3))) + (license license:bsd-3))) (define-public perl-html-tidy (package @@ -6269,7 +6269,7 @@ based on this library, allowing Perl programmers to easily validate HTML.") (description "@code{HTML::Tidy} is an HTML checker in a handy dandy object. It's meant as a replacement for @code{HTML::Lint}, which is written in Perl but is not nearly as capable as @code{HTML::Tidy}.") - (license l:artistic2.0))) + (license license:artistic2.0))) (define-public geomyidae (package @@ -6305,7 +6305,7 @@ features include: @item search support in CGI files; @item logging with multiple log levels. @end enumerate\n") - (license l:expat))) + (license license:expat))) (define-public cat-avatar-generator (package @@ -6348,8 +6348,8 @@ die('You need to set the CACHE_DIR variable first.');")) to generate random avatars, or defined avatar from a \"seed\". This is a derivation by David Revoy from the original MonsterID by Andreas Gohr.") ;; expat for the code, CC-BY 4.0 for the artwork - (license (list l:expat - l:cc-by4.0)))) + (license (list license:expat + license:cc-by4.0)))) (define-public nghttp2 (package @@ -6434,7 +6434,7 @@ nghttp2 provides a HPACK encoder and decoder as part of its public API. compressed JSON header blocks. @item @command{inflatehd} converts such compressed headers back to JSON pairs. @end itemize\n") - (license l:expat))) + (license license:expat))) (define-public hpcguix-web (let ((commit "53e09ea59ec0380b41a4cbda32df8bdb9a10004d") @@ -6516,7 +6516,7 @@ compressed JSON header blocks. (description "Hpcguix-web provides a web interface to the list of packages provided by Guix. The list of packages is searchable and provides instructions on how to use Guix in a shared HPC environment.") - (license l:agpl3+)))) + (license license:agpl3+)))) (define-public httrack (package @@ -6545,4 +6545,4 @@ site from link to link, as if you were viewing it online. HTTrack can also update an existing mirrored site, and resume interrupted downloads. HTTrack is fully configurable, and has an integrated help system.") - (license l:gpl3+))) + (license license:gpl3+))) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:04 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:05 +0000 Received: from localhost ([127.0.0.1]:34391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmW-000152-Db for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:04 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmK-00012Z-G5 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:52 -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 17EEA4C3AF for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:47 +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=1556357867; 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=IoU30XohoZFvyN6N03lzQ7r7G4hj1cocTZph7OODdmM=; b=jUoYxGfL5KeLyJnpEqM3kGUJWj15cATat5sCfUHXm9GundQf29hgppla/9EvVeMblchUAB GUYwbyaH6yuV0qsdls+MTvLCTcxiBsgHYcrq9s/f87V1V6pR78wx2JqQ8hRKQXPneBl1zE rQuX8hQuQ6gr0va2oytIdoTqKA6rX6QQ8euKhHpYJ+kS7y6T4kx/y9g6PC2hXpbUzznD0p QUgYicjWU1Xfj68B96ziGSVl6zeWW27i25FlmvZ0tbBleDHvmRh7aW8suH4Y5P16RYS++Z eJnoJVe9rSELwRppcNjy3ucILdAtvozSAwSwbzjbynM9xnU9a5qd+WxiFBNRcA== 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 JQnu8agHdFHr for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:43 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 15/26] gnu: calibre: Add python2-html2text as an input. Date: Sat, 27 Apr 2019 19:36:48 +1000 Message-Id: <20190427093659.21851-15-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 e24d2ac2b9..3f854ce9b3 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:05 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:05 +0000 Received: from localhost ([127.0.0.1]:34395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmW-00015E-RY for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:05 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmL-00012h-2X for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37: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 mx1.mailbox.org (Postfix) with ESMTPS id A2B184CC6C for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:47 +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=1556357867; 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=S0sO7jOiatb0EdKcpo3pmq69+IEmkCJFM98prOZOtHI=; b=O+p/eokdDwSL5rK2oVycONZIO/lu2BW0JwICjZglQamx2qcWftnsvol7bbhJMN2OwuXLBh roEDw7JwGNACp20shs2LqQoZX1RPFQLBY+T29E2im5uwvxElvAHqAbrKGcP2OvGJi3Rfw8 Rqv0Bo4Zir9ZTISEr4GphhgzWmK0CUqIrX8v+poYwKQRytwd9KhdkmgoTv4dN64JWEs/pR YRh7mEwmy47mdm881lXSsg/KCulDvNv12ILCo85Ig8pj1+h9Vg7Gg9msDG9ZOpKYAcKmAQ UHnYC00VbgwrjsACEH6Be6EtGZMWMoGP7aDnUw7mP17qg6IkFM+xAVkVB/NPuA== 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 A_h1XFS5ygg2 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:34 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 10/26] gnu: calibre: Enable tests. Date: Sat, 27 Apr 2019 19:36:43 +1000 Message-Id: <20190427093659.21851-10-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 e7f58ec7c0..d944e39f33 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -151,8 +151,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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:06 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:06 +0000 Received: from localhost ([127.0.0.1]:34398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmX-00015Y-Cd for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:06 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmL-00012j-PR for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37: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 mx1.mailbox.org (Postfix) with ESMTPS id 5C4CB40F31 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37: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=1556357868; 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=mTIAFwMNV2V2OT4OKcLMxQlHbuSkQbYUvyv3Fz3ydHI=; b=FgKJdugzp1CgDmdshSrIrSl3BxaNTrE0/B3XaZC7xS0+3GD9BBKwfq99R353QzXLONh95l 15FYxRLJMSB+o8Z8rE4WXBQDydV74aWY53p4mEbMVeWAqWGnhJm0KELPOsauxkFtLS+55q bs66sPc/g4kzEusUr2EdEPNE0R+tNuKkl7R+vChuqw+y+eGp/9ZkU+jI5eeXGYbEO1P3DY CYQsgaQ8dS39WnXCaLTskIp31CIJfaew5uEr9dx15LQNT6ViFVY9SzC+KRPodXsmhMyTd+ gJApD49k/hJwqr3W+3eciXt6ZPzUfFLTabvu4fAQBKb6plJlTMTI7QiPsevFmg== 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 HE86IKm7g2A8 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:39 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 13/26] gnu: calibre: Move font unbundling to after check phase. Date: Sat, 27 Apr 2019 19:36:46 +1000 Message-Id: <20190427093659.21851-13-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 1726f83093..e24d2ac2b9 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) @@ -189,17 +188,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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:11 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:11 +0000 Received: from localhost ([127.0.0.1]:34401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmY-00015n-5z for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:11 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:13232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmN-00013D-V3 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37: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 89735A0170 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:50 +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 Zbc80pconMoL for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:27 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 06/26] gnu: calibre: [inputs]: Replace cssutils with the css-parser fork. Date: Sat, 27 Apr 2019 19:36:39 +1000 Message-Id: <20190427093659.21851-6-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ebook.scm (calibre): Replace python2-cssutils with python2-css-parser. --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 34b6e05f90..3c7baa6e9c 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 ;;; @@ -128,7 +128,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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:11 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:12 +0000 Received: from localhost ([127.0.0.1]:34408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmd-00016r-6C for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:11 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmN-00013C-V5 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:59 -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 899BA4D7FB for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:50 +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=1556357870; 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=5YNtLyJhujSCjcfLNcNJwv+SP0mCht6J0rFxYluAKTo=; b=V6DaQUfLOyjsP+Zq4f6OUtdpHbaHrolOud+ZoWtyj3fMF1iEIuC+0ZvDvvssuc1IMhiSba 5T7H4cXx2GwAprPsftPUMjY0N41XYBf3FznieleXrpJsaoqxyKaJgU9wmSPTumZ4D7ATK7 o7fMAfGfSRHc7fNK0pPLmYMwIqjWz0CgRmIArM6hiE99FvtV5AMpb8zskr+viVLTvAaDzH 9TF9+o0jw1OYSTXYyC73fXgh+PCJi/h/1vI6i/zWi3Vq3jmGKznMkA/dVUIWst04XdbLEX QZVIEoDB48TDZbsiJfOXtPvMeBjAHrEggFyRjQ3JbTjWv9kKyE+ygUGkKBN9/g== 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 6ozBw7bR2pxF for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:46 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 17/26] gnu: calibre: Disable tests that require networking. Date: Sat, 27 Apr 2019 19:36:50 +1000 Message-Id: <20190427093659.21851-17-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 3f854ce9b3..72d07ea370 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -183,6 +183,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-mathjax (lambda* (#:key inputs #:allow-other-keys) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:12 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:12 +0000 Received: from localhost ([127.0.0.1]:34410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmd-00016z-TR for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:12 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:13278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmP-00013H-Oe for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:59 -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 5632CA01B1 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37: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=1556357872; 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=ArBRNUL+SeS6QaL4gEYKbWhQSpS+jyC7YVqahv2eC0Y=; b=GjCwt2qQMQwxbJ6+veWkiWIedAI+TngU/Q1tMwuZCqx9bSTtqhiUUBJ8Zp8lWyOI4ajvYQ WVAgXAlNVFKQMbagYlwC82mkmhjCvY4kyXF8jhr/sju2jzfnC8bmbzT6lfY0R4VncaaN2w RhgD+nm9994mXdTA2by2Y/l82Za446lZq5oqQh8aau4l+HkpMfh7h8yjMC60efq6mVrKZE 2CEMLWtUZd7HfhazGgaJsDu6rOaCUXD8WCLNt76zP8FgTL4wWSTcQivc+DoqePg4JZpxM4 4UY7B0ZsaNWX3sv5pYEZl1NWR82tIdq5HkeE3O4GGU8AGkysNfn1nm249Uv1sw== 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 7t5EIrsa3Lib for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:48 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 18/26] gnu: Add python-soupsieve, python2-soupsieve Date: Sat, 27 Apr 2019 19:36:51 +1000 Message-Id: <20190427093659.21851-18-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 f1ea1e22ad..054ec31846 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5272,6 +5272,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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:12 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:13 +0000 Received: from localhost ([127.0.0.1]:34412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-000176-An for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:12 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmS-00013b-J6 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:01 -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 2BAF24CC41 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37: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=1556357875; 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=eVU1kMB3I18xGAjzt591TsszdmccC4J/M8/b20hiWRM=; b=1gCX+rSlzjvSsusHd3KspMxdaCINokroi2Y367noDCWSlM3vmR/mo7Uvt/r3EpYn8si5Z1 iwcVmwGSRtdKyx/jFeUcLhCs9g7cZs9Ic/7foKBuYyXA7Nn28zROyJK6AMl3qZM2y2QI57 srE2X+/I4J8mRyz0MoNlTDA18Tn/HlPN2tusIIyuDb7rH/UY0mCBfUOYPaTGxIDnzBMdIt TjSC3/B9xUAg7ZMersY+FDtRo5eIhQ+lFpVBp7pGHwuUuyosEw0UzT8ZLul0/FUrA9d6kA mYA9f95IY9oe/Knxjs9Mm72ng7YVc8Qhm4CaAPmmSa4Q8fHvH8y4Cjcsas/ztA== 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 f1NrG5QkrYfE for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:38 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 12/26] gnu: calibre: Patch out unrar test. Date: Sat, 27 Apr 2019 19:36:45 +1000 Message-Id: <20190427093659.21851-12-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 3248619175..677ab0f625 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -688,6 +688,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 9f6a2bf52e..1726f83093 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 + -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:14 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:14 +0000 Received: from localhost ([127.0.0.1]:34417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-00017E-Q5 for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:13 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmU-00013b-Bf for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:02 -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 250BE4CB58 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38: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=1556357882; 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=pW61SqhkaXJqS/Ko7IAkp2AquobtMULFReefoN+9fKI=; b=nyZOBwslMX9JBtYv2z99jDpv5oSjXtY4HrPRdmgHdEYQoxpfVJ8UxNEyhiac0RYGgtJCHw 163Cn8A/WtKeGX2ZHbJo/7pdAyCoHvl9SMmWE22fZSLVjiOHhetId/0U4RMnj1Bjub6afL we3evBSW09BduhuZWonJfzMHddBdeTZlplYwM8/Y+ZsLDpyOvM6EDubWZAbvKpylUW5de3 m2dOi9H4W5Pt4CmmNv59TiRLTMJwPmb/9/2DOvHBjVXIHQtD76v2W20uSm7Lu92Sqk9wYt j6xjXm9V6iw8J9t2fSn2MYOxqNAb5I3Y1/Vslal+PSWI9r+yY8xEvVA8X+LnKQ== 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 qwjl7l7ud7Py for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:51 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 20/26] gnu: calibre: Disable bs4 test. Date: Sat, 27 Apr 2019 19:36:53 +1000 Message-Id: <20190427093659.21851-20-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 677ab0f625..47a45ad7ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -688,6 +688,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 2900b492bf..4a4f34e092 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 + -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:18 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:18 +0000 Received: from localhost ([127.0.0.1]:34421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmk-00017x-3b for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:18 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmW-00013s-LZ for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:05 -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 390AA4D772 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:59 +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=1556357877; 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=8PuHmP6uYv03eB3wZLUM5MnfGp0ROG28/ZNxTk2yAlU=; b=TnbWLXDTEFWbwEMJtMfxN8uJjfOqBBymcgUBm0WdcM1eGWNMTJ7JnE4G6ZHaVjncoe36KJ iGTUfQ7y0xNvRQFpkyrA9pSLO1VWSWJPOIpfyycrP6aFB9mJ1VJFiSsINrsZB/IbgFoLXY m3vTpjBInE1RIQvHdT+mTyJVS3CE5bB9p+I1K2oevS50DPtptW8aTJRpq+xLGOb1QMmhTO HEmpQKOERULJkBSiM/eX/mfG4UsEHO3Q0RrdQHzYffEBtwFATijhz5IoqX8NDDhk6kP/I4 dmWFtYz2QN63MQR81u14swySYNgvG1UtyBdS5W3u5u/hlfh0ohmtt4IAphN7Sg== 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 LftwgSQgs6TS for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:56 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 23/26] gnu: Calibre: Remove some comments. Date: Sat, 27 Apr 2019 19:36:56 +1000 Message-Id: <20190427093659.21851-23-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 e99487c56f..993a425873 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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:18 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:18 +0000 Received: from localhost ([127.0.0.1]:34424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmk-000180-CG for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:18 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:13678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmX-000143-IK for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:06 -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 2443BA01FA for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:00 +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=1556357880; 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=xUl2WRmC1h9wsduZZsgwj6wNoyI9PJ4Bz3Ewr7yGpP4=; b=XBe5bE5sLo8GPU6gXo9cR0BMADzfpX2sKsaAIQ/q/6o2SjHWMv9uB7NcczMmKFDdHrh+3X PMi+3GVvYtjOVya3OnSKAWniNdOiE6sM/zdrFZWeVJ4tChLpi/g3sPuPjgVURRk3ZKX2ZX EkUb4KknLjMYjGb22Mjim07EbGuRQWSWn8XKqgzXi2uowYyA7QISH1wO9JKgIOyXvlzlc0 8Yu917b/LFpyQ8Cel/ohNssGTejmqsjVRW35D35wVhOiH6SOuZ431Z5INR2mCHHY4v1jAG 2RO+Vb4ujW/2FUvUc8v0xI31I0h/aiC9j164f4uLnWRuNfOXuLNOYhLttGOhtQ== 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 D5_OT_wpE05R for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:53 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 21/26] gnu: calibre: Disable Qt test. Date: Sat, 27 Apr 2019 19:36:54 +1000 Message-Id: <20190427093659.21851-21-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 4a4f34e092..036e255158 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -193,6 +193,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-mathjax (lambda* (#:key inputs #:allow-other-keys) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:27 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:27 +0000 Received: from localhost ([127.0.0.1]:34426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmk-00018C-ML for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:27 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:13270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmP-00013F-Ck for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38: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 F383CA0196 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:51 +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=1556357862; 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=3g2581Sq9ihEIycV9J4+ILRGmGIBnPlYqjVwNmFiY8E=; b=Ojidz61TswpS+fAuw2afezUl+zIE5YuAAoAgepWWAM8HW9jJlelrlsWKiSQLpYxs5/M5Ji KSNEnjvQhiPWQWkIqpZZg7pwadzVeGkJcGxawsStAqJ5AUSYc15/TYMf2v/xOtxEgEjEVI tkTbp/zfH6JrQib/VXu8iuy91mCaa2fCHK7RZCqMlQN306X81+gG7Rian9zOmf1Dfi1dOZ Fc1fJV7UwLHyTH/BF9CbX0Io8uaSD1NRDC2ekVGcmAaGImovSBb6qkKu7vFaPdFOFfqIoR C6fK6rc8j5X8SUB/HLdgMNgVHjfAQa1nqLE5jyceKEDwjOgJreSQr6WAgabuVQ== 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 cumRkfZBd4bt for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:26 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 05/26] Update email address for Brendan Tildesley Date: Sat, 27 Apr 2019 19:36:38 +1000 Message-Id: <20190427093659.21851-5-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * Openmailbox went down for months, now I'm trying my own domain, at least until the Scottish decide my middle name doesn't count as being affiliated with Scotland. --- 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-xyz.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/video.scm | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cb0a3df3b5..b5bb187129 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 c194ed881b..34b6e05f90 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 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 569a7f807e..7be2eaa626 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 1c249a4038..08f6e19e15 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 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 101c0ce13f..613c8f1a55 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 b562a23b2f..d1c12fcf59 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 ccd79dada6..86da87558c 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 Ison111 ;;; Copyright © 2018, 2019 Ludovic Courtès diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d661411c4..f1904538b5 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 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 c1240e418d..030f3b90e1 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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:27 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:27 +0000 Received: from localhost ([127.0.0.1]:34428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmt-00018S-Bl for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:27 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:13852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmb-00014w-5z for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:09 -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 BE09BA012F for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:03 +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=1556357877; 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=OPk8kHBPHlAcv4QKJwMwgU95Pro8xaWP5bwNgjvDz/s=; b=ZD7YZwSTycL8nmGlkv2o/7ZBykNNaKadRYRmDRV08p92Zb3kTOvp9ejKT1Ts9V+QkYvhh7 igLWnz7RvzNDa+vmaSInoLhXPGp1+VKJKpd5QKzSd7zcfb3WvIrwX/VKQ5gUm9G7/julW4 SyeOIsKQUeqIWQ6h5KXzXPYq4puiCjg1SjUF85b6YMbVRiMLUfNASAfg4Fu/BE07pqd7IX riFbIvChs6vbHcH+CwScP3SK0YpFtCVydb0h+48yLfH55heVQ4dQlOAHVq2N0ZonF5xaNI 7a7y4lCrOAseHJLQdUcmkfW37GjiyXWwYYjC6aJ1Dy14skokguWAH+Hb8StvSQ== 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 DuvNjDh-1tkk for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:41 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 14/26] gnu: Add python-html2text, python2-html2text. Date: Sat, 27 Apr 2019 19:36:47 +1000 Message-Id: <20190427093659.21851-14-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/python-web.scm (python-html2text, python2-html2text.): New variables. --- gnu/packages/python-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 91c5e3892a..de19ab72e4 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. ;;; @@ -299,6 +300,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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:28 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:28 +0000 Received: from localhost ([127.0.0.1]:34430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmt-00018Z-O7 for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:28 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-000168-AN for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:13 -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 DE05E40F0C for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:06 +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=1556357880; 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=ppyKnbVd8prOY84gDTVKbxnpeX751NDYCzsun/PLsK0=; b=j4N9SaTvg8i8ItnvRUs3qElDYtOlKwNmqnGYAa1pDyIM6kgsCM+mSyCEv7GnXeR/PGtUD6 MJrbtANqBTkzJPthfyM4BzAd7Q5dMV39zg2M7aK8LIbnTbOPu992tDZgczxufdJdVWbZkl EmDYJqn1+2DeJ8kAA8D2AezYenefttB5Xpp0A+NZmrTQNptUBxCECdnc2fCYR1YAOutHJX nA4r5jaCllCmaqTbv0Y1V+1LJ6W/sSj6RnIP+c/CRzZCUlyO5nBcA9IjoZBnjPCMQqrdr+ hp8tco5426u6qxl6FkrCAmajUWt1gsHqtkQiWEzCfmNFIVcvbK44rBZ+QryzPA== 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 BoBkHdFtiYjc for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:49 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 19/26] gnu: calibre: Use linux.py to install desktop files. Date: Sat, 27 Apr 2019 19:36:52 +1000 Message-Id: <20190427093659.21851-19-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 72d07ea370..2900b492bf 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. @@ -172,15 +169,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 (assoc-ref outputs "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 @@ -202,12 +208,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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:32 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:32 +0000 Received: from localhost ([127.0.0.1]:34432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmu-00018g-5j for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:32 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-00016A-F1 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:13 -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 0EB0E4BB12 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:07 +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=1556357883; 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=GaEshxt9gfy6vje0p539GyeZ9V+vgQxX467Y1Gw0ALU=; b=aIGdA09PNCaTPhiwc2S2Dh32j/DKUkhKlwfPlnGU5ftpQTF0J7njmrXj2InH4R33gmy11U F6UW0zULNe/WR/xp9c6ts9T3dKu2y5wju9BPS/R47/Cen2MD6RIYTjjkbqtLAzDF9LuVl6 sFJDJGCdllWrh19JHoc2QgNU7NykNffzV5hg2VUE/G60FMSBUy8vuat9ya3OBFqw2e0PjJ JEGv4loPjCa/HOJ7hVuhxSiTVY4qXa/XXfRvbe9paDIJVx2ghXAwSUsLoACOUzS4HLYYFq sjyHOQvhnyn0mRlknH/310+hXaPEnG/T4ilDEi7im4e+tk6akOeXef7rrBF84Q== 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 AsOHu1655Lln for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:44 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 16/26] gnu: python-regex, python2-regex: Update to 2019.04.14. Date: Sat, 27 Apr 2019 19:36:49 +1000 Message-Id: <20190427093659.21851-16-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/python.scm (python-regex, python2-regex): Update to 2019.04.14. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1904538b5..f1ea1e22ad 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 @@ -12774,13 +12774,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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:32 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:32 +0000 Received: from localhost ([127.0.0.1]:34434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmy-00018r-HI for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:32 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-00016D-JD for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:13 -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 3215C4C6A2 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:07 +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=1556357887; 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=vSnb4/4svad57B512IzM9a96qYqepbq7LWEUXRhKhUs=; b=CuawA2VfKq9BThsK2D7qrxyVvoQjSaZD70tOPwaTlZ0eMFgDHZI5QH+01Jb6VaCDVbtJvF h71S5SeSJXVy49v2G6cujbikudmXm81v8lmaF68wTPCkSz3lyT2EdEuSOZihzilv+KGcGl Ri7SpXwR6066UCILofZrxTsUl+3nWPJMvLmdwxQa5iUrEfetY54dJ+z303kE5yORhheqxP Kgn9tCf7OqHdirFan7NhaJENdJQok21ojWsAmlIGV3zmuhlBI567U5LixivYwu/ESh+iYJ seGT8N1Ro1dpaNLghXBMa/P5Ya5sHmp1Q7ieUHbdEArVEo76I5E32MdQM2s47g== 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 VIpZ-g3WfWAT for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:58 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 24/26] gnu: calibre: Unbundle python2-odfpy Date: Sat, 27 Apr 2019 19:36:57 +1000 Message-Id: <20190427093659.21851-24-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 993a425873..29b8589cb8 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:33 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:33 +0000 Received: from localhost ([127.0.0.1]:34436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmy-00018z-TI for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:33 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:14160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmh-00016o-MR for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:17 -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 4667CA012F for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38: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=1556357890; 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=o47olVs/RsfJXF1PLZK0XF5SFxWDXjSpfjx0JgHAgOA=; b=yz49gmB77PXLGCXOxWxtmZQKrRJt1KN5A/QhqZClIIhopWx2P0DWT52YoAVE7hqhQwTF83 hWJwv14lvFrXoztJj81R/W7GRUwnwpKrypA/mUGUZePxF19OT0jEVW6J0xxxacmU9NYE/U KmknJKacC30UlT68m98MMudbzVMjyi6ivN/5ZsHxpCU1RBsFbKJcgolwJGLvDydD3JpoqF /+L8AcPwDwutzXA3IGK7bUXneFm8v5djET5VeIEXEakn7cntYMpyRajAACi/CXyS8/GVCM cLjrslFonh82f22EjrAdZyidPyz8HEHNTYBdynzAGKGaCl9MvQvvLhUN/ba/yg== 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 cgZThA8anMAq for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:01 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 26/26] gnu: calibre: Delete various junk from source. Date: Sat, 27 Apr 2019 19:36:59 +1000 Message-Id: <20190427093659.21851-26-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 c115f47f57..26e0e91e3e 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. -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:33 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:33 +0000 Received: from localhost ([127.0.0.1]:34438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmz-000196-7E for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:33 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmg-00016g-Ek for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38: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 096B44D722 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:09 +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=1556357888; 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=ALmhyEt9HUjMRgZZ4JJNCWPuKkn51cYR8KW/psD+1Qw=; b=RZ8E8Sr4ZOZ2yiPKHUpJ7Sz76/y9A5GbS5hrHcdwLe7bTz8yNh64RWiC9lZI0c1SIEoGOf VPJfMDfWu7anY+oHw+KmQL985WnqKLzqsL8oDkAVAeaCJdoLeE3jSWASXfJ7D69aPHa1AM GV3web0TaSvTMlUSD48v7kKRGs+pmUqZJN1F6XuEu2FloU38o2iZ2BSmePssPUh85IbDU9 3N1oCz9acNXadnWG80m5Y/griOZ7q50q4i9GCp51EhPCTzCqg/mAt/ZAA7p9rcrR9eAKT2 QfsPdLIfuW6GFuaCrdU6cZ1Q8dqBrlGeiEOwF+wnsuekmPxWo7BV1Xj5/0NnSQ== 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 Id_Ul-sBA101 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:54 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 22/26] gnu: calibre: Disable bs4 test. Date: Sat, 27 Apr 2019 19:36:55 +1000 Message-Id: <20190427093659.21851-22-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 47a45ad7ae..56f0738ffa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -689,6 +689,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 036e255158..e99487c56f 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 + -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 05:38:33 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:33 +0000 Received: from localhost ([127.0.0.1]:34440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmz-00019E-JM for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:33 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:14276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmk-00017L-7E for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:18 -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 C559BA0012 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38: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=1556357892; 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=K8Vu6Gd5b3HtDNyrrVlBidmgCJnWPt8LksJi/0yWKZE=; b=NaD03QfTASrrM4/Fmwc3ZCcyBhO+cyv2KmsJnHnCwid7rRD/MkwNYLB/FoYwiLNhjLV+uP gTE1rbfsFXOG6U4bLLYpiiEDiY+gP1ylN/3O5I0TXAHz0dMIGCJHTPkNowN8Uj3yZyeTkp 2tZctJn9stS5ogHtmBmbdMgvjFOxS9wNtNiC8uU1OyY9gy9h1ztUyzMfEMF07AiUGSQ/W8 WS5I6MbuNppfJNvoSkPaf2XSdmYUiDIQNgEk9MxQnnjVyOFsyrcLXTVjrcT+0Ut+nEMZuf VZ4cMGZsnxLaNv3spYLxceMzCnWXuLqUZqNbf7nY82Oue36ZYxK8axRGeSLnYw== 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 hkG6gAG193jr for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:59 +0200 (CEST) From: Brendan Tildesley To: 35446@debbugs.gnu.org Subject: [PATCH 25/26] gnu: calibre: Remove libxrender as an input. Date: Sat, 27 Apr 2019 19:36:58 +1000 Message-Id: <20190427093659.21851-25-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ebook.scm (calibre): [inpguts]: Remvoe 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 29b8589cb8..c115f47f57 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 27 06:14:44 2019 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 10:14:44 +0000 Received: from localhost ([127.0.0.1]:34529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKKM0-00023h-9m for submit@debbugs.gnu.org; Sat, 27 Apr 2019 06:14:44 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:15452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKKLx-00023S-K3 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 06:14:42 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2: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 87CA7A0D16 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 12:14:34 +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=1556360072; 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:in-reply-to: references; bh=aLuDSV99ot+vaqy4uiu67m9pynol0CCerahiXFpmvRI=; b=dvnPrxlHAf6CT6qRvUyBmTaGL3WnhFX32tlxLkbA4PPxZvxSeDzxpf3SsCwB7CNhAfZwhq E/GEXnzITUu/71QTlnmsTgpTHRPx4ANTSaPqn/KRsFRzF0BCovmErLXD670cp7+qY8Z/9a DFvg9/9aL/6+16KReaZLsf3MCFcrTIQjgRziH7Qz7oVh9fBOnetersmYIduIovGyrQevue u1mOEVrwWTVUbfcrjjbVBP9qBhw8Hw4XBcxIG3z2s+gh9vVEoN9Btpa8k1HeWCvcdqGWP+ aveXY+dxBhxJGvlzSLF4XN+Bi8bzrbTC874QcPdWZ0607YBF3NxiOMoMYkdZHA== Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id lHbpxGsPsZ57 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 12:14:25 +0200 (CEST) To: 35446@debbugs.gnu.org From: Brendan Tildesley Subject: [PATCH 25/26]: gnu: calibre: Delete various junk from source. (fix typos) Message-ID: <388ed8ce-00e1-d41c-a3c9-d2347666259e@brendan.scot> Date: Sat, 27 Apr 2019 20:14:20 +1000 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------22B8E5BAE1DBAC116A26EA74" Content-Language: en-AU X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is a multi-part message in MIME format. --------------22B8E5BAE1DBAC116A26EA74 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------22B8E5BAE1DBAC116A26EA74 Content-Type: text/x-patch; name="0025-gnu-calibre-Remove-libxrender-as-an-input.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0025-gnu-calibre-Remove-libxrender-as-an-input.patch" >From 302d5d4292200ae055f60eb7c8f4ea579c9b58f7 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Apr 2019 15:45:58 +1000 Subject: [PATCH 25/26] gnu: calibre: Remove libxrender as an input. * 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 29b8589cb8..c115f47f57 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) -- 2.21.0 --------------22B8E5BAE1DBAC116A26EA74-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 07:22:27 2019 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 11:22:28 +0000 Received: from localhost ([127.0.0.1]:47859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMWGp-0001Je-O4 for submit@debbugs.gnu.org; Fri, 03 May 2019 07:22:27 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:44612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMWGn-0001JS-QY for 35446@debbugs.gnu.org; Fri, 03 May 2019 07:22:26 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 17E93620E; Fri, 3 May 2019 13:22:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ERJ6Rexx_Fo4; Fri, 3 May 2019 13:22:23 +0200 (CEST) Received: from jurong (unknown [46.183.103.8]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 6F691620D; Fri, 3 May 2019 13:22:16 +0200 (CEST) Date: Fri, 3 May 2019 13:22:05 +0200 From: Andreas Enge To: Brendan Tildesley Subject: Re: [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Message-ID: <20190503112205.GA4345@jurong> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Score: 4.2 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello Brendan, On Sat, Apr 27, 2019 at 04:36:35PM +1000, Brendan Tildesley wrote: > This patch series brings Calibre up to date, installs desktop files and > enables most tests. thanks for these comprehensive patches, although their sheer number is a bit discouraging :) So I will just start reviewing them at the beginning, without guaranteeing that I will keep up until the en [...] Content analysis details: (4.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [46.183.103.8 listed in zen.spamhaus.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [185.233.100.1 listed in list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 35446 Cc: 35446@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.2 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello Brendan, On Sat, Apr 27, 2019 at 04:36:35PM +1000, Brendan Tildesley wrote: > This patch series brings Calibre up to date, installs desktop files and > enables most tests. thanks for these comprehensive patches, although their sheer number is a bit discouraging :) So I will just start reviewing them at the beginning, without guaranteeing that I will keep up until the en [...] Content analysis details: (3.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [46.183.103.8 listed in zen.spamhaus.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [185.233.100.1 listed in list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello Brendan, On Sat, Apr 27, 2019 at 04:36:35PM +1000, Brendan Tildesley wrote: > This patch series brings Calibre up to date, installs desktop files and > enables most tests. thanks for these comprehensive patches, although their sheer number is a bit discouraging :) So I will just start reviewing them at the beginning, without guaranteeing that I will keep up until the end. Concerning the first one, I counted and indeed we have 384 occurrences of "l:" and 7715 of "license:". So it makes sense to switch. However, I think we should mention all concerned packages in the git commit message. So I will modify the patch and push it accordingly. Andreas From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 07:48:38 2019 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 11:48:38 +0000 Received: from localhost ([127.0.0.1]:47879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMWg9-00042n-Tf for submit@debbugs.gnu.org; Fri, 03 May 2019 07:48:38 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:44910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMWg8-00042d-9p for 35446@debbugs.gnu.org; Fri, 03 May 2019 07:48:36 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 82254620D; Fri, 3 May 2019 13:48:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f9WYWDsgvTO8; Fri, 3 May 2019 13:48:33 +0200 (CEST) Received: from jurong (unknown [46.183.103.8]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 90A586224; Fri, 3 May 2019 13:48:31 +0200 (CEST) Date: Fri, 3 May 2019 13:48:23 +0200 From: Andreas Enge To: Brendan Tildesley Subject: Re: [bug#35446] [PATCH 02/26] gnu: Add python-css-parser, python2-css-parser. Message-ID: <20190503114823.GB1858@jurong> References: <20190427093659.21851-1-mail@brendan.scot> <20190427093659.21851-2-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190427093659.21851-2-mail@brendan.scot> User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Score: 4.2 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Sat, Apr 27, 2019 at 07:36:35PM +1000, Brendan Tildesley wrote: > * gnu/packages/python-web.scm (python-css-parser, python2-css-parser): New > variables. Applied, thanks! Since python2-cssutils has no dependent apart from calibre, should we maybe delete it to further our efforts of getting rid of python@2? (python-cssutils is used for other packages.) Content analysis details: (4.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [46.183.103.8 listed in zen.spamhaus.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [185.233.100.1 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 35446 Cc: 35446@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.2 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Sat, Apr 27, 2019 at 07:36:35PM +1000, Brendan Tildesley wrote: > * gnu/packages/python-web.scm (python-css-parser, python2-css-parser): New > variables. Applied, thanks! Since python2-cssutils has no dependent apart from calibre, should we maybe delete it to further our efforts of getting rid of python@2? (python-cssutils is used for other packages.) Content analysis details: (3.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [46.183.103.8 listed in zen.spamhaus.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [185.233.100.1 listed in list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager On Sat, Apr 27, 2019 at 07:36:35PM +1000, Brendan Tildesley wrote: > * gnu/packages/python-web.scm (python-css-parser, python2-css-parser): New > variables. Applied, thanks! Since python2-cssutils has no dependent apart from calibre, should we maybe delete it to further our efforts of getting rid of python@2? (python-cssutils is used for other packages.) Andreas From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 07:57:34 2019 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 11:57:34 +0000 Received: from localhost ([127.0.0.1]:47896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMWoo-0004Fp-2y for submit@debbugs.gnu.org; Fri, 03 May 2019 07:57:34 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:44996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMWom-0004Fe-2v for 35446@debbugs.gnu.org; Fri, 03 May 2019 07:57:32 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id BC3056227; Fri, 3 May 2019 13:57:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YL-_LHC3PIzd; Fri, 3 May 2019 13:57:29 +0200 (CEST) Received: from jurong (unknown [46.183.103.8]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 68EEF6226; Fri, 3 May 2019 13:57:27 +0200 (CEST) Date: Fri, 3 May 2019 13:57:25 +0200 From: Andreas Enge To: Brendan Tildesley Subject: Re: [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3. Message-ID: <20190503115725.GA3192@jurong> References: <20190427093659.21851-1-mail@brendan.scot> <20190427093659.21851-3-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190427093659.21851-3-mail@brendan.scot> User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Score: 4.2 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: > * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build > until my followup patches. could you prepare a minimal patch that updates calibre and includes all modifications to make it work? I think it will be desirable to be "atomic" in the sense that after every commit, we have a funct [...] Content analysis details: (4.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [185.233.100.1 listed in list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [46.183.103.8 listed in zen.spamhaus.org] X-Debbugs-Envelope-To: 35446 Cc: 35446@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.2 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: > * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build > until my followup patches. could you prepare a minimal patch that updates calibre and includes all modifications to make it work? I think it will be desirable to be "atomic" in the sense that after every commit, we have a funct [...] Content analysis details: (3.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [46.183.103.8 listed in zen.spamhaus.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [185.233.100.1 listed in list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello, On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: > * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build > until my followup patches. could you prepare a minimal patch that updates calibre and includes all modifications to make it work? I think it will be desirable to be "atomic" in the sense that after every commit, we have a functioning Guix. Unbundling patches etc. can then come one by one, but again such that "guix build calibre" should work at all times. Thanks! Andreas PS: I considered applying some later patches like your change of e-mail address, but this one did not apply on current master, and then I thought that maybe it will be easier for you if I do not take patches out of order. From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:43:50 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 04/24] gnu: calibre: Add missing dependencies as indicated by tests. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:43:53 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 03/24] gnu: calibre: Build rapydscript. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:43:57 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 01/24] gnu: calibre: Update to 3.41.3. Date: Sat, 4 May 2019 02:42:09 +1000 Message-Id: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:43:57 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 02/24] gnu: calibre: Use system mathjax. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:43:58 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:43:59 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 11/24] gnu: Add python-soupsieve, python2-soupsieve 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:00 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 05/24] gnu: calibre: Patch out unrar test. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 + -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:00 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 08/24] gnu: calibre: Add python2-html2text as an input. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:03 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 07/24] gnu: Add python-html2text, python2-html2text. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:03 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 09/24] gnu: python-regex, python2-regex: Update to 2019.04.14. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:05 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 14/24] gnu: calibre: Disable Qt test. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:11 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 17/24] gnu: calibre: Remove some comments. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:12 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 13/24] gnu: calibre: Disable bs4 test. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 + -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:12 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 10/24] gnu: calibre: Disable tests that require networking. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:13 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 16/24] gnu: calibre: Enable tests. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:13 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 21/24] gnu: calibre: Install man pages. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:14 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 19/24] gnu: calibre: Remove libxrender as an input. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:15 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 20/24] gnu: calibre: Delete various junk from source. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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. -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:15 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 18/24] gnu: calibre: Unbundle python2-odfpy. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:22 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 12/24] gnu: calibre: Use linux.py to install desktop files. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:22 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 15/24] gnu: calibre: Disable sqlite test. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 + -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:31 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 22/24] gnu: calibre: Shorten long line. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:37 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 23/24] gnu: calibre: Update to 3.42.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:44:58 2019 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 To: 35446@debbugs.gnu.org Subject: [PATCH v2 24/24] Correct email and license info for 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 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- 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. ;;; -- 2.21.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 12:49:33 2019 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:49:33 +0000 Received: from localhost ([127.0.0.1]:49564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbNM-0007UA-NI for submit@debbugs.gnu.org; Fri, 03 May 2019 12:49:33 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:17212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbNK-0007Tu-VX for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:49:31 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 5689EA0208; Fri, 3 May 2019 18:49:25 +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=1556902165; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fpYypMWQvFWfxgc1sWDo6CDVM1gDMeBozhAqrKafBgE=; b=qm3pz3OLTSTOneM3x+VRgRn+nPijRKe8buxe4o+ieMM++BIYxEqehC6rC75oLdEOzFo223 K43iPgsLmLIqOVWfvSB9N4x8I5zldbqUr3VVt5cFEFz1GMUso09c2muAVToJejVizUWFOq t0cy56zCj86U2L9aOCYvIymxgEP+qNsubWZPx3ziJPltlj9ZhysKS05a6AZEC9aJIWgJQj SATeNlfHMpqtoeEqmstpv51nfPtFbh2hLMYBssmoWS881mQNvxr1SVHJcGjWyzTeRb2u3w gWzNvVvVPx1OfhVJVps1DnsVs5tstsfs2LDSnx5/gCBi/ZaPW0bG3spbSVPHTQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id tYYupWlevVZR; Fri, 3 May 2019 18:49:17 +0200 (CEST) Subject: Re: [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3. References: <20190427093659.21851-1-mail@brendan.scot> <20190427093659.21851-3-mail@brendan.scot> <20190503115725.GA3192@jurong> To: 35446@debbugs.gnu.org From: Brendan Tildesley Message-ID: <5e4327e8-860e-35cf-1f5a-22f694952227@brendan.scot> Date: Sat, 4 May 2019 02:49:13 +1000 MIME-Version: 1.0 In-Reply-To: <20190503115725.GA3192@jurong> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-AU X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 Cc: Andreas Enge X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 5/3/19 9:57 PM, Andreas Enge wrote: > Hello, > > On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: >> * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build >> until my followup patches. > could you prepare a minimal patch that updates calibre and includes all > modifications to make it work? I think it will be desirable to be "atomic" > in the sense that after every commit, we have a functioning Guix. > Unbundling patches etc. can then come one by one, but again such that > "guix build calibre" should work at all times. I ended up redoing the whole patch set, and fixed a small problems, and made sure it applies to the latest master. Actually Calibre 3.42.0 is out now so I added that on the end (its too difficult to rebase it back on to the original update to 3.41.3, so im sending both updates.). Also, in git send-email i accidentally set the last patch's char encoding to 'y', hopefully it doesn't break anything. > > Thanks! > > Andreas > > PS: I considered applying some later patches like your change of e-mail > address, but this one did not apply on current master, and then I > thought that maybe it will be easier for you if I do not take patches > out of order. > From debbugs-submit-bounces@debbugs.gnu.org Sun May 05 07:20:07 2019 Received: (at 35446) by debbugs.gnu.org; 5 May 2019 11:20:07 +0000 Received: from localhost ([127.0.0.1]:53111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNFBe-0005IC-RM for submit@debbugs.gnu.org; Sun, 05 May 2019 07:20:07 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:59662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNFBd-0005I3-Cs for 35446@debbugs.gnu.org; Sun, 05 May 2019 07:20:05 -0400 Received: from localhost (178.113.194.41.wireless.dyn.drei.com [178.113.194.41]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 0F68533602A1; Sun, 5 May 2019 13:20:01 +0200 (CEST) Date: Sun, 5 May 2019 13:19:59 +0200 From: Danny Milosavljevic To: Brendan Tildesley Subject: Re: [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test. Message-ID: <20190505131959.30c4c0f9@scratchpost.org> In-Reply-To: <20190503164232.1799-5-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> <20190503164232.1799-5-mail@brendan.scot> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_//FMQv=7ihFMf7/PXY1fEPmB"; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 Cc: 35446@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_//FMQv=7ihFMf7/PXY1fEPmB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Why is the unrar test being removed? --Sig_//FMQv=7ihFMf7/PXY1fEPmB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlzOxt8ACgkQ5xo1VCww uqWw4Qf/VAtACBrZShbLIklbtPO3IfzUyJzD0qoXFaEgrDR098pFp9v7Cf+jyvBb vPYa2eAjfd69yul65A43hPrnlwxS4iqg5l/Jxjh2dMWl9ZbzMxzcccjP2PbenTgX hRpCaPGPnbUw9xt0blpU9IvilaIgMznz1u7q60KcQurMwUVguAD0ZynrCN2b5dBI WZyxwprRWkQWeCB9z5xABqqt8EBiEHOr4fHFQBO4g5FYXChiUPkNgfr43tE9ygXq C9T8cJwS5X4BMmU4T5fZ7fW3wJjTz4GXjMCkmpysEGAdK45OahZ4UYOQrQ2mVrqh de4Ov3HgZkyO9IDNG7Dflef+3VcQOA== =QSn1 -----END PGP SIGNATURE----- --Sig_//FMQv=7ihFMf7/PXY1fEPmB-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 05 07:32:47 2019 Received: (at 35446) by debbugs.gnu.org; 5 May 2019 11:32:47 +0000 Received: from localhost ([127.0.0.1]:53119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNFNt-0007fX-1I for submit@debbugs.gnu.org; Sun, 05 May 2019 07:32:47 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:57318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNFNq-0007bX-Pp for 35446@debbugs.gnu.org; Sun, 05 May 2019 07:32:43 -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 D9D7340151; Sun, 5 May 2019 13:32:35 +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=1557055946; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dLEROzLQDZ8elADpuQKm0YWqEry0Ag5olosHtruwDhE=; b=C+TWKuMmfE5E0fwFFictpznbhEVJRckAxAz33IEhuF0RhrXPV+7+VhhutG+K1ep0tzdcCK qwbK6crx3InDd+dQj6d1gFAr4gKMm3O+ZbMNzBhBWY73rnF/exqfblSXjZ5n2y4vPkZTKz BFOwmPg2ybc1XWQrb9b997smOrBWm1nwkmx3DtFczyOYhNQr8aXYBkhB9e6s0/Liokcg0f RcRqN9Jh/DWIiE8Qq7q1AQ+RtpdPbjEpSKN4Tf1j95ZQDxSA7Sjp6vrj99hhWrrzxDTVnB 4cxuckM2I+KwHmkFYT2kuXoGMD2gjmgGgu99qvDAvtOpi0pTGn/K2bxq8ld9ZQ== 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 b4rcao1YyVVs; Sun, 5 May 2019 13:32:14 +0200 (CEST) Subject: Re: [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test. References: <20190503164232.1799-1-mail@brendan.scot> <20190503164232.1799-5-mail@brendan.scot> <20190505131959.30c4c0f9@scratchpost.org> To: 35446@debbugs.gnu.org From: Brendan Tildesley Message-ID: Date: Sun, 5 May 2019 21:32:09 +1000 MIME-Version: 1.0 In-Reply-To: <20190505131959.30c4c0f9@scratchpost.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Content-Language: en-AU X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446 Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 5/5/19 9:19 PM, Danny Milosavljevic wrote: > Why is the unrar test being removed? unrar was removed from Guix, although I still use it myself. commit 2560aa7adbfcb46306e8b19180bd48d39c2da6dc Author: Leo Famulari Date:   Tue Oct 24 14:49:26 2017 -0400     gnu: Remove unrar.     This package is abandoned upstream and contains serious bugs:     http://seclists.org/oss-sec/2017/q3/329     https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14120 From debbugs-submit-bounces@debbugs.gnu.org Sun May 05 11:15:30 2019 Received: (at 35446-done) by debbugs.gnu.org; 5 May 2019 15:15:30 +0000 Received: from localhost ([127.0.0.1]:54668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNIrS-0007DS-3F for submit@debbugs.gnu.org; Sun, 05 May 2019 11:15:30 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:50552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNIrP-0007DH-Vl for 35446-done@debbugs.gnu.org; Sun, 05 May 2019 11:15:28 -0400 Received: from localhost (178.113.194.41.wireless.dyn.drei.com [178.113.194.41]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 2962633602A1; Sun, 5 May 2019 17:15:26 +0200 (CEST) Date: Sun, 5 May 2019 17:15:23 +0200 From: Danny Milosavljevic To: Brendan Tildesley Subject: Re: [bug#35446] [PATCH v2 23/24] gnu: calibre: Update to 3.42.0. Message-ID: <20190505171523.06f550ad@scratchpost.org> In-Reply-To: <20190503164232.1799-23-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> <20190503164232.1799-23-mail@brendan.scot> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/gSgsivL.D8LX2v_mZDrgG8+"; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35446-done Cc: 35446-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/gSgsivL.D8LX2v_mZDrgG8+ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Thanks! I've applied the patchset to guix master with small changes to the commit messages. I've put the rationale for each patch into the respective patch file. --Sig_/gSgsivL.D8LX2v_mZDrgG8+ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlzO/gsACgkQ5xo1VCww uqVWyAf+L+Zwdriv5fFl5nUtgScGMmPwfSQhOPYhkvokGOVppJzyQ47Lu7c0f7Dr TUy5jyahtw1kOeSTO0d35UHU9ghOy9pHWrOuHVwzJcd+h7eyQPMcMQRtJqEk/X3D bYct3cZqRK5rkoINGCOJbKb63nRVKQIzF1roZV4qKA5a4raxc3MT1eRNOTYvXJA1 osSev3SXJb5ckIdqol/r6+qfB5KrpjzLpJaH41BfQ0RdDI4bI4eRH4E2QrezsU5c mA2JRI4z+L4dlEL6fE7IcjemYCyfkFdxXqVJVYszCETX8/XHIhXWwFaeuuyLGlRf YpZUjbhXu4FEEDvw32TWqToJ542ZCA== =3cjK -----END PGP SIGNATURE----- --Sig_/gSgsivL.D8LX2v_mZDrgG8+-- From unknown Sat Aug 16 13:41:58 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 03 Jun 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator