From: Brendan Tildesley <mail@brendan.scot>
To: 35446@debbugs.gnu.org
Subject: [bug#35446] [PATCH 04/26] gnu: calibre: Remove feedparser patch.
Date: Sat, 27 Apr 2019 19:36:37 +1000 [thread overview]
Message-ID: <20190427093659.21851-4-mail@brendan.scot> (raw)
In-Reply-To: <20190427093659.21851-1-mail@brendan.scot>
* 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 <mpitt@debian.org>
-Date: Mon, 14 Nov 2016 22:41:23 +0100
-Subject: Use packaged instead of bundled feedparser Python module
-
----
- recipes/lenta_ru.recipe | 4 +++-
- src/calibre/web/feeds/__init__.py | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/recipes/lenta_ru.recipe b/recipes/lenta_ru.recipe
-index aa4dac4..4b6710c 100644
---- a/recipes/lenta_ru.recipe
-+++ b/recipes/lenta_ru.recipe
-@@ -4,11 +4,13 @@
- Lenta.ru
- '''
-
--from calibre.web.feeds.feedparser import parse
- from calibre.ebooks.BeautifulSoup import Tag
- from calibre.web.feeds.news import BasicNewsRecipe
-+from feedparser import parse
-+from functools import partial
- import re
-
-+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
-
- class LentaRURecipe(BasicNewsRecipe):
- title = u'Lenta.ru: \u041d\u043e\u0432\u043e\u0441\u0442\u0438'
-diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py
-index 8c9d748..f262604 100644
---- a/src/calibre/web/feeds/__init__.py
-+++ b/src/calibre/web/feeds/__init__.py
-@@ -11,7 +11,10 @@ from calibre.utils.logging import default_log
- from calibre import entity_to_unicode, strftime, force_unicode
- from calibre.utils.date import dt_factory, utcnow, local_tz
- from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars
-+from feedparser import parse
-+from functools import partial
-
-+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
-
- class Article(object):
-
-@@ -334,7 +337,6 @@ def feed_from_xml(raw_xml, title=None, oldest_article=7,
- max_articles_per_feed=100,
- get_article_url=lambda item: item.get('link', None),
- log=default_log):
-- from calibre.web.feeds.feedparser import parse
- # Handle unclosed escaped entities. They trip up feedparser and HBR for one
- # generates them
- raw_xml = re.sub(r'(&#\d+)([^0-9;])', r'\1;\2', raw_xml)
--
2.21.0
next prev parent reply other threads:[~2019-04-27 9:38 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-27 6:36 [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 01/26] gnu: Use 'license:' prefix in (gnu packages web) Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 02/26] gnu: Add python-css-parser, python2-css-parser Brendan Tildesley
2019-05-03 11:48 ` Andreas Enge
2019-04-27 9:36 ` [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3 Brendan Tildesley
2019-05-03 11:57 ` Andreas Enge
2019-05-03 16:49 ` Brendan Tildesley
2019-04-27 9:36 ` Brendan Tildesley [this message]
2019-04-27 9:36 ` [bug#35446] [PATCH 05/26] Update email address for Brendan Tildesley Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 06/26] gnu: calibre: [inputs]: Replace cssutils with the css-parser fork Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 07/26] gnu: calibre: Remove markdown unbundling code Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 08/26] gnu: calibre: Use system mathjax Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 09/26] gnu: calibre: Build rapydscript Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 10/26] gnu: calibre: Enable tests Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 11/26] gnu: calibre: Add missing dependencies as indicated by tests Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 12/26] gnu: calibre: Patch out unrar test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 13/26] gnu: calibre: Move font unbundling to after check phase Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 14/26] gnu: Add python-html2text, python2-html2text Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 15/26] gnu: calibre: Add python2-html2text as an input Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 16/26] gnu: python-regex, python2-regex: Update to 2019.04.14 Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 17/26] gnu: calibre: Disable tests that require networking Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 18/26] gnu: Add python-soupsieve, python2-soupsieve Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 19/26] gnu: calibre: Use linux.py to install desktop files Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 20/26] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 21/26] gnu: calibre: Disable Qt test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 22/26] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 23/26] gnu: Calibre: Remove some comments Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 24/26] gnu: calibre: Unbundle python2-odfpy Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 25/26] gnu: calibre: Remove libxrender as an input Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 26/26] gnu: calibre: Delete various junk from source Brendan Tildesley
2019-04-27 10:14 ` [bug#35446] [PATCH 25/26]: gnu: calibre: Delete various junk from source. (fix typos) Brendan Tildesley
2019-05-03 11:22 ` [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Andreas Enge
2019-05-03 16:42 ` [bug#35446] [PATCH v2 01/24] gnu: calibre: " Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 02/24] gnu: calibre: Use system mathjax Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 03/24] gnu: calibre: Build rapydscript Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 04/24] gnu: calibre: Add missing dependencies as indicated by tests Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test Brendan Tildesley
2019-05-05 11:19 ` Danny Milosavljevic
2019-05-05 11:32 ` Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 07/24] gnu: Add python-html2text, python2-html2text Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 08/24] gnu: calibre: Add python2-html2text as an input Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 09/24] gnu: python-regex, python2-regex: Update to 2019.04.14 Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 10/24] gnu: calibre: Disable tests that require networking Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 11/24] gnu: Add python-soupsieve, python2-soupsieve Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 12/24] gnu: calibre: Use linux.py to install desktop files Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 13/24] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 14/24] gnu: calibre: Disable Qt test Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 15/24] gnu: calibre: Disable sqlite test Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 16/24] gnu: calibre: Enable tests Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 17/24] gnu: calibre: Remove some comments Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 18/24] gnu: calibre: Unbundle python2-odfpy Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 19/24] gnu: calibre: Remove libxrender as an input Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 20/24] gnu: calibre: Delete various junk from source Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 21/24] gnu: calibre: Install man pages Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 22/24] gnu: calibre: Shorten long line Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 23/24] gnu: calibre: Update to 3.42.0 Brendan Tildesley
2019-05-05 15:15 ` bug#35446: " Danny Milosavljevic
2019-05-03 16:42 ` [bug#35446] [PATCH v2 24/24] Correct email and license info for Brendan Tildesley Brendan Tildesley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190427093659.21851-4-mail@brendan.scot \
--to=mail@brendan.scot \
--cc=35446@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).