CVS commit: pkgsrc/misc/calibre

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb  5 18:34:09 UTC 2017

Modified Files:
        pkgsrc/misc/calibre: Makefile PLIST distinfo

Log Message:
Updated calibre to 2.78.0.

Use included versions of chardet and html5lib.
chardet: not sure if included copy is modified.
html5lib: included copy is definitely modified.

New Features

    View button: Add an action to the right click menu that always opens the book with the calibre viewer, regardless of the preferences
    Kobo driver: Update to support the newest firmware from Kobo
    E-book viewer: Allow opening a specific item from the Table of Contents via the --open-at command line parameter.
    Closes tickets: 1656573
    Amazon metadata download: Add support for downloading from amazon.ca

Bug Fixes

    Edit Book: Do not condense CSS rules when saving AZW3 files regardless of the value of Preferences->Common Options->Look & Feel->Expand CSS
    EPUB Output: Fix a duplicate id created in rare circumstances when splitting on page breaks.
    Closes tickets: 1658744

    DOCX Input: Fix error when converting documents that have images pointing to web resources.
    Closes tickets: 1659142

    E-book viewer: Fix a regression that caused an increase in load times when loading the individual HTML files inside an EPUB book.
    Closes tickets: 1658578

    Fix setting a similar books search to use the formats field in Preferences->Searching resulting in an error.
    Closes tickets: 1658386

    Kobo driver: Fix incorrect cover size being uploaded to the Glo HD
    E-book viewer: Fix 'View Image' right click menu action not available for svg files included via <img> tags.
    Closes tickets: 1657717

    HTML Input: Remove the # character from input filenames, for maximum compatibility.
    Closes tickets: 1656833

    Edit Book: Fix spell check treating the unicode hyphen (U+2010) differently from the normal hyphen (U+002d).
    Closes tickets: 1656319

New news sources

    The Sunday Times Magazine by Bobby Steel

Improved news sources

    FOX News
    Oriental Daily
    AM730
    The Times
    NYTimes
    Mediapart
    Echo Online
    kath.net
    GoComics
    The Hindu


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/misc/calibre/PLIST
cvs rdiff -u -r1.85 -r1.86 pkgsrc/misc/calibre/distinfo

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.169 pkgsrc/misc/calibre/Makefile:1.170
--- pkgsrc/misc/calibre/Makefile:1.169  Fri Jan 27 10:24:56 2017
+++ pkgsrc/misc/calibre/Makefile        Sun Feb  5 18:34:09 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.169 2017/01/27 10:24:56 kleink Exp $
+# $NetBSD: Makefile,v 1.170 2017/02/05 18:34:09 wiz Exp $
 
-DISTNAME=      calibre-2.77.0
-PKGREVISION=   1
+DISTNAME=      calibre-2.78.0
 CATEGORIES=    misc
 #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=  http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
@@ -25,10 +24,12 @@ DEPENDS+=   ${PYPKGPREFIX}-mechanize>=0.1.
 DEPENDS+=      ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
 DEPENDS+=      ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-## Let's depend on the ones we have in pkgsrc instead of the bundled ones.
+# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 DEPENDS+=      ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
-DEPENDS+=      ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+# not sure if pkgsrc version would be ok or not
 #DEPENDS+=     ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+# includes own, modified copy of html5lib
+#DEPENDS+=     ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 DEPENDS+=      ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
 DEPENDS+=      ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
 
