diff options
| author | kleink <kleink@pkgsrc.org> | 2017-01-18 11:07:13 +0000 |
|---|---|---|
| committer | kleink <kleink@pkgsrc.org> | 2017-01-18 11:07:13 +0000 |
| commit | a13efb3f37e3e48baffb81773770c86a429bb132 (patch) | |
| tree | 099210758797bfb3a5f7b7f47dabe16e0772a2e3 /misc | |
| parent | 2dcff5cb5dc5db6e2fee4c671d70a4d40549022a (diff) | |
| download | pkgsrc-a13efb3f37e3e48baffb81773770c86a429bb132.tar.gz | |
html5lib 0.99999999 moved treebuilders._base to .base to clarify its
status as public, and ihatexml to _ihatexml to clarify as private.
Deal with it.
(Same as for misc/calibre.)
Bump PKGREVISION.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/calibre1/Makefile | 4 | ||||
| -rw-r--r-- | misc/calibre1/distinfo | 3 | ||||
| -rw-r--r-- | misc/calibre1/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/misc/calibre1/Makefile b/misc/calibre1/Makefile index 1445584ad75..7f27b6f773b 100644 --- a/misc/calibre1/Makefile +++ b/misc/calibre1/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2017/01/01 14:43:47 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2017/01/18 11:07:13 kleink Exp $ DISTNAME= calibre-1.48.0 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} EXTRACT_SUFX= .tar.xz diff --git a/misc/calibre1/distinfo b/misc/calibre1/distinfo index a1908d764bd..c70a15960c4 100644 --- a/misc/calibre1/distinfo +++ b/misc/calibre1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 23:49:32 agc Exp $ +$NetBSD: distinfo,v 1.3 2017/01/18 11:07:13 kleink Exp $ SHA1 (calibre-1.48.0.tar.xz) = 9a466a33f5d2076d7ed7d096b5247b89a12b1625 RMD160 (calibre-1.48.0.tar.xz) = ff8e1bf0daa3c2ec6ace3cb9280c9bca3952c8a0 @@ -9,4 +9,5 @@ RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207 SHA512 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65 +SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 581b32aa5d02b1e995bbacfd64fbc393a0af1f4d SHA1 (patch-src_calibre_linux.py) = 5abce220798f9a32ffda45080227a8bc937de838 diff --git a/misc/calibre1/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py b/misc/calibre1/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py new file mode 100644 index 00000000000..1c614b92a4b --- /dev/null +++ b/misc/calibre1/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py @@ -0,0 +1,24 @@ +$NetBSD: patch-src_calibre_ebooks_oeb_polish_parsing.py,v 1.1 2017/01/18 11:07:13 kleink Exp $ + +html5lib 0.99999999 moved treebuilders._base to .base to clarify its +status as public, and ihatexml to _ihatexml to clarify as private. + +--- src/calibre/ebooks/oeb/polish/parsing.py.orig 2014-08-08 03:21:35.000000000 +0000 ++++ src/calibre/ebooks/oeb/polish/parsing.py +@@ -13,8 +13,14 @@ from bisect import bisect + from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase, fromstring, Element as LxmlElement + + from html5lib.constants import namespaces, tableInsertModeElements, EOF +-from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder +-from html5lib.ihatexml import InfosetFilter, DataLossWarning ++try: ++ from html5lib.treebuilders.base import TreeBuilder as BaseTreeBuilder ++except: ++ from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder ++try: ++ from html5lib._ihatexml import InfosetFilter, DataLossWarning ++except: ++ from html5lib.ihatexml import InfosetFilter, DataLossWarning + from html5lib.html5parser import HTMLParser + + from calibre import xml_replace_entities |