From patchwork Sat Apr 27 09:36:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13781 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AF2AF16F52; Sat, 27 Apr 2019 14:13:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EC29D16F51 for ; Sat, 27 Apr 2019 14:13:35 +0100 (BST) Received: from localhost ([127.0.0.1]:60231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKN95-0000aI-Bb for patchwork@mira.cbaines.net; Sat, 27 Apr 2019 09:13:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKJmX-00078A-Nx for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKJmV-0004En-RW for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49075) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKJmV-0004Dv-0c for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKJmU-00014X-Sf for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH 04/26] gnu: calibre: Remove feedparser patch. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2019 09:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.15563578633974 (code B ref 35446); Sat, 27 Apr 2019 09:38:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Sat, 27 Apr 2019 09:12:43 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm [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)