diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2013-12-01 21:29:23 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2013-12-01 21:29:23 +0000 |
commit | 38f9c10de16555101d6f42df0b0173390673f7bd (patch) | |
tree | 32b0a327a427c39fa5ff4bd58b59f69cdf1e641d /deskutils/calibre | |
parent | 4260ab280e2db2f3ecdd0f1da57859c8b59e47d6 (diff) | |
download | ports-38f9c10de16555101d6f42df0b0173390673f7bd.tar.gz ports-38f9c10de16555101d6f42df0b0173390673f7bd.zip |
Notes
Diffstat (limited to 'deskutils/calibre')
-rw-r--r-- | deskutils/calibre/Makefile | 23 | ||||
-rw-r--r-- | deskutils/calibre/distinfo | 4 | ||||
-rw-r--r-- | deskutils/calibre/files/patch-calibre_constants.py | 8 | ||||
-rw-r--r-- | deskutils/calibre/files/patch-calibre_linux.py | 17 | ||||
-rw-r--r-- | deskutils/calibre/files/patch-setup_extensions.py | 16 | ||||
-rw-r--r-- | deskutils/calibre/files/patch-setup_install.py | 11 | ||||
-rw-r--r-- | deskutils/calibre/pkg-plist | 103 |
7 files changed, 124 insertions, 58 deletions
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index a456156b377a..39a96df77d81 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 1.2.0 +PORTVERSION= 1.12.0 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -22,11 +22,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \ ${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 \ @@ -50,7 +50,10 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ USE_RC_SUBR= calibre EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f -USES= shared-mime-info +USES= desktop-file-utils shared-mime-info shebangfix +SHEBANG_FILES= src/calibre/ebooks/metadata/odt.py \ + src/calibre/utils/*.py \ + src/odf/*.py USE_XZ= yes USE_PYTHON= 2.7 USE_QT4= qmake_build moc_build @@ -64,21 +67,19 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ OVERRIDE_LDFLAGS="${LDFLAGS}" \ PODOFO_LIB_DIR="${LOCALBASE}/lib" \ PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ - WITH_USB=yes + WITH_USB=yes \ + XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share -NO_STAGE= yes do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} build) do-install: -.for dir in desktop-directories applications gnome/apps mime/packages icons/hicolor/128x128/apps zsh/site-functions - ${MKDIR} ${PREFIX}/share/${dir} +.for dir in bash-completion desktop-directories gnome/apps mime/packages icons/hicolor/128x128/apps zsh/site-functions + ${MKDIR} ${STAGEDIR}${PREFIX}/share/${dir} .endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ - ${PYSETUP} ${INSTALL} --prefix ${PREFIX}) - -post-install: - @${CAT} ${PKGMESSAGE} + ${PYSETUP} ${INSTALL} --prefix ${PREFIX} --staging-root ${STAGEDIR}${PREFIX}) .include <bsd.port.mk> diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 51f6f99bceba..24e51eea338c 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -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 --git a/deskutils/calibre/files/patch-calibre_constants.py b/deskutils/calibre/files/patch-calibre_constants.py index f7f86399cb2f..42cae01f5c16 100644 --- a/deskutils/calibre/files/patch-calibre_constants.py +++ b/deskutils/calibre/files/patch-calibre_constants.py @@ -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 --git a/deskutils/calibre/files/patch-calibre_linux.py b/deskutils/calibre/files/patch-calibre_linux.py new file mode 100644 index 000000000000..ff537f086c35 --- /dev/null +++ b/deskutils/calibre/files/patch-calibre_linux.py @@ -0,0 +1,17 @@ +--- src/calibre/linux.py.orig 2013-11-22 04:20:51.000000000 +0100 ++++ src/calibre/linux.py 2013-11-30 11:05:18.115881824 +0100 +@@ -700,9 +700,12 @@ + f.close() + des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', + 'calibre-ebook-viewer.desktop') ++ dtpdirs = ('gnome/apps', 'applications') + for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- cc(' '.join(cmd), shell=True) ++ for z in dtpdirs: ++ dest = os.path.join(self.opts.staging_root, 'share', z) ++ cmd = ['cp', './'+x, dest] ++ cc(' '.join(cmd), shell=True) + self.menu_resources.append(x) + cc(['xdg-desktop-menu', 'forceupdate']) + f = open('calibre-mimetypes.xml', 'wb') diff --git a/deskutils/calibre/files/patch-setup_extensions.py b/deskutils/calibre/files/patch-setup_extensions.py index 24aa94346d6b..e8a7a1aea166 100644 --- a/deskutils/calibre/files/patch-setup_extensions.py +++ b/deskutils/calibre/files/patch-setup_extensions.py @@ -1,20 +1,20 @@ ---- 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 diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py deleted file mode 100644 index ce8c5dd7faea..000000000000 --- a/deskutils/calibre/files/patch-setup_install.py +++ /dev/null @@ -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 --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index d43dce81b5b0..d28dedd07968 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -2,7 +2,6 @@ bin/calibre 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/lrfviewer 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/fonts.py 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/mssha1.py 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/pylrfopt.py 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/fenced_code.py 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/book.py 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/embed.py 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/edit_metadata.py 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.py 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/search_ui.py 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/beam_ebooks_de_plugin.py 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/waterstones_uk_plugin.py 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/__init__.py 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/dictionary.py 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/library/test.py 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.py 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/fonts/woff/__init__.py 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/titlecase.py 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/cherrypy/wsgiserver/wsgiserver3.py 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/inputstream.py 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/etree.py 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/thumbnail.py 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 @@ share/applications/calibre-lrfviewer.desktop %%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 @@ share/applications/calibre-lrfviewer.desktop %%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 @@ share/applications/calibre-lrfviewer.desktop %%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 @@ share/applications/calibre-lrfviewer.desktop %%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 @@ share/applications/calibre-lrfviewer.desktop %%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 @@ share/applications/calibre-lrfviewer.desktop %%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 @@ share/zsh/site-functions/_calibre @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 @@ share/zsh/site-functions/_calibre @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 @@ share/zsh/site-functions/_calibre @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 @@ share/zsh/site-functions/_calibre @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 @@ share/zsh/site-functions/_calibre @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 @@ -2102,4 +2162,3 @@ share/zsh/site-functions/_calibre @exec mkdir -p %D/share/icons/hicolor/128x128/apps @exec mkdir -p %D/share/gnome/apps @exec mkdir -p %D/share/desktop-directories -@exec mkdir -p %D/share/applications |