@@ -93,7 +94,7 @@ MAKE_ENV+=            SIP_BIN=${BUILDLINK_PREFIX.p
 
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 pre-configure:
-       cd ${WRKSRC} && rm -rf src/cherrypy src/html5lib src/chardet
+       cd ${WRKSRC} && rm -rf src/cherrypy
 
 # Turn off x bits on non-executable files.
 post-extract:

Index: pkgsrc/misc/calibre/PLIST
diff -u pkgsrc/misc/calibre/PLIST:1.75 pkgsrc/misc/calibre/PLIST:1.76
--- pkgsrc/misc/calibre/PLIST:1.75      Sun Jan 22 15:10:41 2017
+++ pkgsrc/misc/calibre/PLIST   Sun Feb  5 18:34:09 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.75 2017/01/22 15:10:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.76 2017/02/05 18:34:09 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1386,6 +1386,42 @@ lib/calibre/calibre/web/feeds/templates.
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
 lib/calibre/calibre/web/fetch/utils.py
+lib/calibre/chardet/__init__.py
+lib/calibre/chardet/big5freq.py
+lib/calibre/chardet/big5prober.py
+lib/calibre/chardet/chardistribution.py
+lib/calibre/chardet/charsetgroupprober.py
+lib/calibre/chardet/charsetprober.py
+lib/calibre/chardet/codingstatemachine.py
+lib/calibre/chardet/constants.py
+lib/calibre/chardet/escprober.py
+lib/calibre/chardet/escsm.py
+lib/calibre/chardet/eucjpprober.py
+lib/calibre/chardet/euckrfreq.py
+lib/calibre/chardet/euckrprober.py
+lib/calibre/chardet/euctwfreq.py
+lib/calibre/chardet/euctwprober.py
+lib/calibre/chardet/gb2312freq.py
+lib/calibre/chardet/gb2312prober.py
+lib/calibre/chardet/hebrewprober.py
+lib/calibre/chardet/jisfreq.py
+lib/calibre/chardet/jpcntx.py
+lib/calibre/chardet/langbulgarianmodel.py
+lib/calibre/chardet/langcyrillicmodel.py
+lib/calibre/chardet/langgreekmodel.py
+lib/calibre/chardet/langhebrewmodel.py
+lib/calibre/chardet/langhungarianmodel.py
+lib/calibre/chardet/langthaimodel.py
+lib/calibre/chardet/latin1prober.py
+lib/calibre/chardet/mbcharsetprober.py
+lib/calibre/chardet/mbcsgroupprober.py
+lib/calibre/chardet/mbcssm.py
+lib/calibre/chardet/sbcharsetprober.py
+lib/calibre/chardet/sbcsgroupprober.py
+lib/calibre/chardet/sjisprober.py
+lib/calibre/chardet/test.py
+lib/calibre/chardet/universaldetector.py
+lib/calibre/chardet/utf8prober.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
@@ -1394,6 +1430,42 @@ lib/calibre/css_selectors/select.py
 lib/calibre/css_selectors/tests.py
 lib/calibre/duktape/__init__.py
 lib/calibre/duktape/tests.py
+lib/calibre/html5lib/__init__.py
+lib/calibre/html5lib/constants.py
+lib/calibre/html5lib/filters/__init__.py
+lib/calibre/html5lib/filters/_base.py
+lib/calibre/html5lib/filters/alphabeticalattributes.py
+lib/calibre/html5lib/filters/inject_meta_charset.py
+lib/calibre/html5lib/filters/lint.py
+lib/calibre/html5lib/filters/optionaltags.py
+lib/calibre/html5lib/filters/sanitizer.py
+lib/calibre/html5lib/filters/whitespace.py
+lib/calibre/html5lib/html5parser.py
+lib/calibre/html5lib/ihatexml.py
+lib/calibre/html5lib/inputstream.py
+lib/calibre/html5lib/sanitizer.py
+lib/calibre/html5lib/serializer/__init__.py
+lib/calibre/html5lib/serializer/htmlserializer.py
+lib/calibre/html5lib/tokenizer.py
+lib/calibre/html5lib/treeadapters/__init__.py
+lib/calibre/html5lib/treeadapters/sax.py
+lib/calibre/html5lib/treebuilders/__init__.py
+lib/calibre/html5lib/treebuilders/_base.py
+lib/calibre/html5lib/treebuilders/dom.py
+lib/calibre/html5lib/treebuilders/etree.py
+lib/calibre/html5lib/treebuilders/etree_lxml.py
+lib/calibre/html5lib/treewalkers/__init__.py
+lib/calibre/html5lib/treewalkers/_base.py
+lib/calibre/html5lib/treewalkers/dom.py
+lib/calibre/html5lib/treewalkers/etree.py
+lib/calibre/html5lib/treewalkers/genshistream.py
+lib/calibre/html5lib/treewalkers/lxmletree.py
+lib/calibre/html5lib/treewalkers/pulldom.py
+lib/calibre/html5lib/trie/__init__.py
+lib/calibre/html5lib/trie/_base.py
+lib/calibre/html5lib/trie/datrie.py
+lib/calibre/html5lib/trie/py.py
+lib/calibre/html5lib/utils.py
 lib/calibre/lzma/__init__.py
 lib/calibre/lzma/errors.py
 lib/calibre/lzma/lzma1.py
@@ -3191,6 +3263,7 @@ share/calibre/recipes/strategy-business.
 share/calibre/recipes/sueddeutsche.recipe
 share/calibre/recipes/sueddeutsche_mobil.recipe
 share/calibre/recipes/sueddeutschezeitung.recipe
+share/calibre/recipes/sunday_times_magazine.recipe
 share/calibre/recipes/superbebe.recipe
 share/calibre/recipes/superesportes.recipe
 share/calibre/recipes/svd_se.recipe

Index: pkgsrc/misc/calibre/distinfo
diff -u pkgsrc/misc/calibre/distinfo:1.85 pkgsrc/misc/calibre/distinfo:1.86
--- pkgsrc/misc/calibre/distinfo:1.85   Sun Jan 22 15:10:41 2017
+++ pkgsrc/misc/calibre/distinfo        Sun Feb  5 18:34:09 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.85 2017/01/22 15:10:41 wiz Exp $
+$NetBSD: distinfo,v 1.86 2017/02/05 18:34:09 wiz Exp $
 
-SHA1 (calibre-2.77.0.tar.xz) = 91da5bfcb7a8bd36a97ddc5ebf1c35010aa92f76
-RMD160 (calibre-2.77.0.tar.xz) = 1a270f465673683bb8b7fa66fd77e8fa31b18467
-SHA512 (calibre-2.77.0.tar.xz) = f6f9c72443cca83199feaa276c625da2ecba00d3639f7133f5da5f2a3e0843a592e96761ed7ea8021eea6e9bf55d42dedf42a2096e5c9432397a5384102a6fe7
-Size (calibre-2.77.0.tar.xz) = 38735056 bytes
+SHA1 (calibre-2.78.0.tar.xz) = 294326a3400b42ca9b734270e6d2ac1963ca0654
+RMD160 (calibre-2.78.0.tar.xz) = ad02b47a4c1a34de0d3f5a88bf2a469129a25d35
+SHA512 (calibre-2.78.0.tar.xz) = 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca
+Size (calibre-2.78.0.tar.xz) = 38739404 bytes
 SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
 SHA1 (patch-setup_build__environment.py) = d44460d96f9fb76cd80814a9cba8b153c52b5bfc
 SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 62d02b7b901efac6ee3bb1b6628ab99b4a13a926