From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 22 17:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFF93A47 for ; Fri, 22 Nov 2013 17:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9C7552264 for ; Fri, 22 Nov 2013 17:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMHU05h060789 for ; Fri, 22 Nov 2013 17:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAMHU08K060773; Fri, 22 Nov 2013 17:30:00 GMT (envelope-from gnats) Resent-Date: Fri, 22 Nov 2013 17:30:00 GMT Resent-Message-Id: <201311221730.rAMHU08K060773@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rusty Nejdl Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D9349B6 for ; Fri, 22 Nov 2013 17:22:01 +0000 (UTC) Received: from tethys.ringofsaturn.com (tethys.ringofsaturn.com [71.252.219.43]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 087D0222C for ; Fri, 22 Nov 2013 17:22:00 +0000 (UTC) Received: from ASSP.nospam (localhost [127.0.0.1]) by tethys.ringofsaturn.com (8.14.7/8.14.7) with ESMTP id rAMGtTLD025445 for ; Fri, 22 Nov 2013 10:55:29 -0600 (CST) (envelope-from rnejdl@tethys.ringofsaturn.com) Received: from tethys.ringofsaturn.com ([127.0.0.1] helo=tethys.ringofsaturn.com) by ASSP.nospam with ESMTPS(DHE-RSA-CAMELLIA256-SHA) (ASSP 1.9.9); 22 Nov 2013 10:55:28 -0600 Received: (from rnejdl@localhost) by tethys.ringofsaturn.com (8.14.7/8.14.7/Submit) id rAMGtSl7025444; Fri, 22 Nov 2013 10:55:28 -0600 (CST) (envelope-from rnejdl) Message-Id: Date: Fri, 22 Nov 2013 10:55:28 -0600 (CST) From: Rusty Nejdl To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/184174: Update port deskutils/calibre to 1.12.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: Rusty Nejdl List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2013 17:30:00 -0000 >Number: 184174 >Category: ports >Synopsis: Update port deskutils/calibre to 1.12.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 22 17:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 9.2-STABLE FreeBSD 9.2-STABLE #1 r257395: Wed Oct 30 17:37:14 CDT 2013 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/SATURN amd64 >Description: This updates the calibre port to 1.12.0 and also fixes some missing dependencies from another PR. It does not fix the qt_hack issues though. The calibre team really should not be using the hidden QT functions that they are using. >How-To-Repeat: >Fix: --- calibre-1.12.0.patch begins here --- diff -ruN calibre/Makefile calibre.new/Makefile --- calibre/Makefile 2013-09-22 17:16:48.000000000 -0500 +++ calibre.new/Makefile 2013-11-22 07:56:05.000000000 -0600 @@ -2,7 +2,7 @@ # $FreeBSD: head/deskutils/calibre/Makefile 327718 2013-09-20 16:21:37Z bapt $ PORTNAME= calibre -PORTVERSION= 1.2.0 +PORTVERSION= 1.12.0 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -22,11 +22,11 @@ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \ ${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \ diff -ruN calibre/distinfo calibre.new/distinfo --- calibre/distinfo 2013-09-12 15:05:53.000000000 -0500 +++ calibre.new/distinfo 2013-11-22 07:56:16.000000000 -0600 @@ -1,2 +1,2 @@ -SHA256 (calibre-1.2.0.tar.xz) = d27fdbe981620aa63f5c70909c63a3a7b747ced1da2ee7065879f07b8a75ca40 -SIZE (calibre-1.2.0.tar.xz) = 29652528 +SHA256 (calibre-1.12.0.tar.xz) = 7a1edbd6aa4e2b7c6fd92f59c47511442baf404bcf8b3840e566f80894f42f1c +SIZE (calibre-1.12.0.tar.xz) = 30941380 diff -ruN calibre/files/patch-calibre_constants.py calibre.new/files/patch-calibre_constants.py --- calibre/files/patch-calibre_constants.py 2013-09-12 15:05:53.000000000 -0500 +++ calibre.new/files/patch-calibre_constants.py 2013-11-22 09:47:37.000000000 -0600 @@ -1,10 +1,10 @@ ---- src/calibre/constants.py.orig 2013-03-29 06:15:02.000000000 +0100 -+++ src/calibre/constants.py 2013-04-09 18:11:37.710213634 +0200 -@@ -136,7 +136,6 @@ +--- src/calibre/constants.py.orig 2013-11-22 09:46:59.000000000 -0600 ++++ src/calibre/constants.py 2013-11-22 09:47:07.000000000 -0600 +@@ -138,7 +138,6 @@ 'freetype', 'woff', 'unrar', - 'qt_hack', + '_regex' ] if iswindows: - plugins.extend(['winutil', 'wpd', 'winfonts']) diff -ruN calibre/files/patch-setup_extensions.py calibre.new/files/patch-setup_extensions.py --- calibre/files/patch-setup_extensions.py 2013-09-12 15:05:53.000000000 -0500 +++ calibre.new/files/patch-setup_extensions.py 2013-11-22 10:30:59.000000000 -0600 @@ -1,27 +1,27 @@ ---- setup/extensions.py.orig 2013-03-29 06:15:02.000000000 +0100 -+++ setup/extensions.py 2013-04-09 18:10:19.236217223 +0200 -@@ -183,13 +183,6 @@ - sip_files = ['calibre/gui2/progress_indicator/QProgressIndicator.sip'] +--- setup/extensions.py.orig 2013-11-22 10:29:37.000000000 -0600 ++++ setup/extensions.py 2013-11-22 10:30:39.000000000 -0600 +@@ -187,13 +187,6 @@ + sip_files=['calibre/gui2/progress_indicator/QProgressIndicator.sip'] ), - Extension('qt_hack', - ['calibre/ebooks/pdf/render/qt_hack.cpp'], -- inc_dirs = qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'], -- headers = ['calibre/ebooks/pdf/render/qt_hack.h'], -- sip_files = ['calibre/ebooks/pdf/render/qt_hack.sip'] +- inc_dirs=qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'], +- headers=['calibre/ebooks/pdf/render/qt_hack.h'], +- sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] - ), - Extension('unrar', ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o -@@ -492,8 +485,9 @@ +@@ -496,8 +489,9 @@ pro = textwrap.dedent(''' TEMPLATE = lib - CONFIG += qt plugin release + CONFIG += qt plugin release link_pkgconfig CONFIG -= embed_manifest_dll -+ PKGCONFIG += glib-2.0 gtk+-2.0 ++ PKGCONFIG += glib-2.0 gtk+-2.0 VERSION = 1.0.0 DESTDIR = . TARGET = calibre diff -ruN calibre/files/patch-setup_install.py calibre.new/files/patch-setup_install.py --- calibre/files/patch-setup_install.py 2013-09-12 15:05:53.000000000 -0500 +++ calibre.new/files/patch-setup_install.py 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- setup/install.py.orig 2013-09-06 06:28:39.000000000 +0200 -+++ setup/install.py 2013-09-10 22:34:23.970135119 +0200 -@@ -160,7 +160,7 @@ - self.info('Installing mount helper to '+ dest) - cflags = os.environ.get('OVERRIDE_CFLAGS', '-Wall -pedantic') - cflags = shlex.split(cflags) -- p = subprocess.Popen(['gcc']+cflags+[src, '-o', dest]) -+ p = subprocess.Popen([os.getenv('CC', 'gcc')]+cflags+[src, '-o', dest]) - ret = p.wait() - if ret != 0: - return warn() diff -ruN calibre/pkg-plist calibre.new/pkg-plist --- calibre/pkg-plist 2013-10-22 21:29:25.000000000 -0500 +++ calibre.new/pkg-plist 2013-11-22 10:51:04.000000000 -0600 @@ -2,7 +2,6 @@ bin/calibre-complete bin/calibre-customize bin/calibre-debug -bin/calibre-mount-helper bin/calibre-parallel bin/calibre-server bin/calibre-smtp @@ -19,6 +18,7 @@ bin/lrs2lrf bin/markdown-calibre bin/web2disk +lib/calibre/six.py lib/calibre/calibre/__init__.py lib/calibre/calibre/constants.py lib/calibre/calibre/customize/__init__.py @@ -229,6 +229,7 @@ lib/calibre/calibre/ebooks/docx/footnotes.py lib/calibre/calibre/ebooks/docx/images.py lib/calibre/calibre/ebooks/docx/numbering.py +lib/calibre/calibre/ebooks/docx/settings.py lib/calibre/calibre/ebooks/docx/tables.py lib/calibre/calibre/ebooks/docx/theme.py lib/calibre/calibre/ebooks/docx/to_html.py @@ -260,7 +261,7 @@ lib/calibre/calibre/ebooks/lit/reader.py lib/calibre/calibre/ebooks/lit/writer.py lib/calibre/calibre/ebooks/lrf/__init__.py -lib/calibre/calibre/ebooks/lrf/fonts/__init__.py +lib/calibre/calibre/ebooks/lrf/fonts.py lib/calibre/calibre/ebooks/lrf/html/__init__.py lib/calibre/calibre/ebooks/lrf/html/color_map.py lib/calibre/calibre/ebooks/lrf/html/convert_from.py @@ -280,12 +281,14 @@ lib/calibre/calibre/ebooks/lrf/pylrs/pylrs.py lib/calibre/calibre/ebooks/lrf/tags.py lib/calibre/calibre/ebooks/markdown/__init__.py +lib/calibre/calibre/ebooks/markdown/__main__.py +lib/calibre/calibre/ebooks/markdown/__version__.py lib/calibre/calibre/ebooks/markdown/blockparser.py lib/calibre/calibre/ebooks/markdown/blockprocessors.py -lib/calibre/calibre/ebooks/markdown/commandline.py -lib/calibre/calibre/ebooks/markdown/etree_loader.py lib/calibre/calibre/ebooks/markdown/extensions/__init__.py lib/calibre/calibre/ebooks/markdown/extensions/abbr.py +lib/calibre/calibre/ebooks/markdown/extensions/attr_list.py +lib/calibre/calibre/ebooks/markdown/extensions/admonition.py lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py lib/calibre/calibre/ebooks/markdown/extensions/def_list.py lib/calibre/calibre/ebooks/markdown/extensions/extra.py @@ -293,17 +296,19 @@ lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py lib/calibre/calibre/ebooks/markdown/extensions/headerid.py lib/calibre/calibre/ebooks/markdown/extensions/meta.py -lib/calibre/calibre/ebooks/markdown/extensions/rss.py +lib/calibre/calibre/ebooks/markdown/extensions/nl2br.py +lib/calibre/calibre/ebooks/markdown/extensions/sane_lists.py +lib/calibre/calibre/ebooks/markdown/extensions/smart_strong.py lib/calibre/calibre/ebooks/markdown/extensions/tables.py lib/calibre/calibre/ebooks/markdown/extensions/toc.py lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py -lib/calibre/calibre/ebooks/markdown/html4.py lib/calibre/calibre/ebooks/markdown/inlinepatterns.py -lib/calibre/calibre/ebooks/markdown/markdown.py lib/calibre/calibre/ebooks/markdown/odict.py lib/calibre/calibre/ebooks/markdown/postprocessors.py lib/calibre/calibre/ebooks/markdown/preprocessors.py +lib/calibre/calibre/ebooks/markdown/serializers.py lib/calibre/calibre/ebooks/markdown/treeprocessors.py +lib/calibre/calibre/ebooks/markdown/util.py lib/calibre/calibre/ebooks/metadata/__init__.py lib/calibre/calibre/ebooks/metadata/archive.py lib/calibre/calibre/ebooks/metadata/book/__init__.py @@ -405,6 +410,7 @@ lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py lib/calibre/calibre/ebooks/oeb/iterator/spine.py +lib/calibre/calibre/ebooks/oeb/normalize_css.py lib/calibre/calibre/ebooks/oeb/parse_utils.py lib/calibre/calibre/ebooks/oeb/polish/__init__.py lib/calibre/calibre/ebooks/oeb/polish/container.py @@ -413,9 +419,16 @@ lib/calibre/calibre/ebooks/oeb/polish/errors.py lib/calibre/calibre/ebooks/oeb/polish/jacket.py lib/calibre/calibre/ebooks/oeb/polish/main.py +lib/calibre/calibre/ebooks/oeb/polish/parsing.py lib/calibre/calibre/ebooks/oeb/polish/replace.py +lib/calibre/calibre/ebooks/oeb/polish/split.py lib/calibre/calibre/ebooks/oeb/polish/stats.py lib/calibre/calibre/ebooks/oeb/polish/subset.py +lib/calibre/calibre/ebooks/oeb/polish/tests/__init__.py +lib/calibre/calibre/ebooks/oeb/polish/tests/base.py +lib/calibre/calibre/ebooks/oeb/polish/tests/container.py +lib/calibre/calibre/ebooks/oeb/polish/tests/main.py +lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py lib/calibre/calibre/ebooks/oeb/polish/toc.py lib/calibre/calibre/ebooks/oeb/reader.py lib/calibre/calibre/ebooks/oeb/stylizer.py @@ -591,6 +604,7 @@ lib/calibre/calibre/gui2/actions/fetch_news.py lib/calibre/calibre/gui2/actions/help.py lib/calibre/calibre/gui2/actions/next_match.py +lib/calibre/calibre/gui2/actions/mark_books.py lib/calibre/calibre/gui2/actions/match_books.py lib/calibre/calibre/gui2/actions/open.py lib/calibre/calibre/gui2/actions/plugin_updates.py @@ -849,6 +863,7 @@ lib/calibre/calibre/gui2/preferences/server_ui.py lib/calibre/calibre/gui2/preferences/template_functions.py lib/calibre/calibre/gui2/preferences/template_functions_ui.py +lib/calibre/calibre/gui2/preferences/texture_chooser.py lib/calibre/calibre/gui2/preferences/toolbar.py lib/calibre/calibre/gui2/preferences/toolbar_ui.py lib/calibre/calibre/gui2/preferences/tweaks.py @@ -888,6 +903,7 @@ lib/calibre/calibre/gui2/store/search_result.py lib/calibre/calibre/gui2/store/stores/__init__.py lib/calibre/calibre/gui2/store/stores/allegro_plugin.py +lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -899,7 +915,6 @@ lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py lib/calibre/calibre/gui2/store/stores/biblio_plugin.py lib/calibre/calibre/gui2/store/stores/bn_plugin.py -lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py lib/calibre/calibre/gui2/store/stores/cdp_plugin.py lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py @@ -947,6 +962,7 @@ lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py lib/calibre/calibre/gui2/store/stores/woblink_plugin.py +lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py lib/calibre/calibre/gui2/store/web_control.py lib/calibre/calibre/gui2/store/web_store_dialog.py @@ -961,6 +977,27 @@ lib/calibre/calibre/gui2/toc/location.py lib/calibre/calibre/gui2/toc/main.py lib/calibre/calibre/gui2/tools.py +lib/calibre/calibre/gui2/tweak_book/ui.py +lib/calibre/calibre/gui2/tweak_book/preview.py +lib/calibre/calibre/gui2/tweak_book/keyboard.py +lib/calibre/calibre/gui2/tweak_book/main.py +lib/calibre/calibre/gui2/tweak_book/job.py +lib/calibre/calibre/gui2/tweak_book/__init__.py +lib/calibre/calibre/gui2/tweak_book/undo.py +lib/calibre/calibre/gui2/tweak_book/file_list.py +lib/calibre/calibre/gui2/tweak_book/save.py +lib/calibre/calibre/gui2/tweak_book/search.py +lib/calibre/calibre/gui2/tweak_book/templates.py +lib/calibre/calibre/gui2/tweak_book/toc.py +lib/calibre/calibre/gui2/tweak_book/boss.py +lib/calibre/calibre/gui2/tweak_book/editor/themes.py +lib/calibre/calibre/gui2/tweak_book/editor/text.py +lib/calibre/calibre/gui2/tweak_book/editor/__init__.py +lib/calibre/calibre/gui2/tweak_book/editor/widget.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py lib/calibre/calibre/gui2/ui.py lib/calibre/calibre/gui2/update.py lib/calibre/calibre/gui2/viewer/__init__.py @@ -972,6 +1009,7 @@ lib/calibre/calibre/gui2/viewer/documentview.py lib/calibre/calibre/gui2/viewer/flip.py lib/calibre/calibre/gui2/viewer/image_popup.py +lib/calibre/calibre/gui2/viewer/inspector.py lib/calibre/calibre/gui2/viewer/javascript.py lib/calibre/calibre/gui2/viewer/keys.py lib/calibre/calibre/gui2/viewer/main.py @@ -1028,6 +1066,7 @@ lib/calibre/calibre/libunzip.py lib/calibre/calibre/libwand.py lib/calibre/calibre/linux.py +lib/calibre/calibre/plugins/_regex.so lib/calibre/calibre/plugins/cPalmdoc.so lib/calibre/calibre/plugins/calibre_style.so lib/calibre/calibre/plugins/chm_extra.so @@ -1064,6 +1103,7 @@ lib/calibre/calibre/utils/config_base.py lib/calibre/calibre/utils/date.py lib/calibre/calibre/utils/dictclient.py +lib/calibre/calibre/utils/file_associations.py lib/calibre/calibre/utils/filenames.py lib/calibre/calibre/utils/fonts/__init__.py lib/calibre/calibre/utils/fonts/free_type.py @@ -1093,7 +1133,6 @@ lib/calibre/calibre/utils/formatter.py lib/calibre/calibre/utils/formatter_functions.py lib/calibre/calibre/utils/html2text.py -lib/calibre/calibre/utils/html5_entities.py lib/calibre/calibre/utils/icu.py lib/calibre/calibre/utils/imghdr.py lib/calibre/calibre/utils/ipc/__init__.py @@ -1151,6 +1190,7 @@ lib/calibre/calibre/utils/unsmarten.py lib/calibre/calibre/utils/unrar.py lib/calibre/calibre/utils/wmf/__init__.py +lib/calibre/calibre/utils/wmf/emf.py lib/calibre/calibre/utils/wmf/parse.py lib/calibre/calibre/utils/wordcount.py lib/calibre/calibre/utils/zipfile.py @@ -1257,8 +1297,8 @@ lib/calibre/html5lib/__init__.py lib/calibre/html5lib/constants.py lib/calibre/html5lib/filters/__init__.py +lib/calibre/html5lib/filters/alphabeticalattributes.py lib/calibre/html5lib/filters/_base.py -lib/calibre/html5lib/filters/formfiller.py lib/calibre/html5lib/filters/inject_meta_charset.py lib/calibre/html5lib/filters/lint.py lib/calibre/html5lib/filters/optionaltags.py @@ -1270,16 +1310,14 @@ lib/calibre/html5lib/sanitizer.py lib/calibre/html5lib/serializer/__init__.py lib/calibre/html5lib/serializer/htmlserializer.py -lib/calibre/html5lib/serializer/xhtmlserializer.py lib/calibre/html5lib/tokenizer.py -lib/calibre/html5lib/tokenizer_old.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/treebuilders/simpletree.py -lib/calibre/html5lib/treebuilders/soup.py lib/calibre/html5lib/treewalkers/__init__.py lib/calibre/html5lib/treewalkers/_base.py lib/calibre/html5lib/treewalkers/dom.py @@ -1287,8 +1325,10 @@ lib/calibre/html5lib/treewalkers/genshistream.py lib/calibre/html5lib/treewalkers/lxmletree.py lib/calibre/html5lib/treewalkers/pulldom.py -lib/calibre/html5lib/treewalkers/simpletree.py -lib/calibre/html5lib/treewalkers/soup.py +lib/calibre/html5lib/trie/__init__.py +lib/calibre/html5lib/trie/_base.py +lib/calibre/html5lib/trie/py.py +lib/calibre/html5lib/trie/datrie.py lib/calibre/html5lib/utils.py lib/calibre/odf/__init__.py lib/calibre/odf/anim.py @@ -1325,6 +1365,8 @@ lib/calibre/odf/userfield.py lib/calibre/odf/xforms.py lib/calibre/qtcurve/test_rendering.py +lib/calibre/regex/__init__.py +lib/calibre/regex/_regex_core.py lib/calibre/routes/__init__.py lib/calibre/routes/base.py lib/calibre/routes/lru.py @@ -1410,14 +1452,12 @@ %%DATADIR%%/fonts/liberation/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/liberation/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/liberation/LiberationSerif-Regular.ttf -%%DATADIR%%/fonts/prs500/tt0003m_.ttf -%%DATADIR%%/fonts/prs500/tt0011m_.ttf -%%DATADIR%%/fonts/prs500/tt0419m_.ttf %%DATADIR%%/images.qrc %%DATADIR%%/images/add_book.png %%DATADIR%%/images/arrow-down.png %%DATADIR%%/images/arrow-up.png %%DATADIR%%/images/auto_author_sort.png +%%DATADIR%%/images/auto-reload.png %%DATADIR%%/images/back.png %%DATADIR%%/images/blank.png %%DATADIR%%/images/book.png @@ -1451,6 +1491,7 @@ %%DATADIR%%/images/dialog_warning.png %%DATADIR%%/images/dictionary.png %%DATADIR%%/images/document-encrypt.png +%%DATADIR%%/images/document-new.png %%DATADIR%%/images/document_open.png %%DATADIR%%/images/donate.png %%DATADIR%%/images/dot_green.png @@ -1467,6 +1508,7 @@ %%DATADIR%%/images/edit-undo.png %%DATADIR%%/images/edit_input.png %%DATADIR%%/images/eject.png +%%DATADIR%%/images/embed-fonts.png %%DATADIR%%/images/exec.png %%DATADIR%%/images/font.png %%DATADIR%%/images/font_size_larger.png @@ -1507,6 +1549,7 @@ %%DATADIR%%/images/lookfeel.png %%DATADIR%%/images/lt.png %%DATADIR%%/images/mail.png +%%DATADIR%%/images/marked.png %%DATADIR%%/images/merge_books.png %%DATADIR%%/images/metadata.png %%DATADIR%%/images/mimetypes/azw2.png @@ -1542,6 +1585,7 @@ %%DATADIR%%/images/mimetypes/zip.png %%DATADIR%%/images/minus.png %%DATADIR%%/images/minusminus.png +%%DATADIR%%/images/modified.png %%DATADIR%%/images/network-server.png %%DATADIR%%/images/news.png %%DATADIR%%/images/next.png @@ -1583,18 +1627,28 @@ %%DATADIR%%/images/search_copy_saved.png %%DATADIR%%/images/search_delete_saved.png %%DATADIR%%/images/series.png +%%DATADIR%%/images/smarten-punctuation.png %%DATADIR%%/images/store.png +%%DATADIR%%/images/subset-fonts.png %%DATADIR%%/images/swap.png %%DATADIR%%/images/sync.png +%%DATADIR%%/images/sync-right.png %%DATADIR%%/images/tags.png %%DATADIR%%/images/tb_folder.png %%DATADIR%%/images/template_funcs.png +%%DATADIR%%/images/textures/light_wood.png +%%DATADIR%%/images/textures/dark_wood.png +%%DATADIR%%/images/textures/dark_cloth.png +%%DATADIR%%/images/textures/grey_wash_wall.png +%%DATADIR%%/images/textures/subtle_wood.png %%DATADIR%%/images/toc.png %%DATADIR%%/images/trash.png %%DATADIR%%/images/trim.png +%%DATADIR%%/images/tweak.png %%DATADIR%%/images/user_profile.png %%DATADIR%%/images/view-image.png %%DATADIR%%/images/view.png +%%DATADIR%%/images/view-refresh.png %%DATADIR%%/images/viewer.png %%DATADIR%%/images/welcome_wizard.png %%DATADIR%%/images/window-close.png @@ -1920,11 +1974,11 @@ @dirrm %%DATADIR%%/localization/pykakasi @dirrm %%DATADIR%%/localization @dirrm %%DATADIR%%/jacket +@dirrm %%DATADIR%%/images/textures @dirrm %%DATADIR%%/images/plugins @dirrm %%DATADIR%%/images/mimetypes @dirrm %%DATADIR%%/images/devices @dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/fonts/prs500 @dirrm %%DATADIR%%/fonts/liberation @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%%/content_server/read @@ -1940,9 +1994,12 @@ @dirrmtry %%PYTHON_SITELIBDIR%% @dirrm lib/calibre/templite @dirrm lib/calibre/routes +@dirrm lib/calibre/regex @dirrm lib/calibre/qtcurve @dirrm lib/calibre/odf +@dirrm lib/calibre/html5lib/trie @dirrm lib/calibre/html5lib/treewalkers +@dirrm lib/calibre/html5lib/treeadapters @dirrm lib/calibre/html5lib/treebuilders @dirrm lib/calibre/html5lib/serializer @dirrm lib/calibre/html5lib/filters @@ -1977,6 +2034,9 @@ @dirrm lib/calibre/calibre/library @dirrm lib/calibre/calibre/gui2/wizard @dirrm lib/calibre/calibre/gui2/viewer +@dirrm lib/calibre/calibre/gui2/tweak_book/editor/syntax +@dirrm lib/calibre/calibre/gui2/tweak_book/editor +@dirrm lib/calibre/calibre/gui2/tweak_book @dirrm lib/calibre/calibre/gui2/toc @dirrm lib/calibre/calibre/gui2/tag_browser @dirrm lib/calibre/calibre/gui2/store/stores/mobileread @@ -2019,6 +2079,7 @@ @dirrm lib/calibre/calibre/ebooks/pdb/ereader @dirrm lib/calibre/calibre/ebooks/pdb @dirrm lib/calibre/calibre/ebooks/oeb/transforms +@dirrm lib/calibre/calibre/ebooks/oeb/polish/tests @dirrm lib/calibre/calibre/ebooks/oeb/polish @dirrm lib/calibre/calibre/ebooks/oeb/iterator @dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi @@ -2038,7 +2099,6 @@ @dirrm lib/calibre/calibre/ebooks/lrf/pylrs @dirrm lib/calibre/calibre/ebooks/lrf/lrs @dirrm lib/calibre/calibre/ebooks/lrf/html -@dirrm lib/calibre/calibre/ebooks/lrf/fonts @dirrm lib/calibre/calibre/ebooks/lrf @dirrm lib/calibre/calibre/ebooks/lit/maps @dirrm lib/calibre/calibre/ebooks/lit --- calibre-1.12.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: