CVS commit: pkgsrc/misc/calibre

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 17 23:19:24 UTC 2017

Modified Files:
        pkgsrc/misc/calibre: Makefile distinfo
Added Files:
        pkgsrc/misc/calibre/patches:
            patch-src_calibre_ebooks_oeb_polish_parsing.py

Log Message:
Fix build with latest py-html5lib.

>From kleink.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/misc/calibre/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.165 pkgsrc/misc/calibre/Makefile:1.166
--- pkgsrc/misc/calibre/Makefile:1.165  Sun Jan  1 16:00:03 2017
+++ pkgsrc/misc/calibre/Makefile        Tue Jan 17 23:19:24 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2017/01/01 16:00:03 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2017/01/17 23:19:24 wiz Exp $
 
 DISTNAME=      calibre-2.76.0
+PKGREVISION=   1
 CATEGORIES=    misc
 #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=  http://download.calibre-ebook.com/${PKGVERSION_NOREV}/

Index: pkgsrc/misc/calibre/distinfo
diff -u pkgsrc/misc/calibre/distinfo:1.83 pkgsrc/misc/calibre/distinfo:1.84
--- pkgsrc/misc/calibre/distinfo:1.83   Sun Jan  1 16:00:03 2017
+++ pkgsrc/misc/calibre/distinfo        Tue Jan 17 23:19:24 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2017/01/01 16:00:03 wiz Exp $
+$NetBSD: distinfo,v 1.84 2017/01/17 23:19:24 wiz Exp $
 
 SHA1 (calibre-2.76.0.tar.xz) = e8d7296094fd194ae94a72d29c7f7d8ed05458ec
 RMD160 (calibre-2.76.0.tar.xz) = b5b1cfbc3fb03cb3db69190946236923f630bf39
@@ -6,4 +6,5 @@ SHA512 (calibre-2.76.0.tar.xz) = f47c6b1
 Size (calibre-2.76.0.tar.xz) = 38675824 bytes
 SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
 SHA1 (patch-setup_build__environment.py) = d44460d96f9fb76cd80814a9cba8b153c52b5bfc
+SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 62d02b7b901efac6ee3bb1b6628ab99b4a13a926
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662

Added files:

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py:1.1
--- /dev/null   Tue Jan 17 23:19:24 2017
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py  Tue Jan 17 23:19:24 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_calibre_ebooks_oeb_polish_parsing.py,v 1.1 2017/01/17 23:19:24 wiz 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      2017-01-13 03:38: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