Date: Mon, 14 Dec 2015 13:52:11 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403723 - in head/deskutils/calibre: . files Message-ID: <201512141352.tBEDqBus003474@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Dec 14 13:52:11 2015 New Revision: 403723 URL: https://svnweb.freebsd.org/changeset/ports/403723 Log: - Update to 2.46.0 - Use new MASTER_SITE This new version depends on the new py-qt5 ports. Thanks to rakuco and Tobias Berner for helping me make it land in the ports tree! Also thanks to Kovid Goyal (calibre developer) for his suggestions on making new calibre releases work on FreeBSD. Added: head/deskutils/calibre/files/patch-resources_content__server_browse_browse.html (contents, props changed) - copied, changed from r403722, head/deskutils/calibre/files/patch-calibre_browse.html head/deskutils/calibre/files/patch-resources_content__server_index.html (contents, props changed) - copied, changed from r403722, head/deskutils/calibre/files/patch-calibre_index.html head/deskutils/calibre/files/patch-setup_build__environment.py (contents, props changed) head/deskutils/calibre/files/patch-src_calibre_library_server_content.py (contents, props changed) - copied, changed from r403722, head/deskutils/calibre/files/patch-calibre_content.py head/deskutils/calibre/files/patch-src_calibre_linux.py - copied, changed from r403722, head/deskutils/calibre/files/patch-calibre_linux.py Deleted: head/deskutils/calibre/files/patch-calibre_browse.html head/deskutils/calibre/files/patch-calibre_content.py head/deskutils/calibre/files/patch-calibre_index.html head/deskutils/calibre/files/patch-calibre_linux.py head/deskutils/calibre/files/patch-setup_extensions.py Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Mon Dec 14 13:48:24 2015 (r403722) +++ head/deskutils/calibre/Makefile Mon Dec 14 13:52:11 2015 (r403723) @@ -2,46 +2,50 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 1.48.0 -PORTREVISION= 9 +PORTVERSION= 2.46.0 CATEGORIES= deskutils python -MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ - libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \ + libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5 \ libwmflite.so:${PORTSDIR}/graphics/libwmf \ libchm.so:${PORTSDIR}/misc/chmlib \ libicudata.so:${PORTSDIR}/devel/icu \ - libpodofo.so:${PORTSDIR}/graphics/podofo + libpodofo.so:${PORTSDIR}/graphics/podofo \ + libmtp.so:${PORTSDIR}/multimedia/libmtp BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \ - ${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}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \ + ${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \ + ${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \ + ${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \ - ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/qt4-gui:patch + ${PYTHON_PKGNAMEPREFIX}psutil>=2.0.0:${PORTSDIR}/sysutils/py-psutil \ + ${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 \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \ - ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \ - ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \ - ${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \ - ${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml \ + ${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \ + ${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \ + ${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \ + ${PYTHON_PKGNAMEPREFIX}qt5-svg>=0:${PORTSDIR}/graphics/py-qt5-svg \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \ + ${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \ + ${PYTHON_PKGNAMEPREFIX}qt5-xmlpatterns>=0:${PORTSDIR}/textproc/py-qt5-xmlpatterns \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:${PORTSDIR}/net/py-netifaces \ ${PYTHON_PKGNAMEPREFIX}cssselect>=0:${PORTSDIR}/www/py-cssselect \ @@ -55,10 +59,8 @@ USES= desktop-file-utils pkgconfig pyth SHEBANG_FILES= src/calibre/ebooks/metadata/odt.py \ src/calibre/utils/*.py \ src/odf/*.py -USE_QT4= dbus qmake_build moc_build -USE_GNOME= gtk20 -INSTALLS_ICONS= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-src +USE_QT5= buildtools_build dbus qmake_build +WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ @@ -71,16 +73,13 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/incl CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ XDG_CONFIG_HOME=${WRKDIR}/xdg-config \ - XDG_UTILS_INSTALL_MODE=system + XDG_UTILS_INSTALL_MODE=system \ + QMAKE=${QMAKE} .include <bsd.port.pre.mk> -QTGUI_WRKSRC!= cd ${PORTSDIR}/x11-toolkits/qt4-gui && ${MAKE} -V WRKSRC - post-patch: @${FIND} ${WRKSRC}/resources/content_server -name "*.orig" -delete - @${REINPLACE_CMD} -e "/^qt_private_inc =/s|\[]|[ '${QTGUI_WRKSRC}/include/QtGui', '${QTGUI_WRKSRC}/include/QtCore' ]|" \ - ${WRKSRC}/setup/build_environment.py do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config @@ -88,15 +87,16 @@ do-build: ${PYSETUP} build) do-install: -.for dir in bash-completion gnome/apps mime/packages \ - icons/hicolor/128x128 zsh/site-functions - ${MKDIR} ${STAGEDIR}${PREFIX}/share/${dir} -.endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor \ + ${STAGEDIR}${PREFIX}/share/applications \ + ${STAGEDIR}${PREFIX}/share/desktop-directories \ + ${STAGEDIR}${PREFIX}/share/mime/packages (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} install --prefix ${PREFIX} \ --staging-root ${STAGEDIR}${PREFIX}) @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall + @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/* .include <bsd.port.post.mk> Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Mon Dec 14 13:48:24 2015 (r403722) +++ head/deskutils/calibre/distinfo Mon Dec 14 13:52:11 2015 (r403723) @@ -1,2 +1,2 @@ -SHA256 (calibre-1.48.0.tar.xz) = e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 -SIZE (calibre-1.48.0.tar.xz) = 35126680 +SHA256 (calibre-2.46.0.tar.xz) = 6b529b7893400cc07dbb2f76d3238bbe250ee5ac218dc7a135f4142eccbae145 +SIZE (calibre-2.46.0.tar.xz) = 38789944 Copied and modified: head/deskutils/calibre/files/patch-resources_content__server_browse_browse.html (from r403722, head/deskutils/calibre/files/patch-calibre_browse.html) ============================================================================== --- head/deskutils/calibre/files/patch-calibre_browse.html Mon Dec 14 13:48:24 2015 (r403722, copy source) +++ head/deskutils/calibre/files/patch-resources_content__server_browse_browse.html Mon Dec 14 13:52:11 2015 (r403723) @@ -1,15 +1,15 @@ ---- resources/content_server/browse/browse.html.orig 2014-07-18 13:16:04.000000000 -0500 -+++ resources/content_server/browse/browse.html 2014-07-18 13:17:42.000000000 -0500 -@@ -6,7 +6,7 @@ - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +--- resources/content_server/browse/browse.html.orig 2015-02-20 03:34:13 UTC ++++ resources/content_server/browse/browse.html +@@ -7,7 +7,7 @@ <title>..:: calibre {library} ::.. {title}</title> <meta http-equiv="X-UA-Compatible" content="IE=100" /> + <meta name="robots" content="noindex" /> - <link rel="icon" type="image/x-icon" href="http://calibre-ebook.com/favicon.ico" /> + <link rel="icon" type="image/x-icon" href="{prefix}/static/favicon.ico" /> <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" /> <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" /> -@@ -62,8 +62,6 @@ +@@ -63,8 +63,6 @@ <input type="image" src="{prefix}/static/button-donate.png" name="submit"></input> Copied and modified: head/deskutils/calibre/files/patch-resources_content__server_index.html (from r403722, head/deskutils/calibre/files/patch-calibre_index.html) ============================================================================== --- head/deskutils/calibre/files/patch-calibre_index.html Mon Dec 14 13:48:24 2015 (r403722, copy source) +++ head/deskutils/calibre/files/patch-resources_content__server_index.html Mon Dec 14 13:52:11 2015 (r403723) @@ -1,6 +1,12 @@ ---- resources/content_server/index.html.orig 2014-07-18 13:18:05.000000000 -0500 -+++ resources/content_server/index.html 2014-07-18 13:18:28.000000000 -0500 -@@ -8,7 +8,7 @@ +--- resources/content_server/index.html.orig 2015-02-20 03:34:13 UTC ++++ resources/content_server/index.html +@@ -1,4 +1,4 @@ +-<?xml version="1.0" encoding="UTF-8"?> ++<e?xml verson="1.0" encoding="UTF-8"?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">; + <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML 1.1" xml:lang="en"> + <head> +@@ -9,7 +9,7 @@ <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script> <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script> <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script> Added: head/deskutils/calibre/files/patch-setup_build__environment.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-setup_build__environment.py Mon Dec 14 13:52:11 2015 (r403723) @@ -0,0 +1,11 @@ +--- setup/build_environment.py.orig 2015-02-20 03:34:13 UTC ++++ setup/build_environment.py +@@ -101,7 +101,7 @@ def get_sip_dir(q): + if os.path.exists(os.path.join(base, 'QtWidgets')): + return base + raise EnvironmentError('Failed to find the location of the PyQt5 .sip files') +-pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'sip')) ++pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'py-sip')) + pyqt['sip_inc_dir'] = sysconfig.get_path('include') + + glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux else '' Copied and modified: head/deskutils/calibre/files/patch-src_calibre_library_server_content.py (from r403722, head/deskutils/calibre/files/patch-calibre_content.py) ============================================================================== --- head/deskutils/calibre/files/patch-calibre_content.py Mon Dec 14 13:48:24 2015 (r403722, copy source) +++ head/deskutils/calibre/files/patch-src_calibre_library_server_content.py Mon Dec 14 13:52:11 2015 (r403723) @@ -1,6 +1,6 @@ ---- src/calibre/library/server/content.py.orig 2014-07-18 13:13:33.000000000 -0500 -+++ src/calibre/library/server/content.py 2014-07-18 13:14:11.000000000 -0500 -@@ -111,6 +111,7 @@ +--- src/calibre/library/server/content.py.orig 2015-02-20 03:34:13 UTC ++++ src/calibre/library/server/content.py +@@ -111,6 +111,7 @@ class ContentServer(object): 'png' : 'image/png', 'gif' : 'image/gif', 'html' : 'text/html', Copied and modified: head/deskutils/calibre/files/patch-src_calibre_linux.py (from r403722, head/deskutils/calibre/files/patch-calibre_linux.py) ============================================================================== --- head/deskutils/calibre/files/patch-calibre_linux.py Mon Dec 14 13:48:24 2015 (r403722, copy source) +++ head/deskutils/calibre/files/patch-src_calibre_linux.py Mon Dec 14 13:52:11 2015 (r403723) @@ -1,27 +1,6 @@ ---- src/calibre/linux.py.orig 2014-08-08 03:21:35 UTC +--- src/calibre/linux.py.orig 2015-08-28 03:16:27 UTC +++ src/calibre/linux.py -@@ -831,6 +831,7 @@ class PostInstall: - f.close() - des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', - 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') -+ dtpdirs = ('gnome/apps', 'applications') - appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata') - if not os.path.exists(appdata): - try: -@@ -845,8 +846,10 @@ class PostInstall: - - APPDATA = get_appdata() - 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) - ak = x.partition('.')[0] - if ak in APPDATA and os.access(appdata, os.W_OK): -@@ -992,7 +995,7 @@ Name=E-book Viewer +@@ -997,7 +997,7 @@ Name=E-book Viewer GenericName=Viewer for E-books Comment=Viewer for E-books in all the major formats TryExec=ebook-viewer @@ -30,7 +9,7 @@ Icon=calibre-viewer Categories=Graphics;Viewer; ''' -@@ -1005,7 +1008,7 @@ Name=Edit E-book +@@ -1010,7 +1010,7 @@ Name=Edit E-book GenericName=Edit E-books Comment=Edit e-books in various formats TryExec=ebook-edit @@ -39,7 +18,7 @@ Icon=calibre-ebook-edit Categories=Office; ''' -@@ -1018,7 +1021,7 @@ Name=calibre +@@ -1023,7 +1023,7 @@ Name=calibre GenericName=E-book library management Comment=E-book library management: Convert, view, share, catalogue all your e-books TryExec=calibre Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Mon Dec 14 13:48:24 2015 (r403722) +++ head/deskutils/calibre/pkg-plist Mon Dec 14 13:52:11 2015 (r403723) @@ -18,7 +18,6 @@ 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 @@ -64,9 +63,6 @@ lib/calibre/calibre/devices/android/driv lib/calibre/calibre/devices/apple/__init__.py lib/calibre/calibre/devices/apple/driver.py lib/calibre/calibre/devices/apple/itunes.py -lib/calibre/calibre/devices/bambook/__init__.py -lib/calibre/calibre/devices/bambook/driver.py -lib/calibre/calibre/devices/bambook/libbambookcore.py lib/calibre/calibre/devices/binatone/__init__.py lib/calibre/calibre/devices/binatone/driver.py lib/calibre/calibre/devices/blackberry/__init__.py @@ -91,9 +87,9 @@ lib/calibre/calibre/devices/hanlin/__ini lib/calibre/calibre/devices/hanlin/driver.py lib/calibre/calibre/devices/hanvon/__init__.py lib/calibre/calibre/devices/hanvon/driver.py +lib/calibre/calibre/devices/idevice/__init__.py lib/calibre/calibre/devices/idevice/libimobiledevice.py lib/calibre/calibre/devices/idevice/parse_xml.py -lib/calibre/calibre/devices/idevice/__init__.py lib/calibre/calibre/devices/iliad/__init__.py lib/calibre/calibre/devices/iliad/driver.py lib/calibre/calibre/devices/interface.py @@ -180,6 +176,7 @@ lib/calibre/calibre/ebooks/conversion/pl lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py lib/calibre/calibre/ebooks/conversion/plugins/docx_input.py +lib/calibre/calibre/ebooks/conversion/plugins/docx_output.py lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py @@ -216,12 +213,12 @@ lib/calibre/calibre/ebooks/conversion/pl lib/calibre/calibre/ebooks/conversion/plumber.py lib/calibre/calibre/ebooks/conversion/preprocess.py lib/calibre/calibre/ebooks/conversion/utils.py +lib/calibre/calibre/ebooks/covers.py lib/calibre/calibre/ebooks/djvu/__init__.py lib/calibre/calibre/ebooks/djvu/djvu.py lib/calibre/calibre/ebooks/djvu/djvubzzdec.py -lib/calibre/calibre/ebooks/docx/names.py -lib/calibre/calibre/ebooks/docx/styles.py lib/calibre/calibre/ebooks/docx/__init__.py +lib/calibre/calibre/ebooks/docx/block_styles.py lib/calibre/calibre/ebooks/docx/char_styles.py lib/calibre/calibre/ebooks/docx/cleanup.py lib/calibre/calibre/ebooks/docx/container.py @@ -231,17 +228,29 @@ 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/index.py +lib/calibre/calibre/ebooks/docx/lcid.py +lib/calibre/calibre/ebooks/docx/names.py lib/calibre/calibre/ebooks/docx/numbering.py lib/calibre/calibre/ebooks/docx/settings.py +lib/calibre/calibre/ebooks/docx/styles.py lib/calibre/calibre/ebooks/docx/tables.py lib/calibre/calibre/ebooks/docx/theme.py lib/calibre/calibre/ebooks/docx/to_html.py lib/calibre/calibre/ebooks/docx/toc.py -lib/calibre/calibre/ebooks/docx/block_styles.py -lib/calibre/calibre/ebooks/docx/lcid.py lib/calibre/calibre/ebooks/docx/writer/__init__.py lib/calibre/calibre/ebooks/docx/writer/container.py +lib/calibre/calibre/ebooks/docx/writer/fonts.py +lib/calibre/calibre/ebooks/docx/writer/from_html.py +lib/calibre/calibre/ebooks/docx/writer/images.py +lib/calibre/calibre/ebooks/docx/writer/links.py +lib/calibre/calibre/ebooks/docx/writer/lists.py +lib/calibre/calibre/ebooks/docx/writer/styles.py +lib/calibre/calibre/ebooks/docx/writer/tables.py +lib/calibre/calibre/ebooks/docx/writer/utils.py lib/calibre/calibre/ebooks/epub/__init__.py +lib/calibre/calibre/ebooks/epub/cfi/__init__.py +lib/calibre/calibre/ebooks/epub/cfi/parse.py +lib/calibre/calibre/ebooks/epub/cfi/tests.py lib/calibre/calibre/ebooks/epub/pages.py lib/calibre/calibre/ebooks/epub/periodical.py lib/calibre/calibre/ebooks/fb2/__init__.py @@ -291,8 +300,8 @@ lib/calibre/calibre/ebooks/markdown/bloc lib/calibre/calibre/ebooks/markdown/blockprocessors.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/attr_list.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 @@ -330,6 +339,7 @@ lib/calibre/calibre/ebooks/metadata/haod lib/calibre/calibre/ebooks/metadata/html.py lib/calibre/calibre/ebooks/metadata/imp.py lib/calibre/calibre/ebooks/metadata/kdl.py +lib/calibre/calibre/ebooks/metadata/kfx.py lib/calibre/calibre/ebooks/metadata/library_thing.py lib/calibre/calibre/ebooks/metadata/lit.py lib/calibre/calibre/ebooks/metadata/lrx.py @@ -363,6 +373,7 @@ lib/calibre/calibre/ebooks/metadata/sour lib/calibre/calibre/ebooks/metadata/sources/prefs.py lib/calibre/calibre/ebooks/metadata/sources/test.py lib/calibre/calibre/ebooks/metadata/sources/worker.py +lib/calibre/calibre/ebooks/metadata/tag_mapper.py lib/calibre/calibre/ebooks/metadata/toc.py lib/calibre/calibre/ebooks/metadata/topaz.py lib/calibre/calibre/ebooks/metadata/txt.py @@ -416,7 +427,6 @@ lib/calibre/calibre/ebooks/oeb/display/w lib/calibre/calibre/ebooks/oeb/iterator/__init__.py 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 @@ -436,6 +446,7 @@ lib/calibre/calibre/ebooks/oeb/polish/cs lib/calibre/calibre/ebooks/oeb/polish/embed.py lib/calibre/calibre/ebooks/oeb/polish/errors.py lib/calibre/calibre/ebooks/oeb/polish/fonts.py +lib/calibre/calibre/ebooks/oeb/polish/images.py lib/calibre/calibre/ebooks/oeb/polish/import_book.py lib/calibre/calibre/ebooks/oeb/polish/jacket.py lib/calibre/calibre/ebooks/oeb/polish/main.py @@ -443,6 +454,7 @@ lib/calibre/calibre/ebooks/oeb/polish/op lib/calibre/calibre/ebooks/oeb/polish/parsing.py lib/calibre/calibre/ebooks/oeb/polish/pretty.py lib/calibre/calibre/ebooks/oeb/polish/replace.py +lib/calibre/calibre/ebooks/oeb/polish/report.py lib/calibre/calibre/ebooks/oeb/polish/spell.py lib/calibre/calibre/ebooks/oeb/polish/split.py lib/calibre/calibre/ebooks/oeb/polish/stats.py @@ -458,6 +470,7 @@ lib/calibre/calibre/ebooks/oeb/reader.py lib/calibre/calibre/ebooks/oeb/stylizer.py lib/calibre/calibre/ebooks/oeb/transforms/__init__.py lib/calibre/calibre/ebooks/oeb/transforms/cover.py +lib/calibre/calibre/ebooks/oeb/transforms/data_url.py lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py lib/calibre/calibre/ebooks/oeb/transforms/filenames.py lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py @@ -640,17 +653,16 @@ lib/calibre/calibre/gui2/actions/restart lib/calibre/calibre/gui2/actions/save_to_disk.py lib/calibre/calibre/gui2/actions/show_book_details.py lib/calibre/calibre/gui2/actions/show_quickview.py +lib/calibre/calibre/gui2/actions/show_template_tester.py lib/calibre/calibre/gui2/actions/similar_books.py lib/calibre/calibre/gui2/actions/sort.py lib/calibre/calibre/gui2/actions/store.py +lib/calibre/calibre/gui2/actions/tag_mapper.py lib/calibre/calibre/gui2/actions/toc_edit.py lib/calibre/calibre/gui2/actions/tweak_epub.py lib/calibre/calibre/gui2/actions/unpack_book.py lib/calibre/calibre/gui2/actions/view.py lib/calibre/calibre/gui2/add.py -lib/calibre/calibre/gui2/add_wizard/__init__.py -lib/calibre/calibre/gui2/add_wizard/scan_ui.py -lib/calibre/calibre/gui2/add_wizard/welcome_ui.py lib/calibre/calibre/gui2/auto_add.py lib/calibre/calibre/gui2/bars.py lib/calibre/calibre/gui2/book_details.py @@ -663,7 +675,6 @@ lib/calibre/calibre/gui2/catalog/catalog lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py lib/calibre/calibre/gui2/comments_editor.py -lib/calibre/calibre/gui2/complete.py lib/calibre/calibre/gui2/complete2.py lib/calibre/calibre/gui2/convert/__init__.py lib/calibre/calibre/gui2/convert/azw3_output.py @@ -675,6 +686,8 @@ lib/calibre/calibre/gui2/convert/debug.p lib/calibre/calibre/gui2/convert/debug_ui.py lib/calibre/calibre/gui2/convert/docx_input.py lib/calibre/calibre/gui2/convert/docx_input_ui.py +lib/calibre/calibre/gui2/convert/docx_output.py +lib/calibre/calibre/gui2/convert/docx_output_ui.py lib/calibre/calibre/gui2/convert/epub_output.py lib/calibre/calibre/gui2/convert/epub_output_ui.py lib/calibre/calibre/gui2/convert/fb2_input.py @@ -731,7 +744,16 @@ lib/calibre/calibre/gui2/convert/xexp_ed lib/calibre/calibre/gui2/convert/xpath_wizard.py lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py lib/calibre/calibre/gui2/cover_flow.py +lib/calibre/calibre/gui2/covers.py lib/calibre/calibre/gui2/custom_column_widgets.py +lib/calibre/calibre/gui2/dbus_export/__init__.py +lib/calibre/calibre/gui2/dbus_export/demo.py +lib/calibre/calibre/gui2/dbus_export/gtk.py +lib/calibre/calibre/gui2/dbus_export/menu.py +lib/calibre/calibre/gui2/dbus_export/menu2.py +lib/calibre/calibre/gui2/dbus_export/tray.py +lib/calibre/calibre/gui2/dbus_export/utils.py +lib/calibre/calibre/gui2/dbus_export/widgets.py lib/calibre/calibre/gui2/device.py lib/calibre/calibre/gui2/device_drivers/__init__.py lib/calibre/calibre/gui2/device_drivers/configwidget.py @@ -762,8 +784,10 @@ lib/calibre/calibre/gui2/dialogs/confirm lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py +lib/calibre/calibre/gui2/dialogs/confirm_merge.py lib/calibre/calibre/gui2/dialogs/conversion_error.py lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py +lib/calibre/calibre/gui2/dialogs/custom_recipes.py lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py lib/calibre/calibre/gui2/dialogs/device_category_editor.py @@ -811,13 +835,13 @@ lib/calibre/calibre/gui2/dialogs/templat lib/calibre/calibre/gui2/dialogs/template_line_editor.py lib/calibre/calibre/gui2/dialogs/test_email_ui.py lib/calibre/calibre/gui2/dialogs/trim_image.py -lib/calibre/calibre/gui2/dialogs/user_profiles.py lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py lib/calibre/calibre/gui2/dnd.py lib/calibre/calibre/gui2/ebook_download.py lib/calibre/calibre/gui2/email.py lib/calibre/calibre/gui2/filename_pattern_ui.py lib/calibre/calibre/gui2/font_family_chooser.py +lib/calibre/calibre/gui2/icon_theme.py lib/calibre/calibre/gui2/init.py lib/calibre/calibre/gui2/job_indicator.py lib/calibre/calibre/gui2/jobs.py @@ -848,6 +872,7 @@ lib/calibre/calibre/gui2/metadata/pdf_co lib/calibre/calibre/gui2/metadata/single.py lib/calibre/calibre/gui2/metadata/single_download.py lib/calibre/calibre/gui2/notify.py +lib/calibre/calibre/gui2/open_with.py lib/calibre/calibre/gui2/preferences/__init__.py lib/calibre/calibre/gui2/preferences/adding.py lib/calibre/calibre/gui2/preferences/adding_ui.py @@ -897,6 +922,7 @@ lib/calibre/calibre/gui2/preferences/twe lib/calibre/calibre/gui2/preferences/tweaks_ui.py lib/calibre/calibre/gui2/proceed.py lib/calibre/calibre/gui2/progress_indicator/__init__.py +lib/calibre/calibre/gui2/save.py lib/calibre/calibre/gui2/search_box.py lib/calibre/calibre/gui2/search_restriction_mixin.py lib/calibre/calibre/gui2/shortcuts.py @@ -929,7 +955,6 @@ lib/calibre/calibre/gui2/store/search/se 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 @@ -942,6 +967,8 @@ lib/calibre/calibre/gui2/store/stores/ba lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_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/bubok_portugal_plugin.py +lib/calibre/calibre/gui2/store/stores/bubok_publishing_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/ebook_nl_plugin.py @@ -995,6 +1022,7 @@ lib/calibre/calibre/gui2/tag_browser/__i lib/calibre/calibre/gui2/tag_browser/model.py lib/calibre/calibre/gui2/tag_browser/ui.py lib/calibre/calibre/gui2/tag_browser/view.py +lib/calibre/calibre/gui2/tag_mapper.py lib/calibre/calibre/gui2/threaded_jobs.py lib/calibre/calibre/gui2/throbber.py lib/calibre/calibre/gui2/toc/__init__.py @@ -1005,26 +1033,42 @@ lib/calibre/calibre/gui2/tweak_book/__in lib/calibre/calibre/gui2/tweak_book/boss.py lib/calibre/calibre/gui2/tweak_book/char_select.py lib/calibre/calibre/gui2/tweak_book/check.py +lib/calibre/calibre/gui2/tweak_book/check_links.py +lib/calibre/calibre/gui2/tweak_book/completion/__init__.py +lib/calibre/calibre/gui2/tweak_book/completion/basic.py +lib/calibre/calibre/gui2/tweak_book/completion/popup.py +lib/calibre/calibre/gui2/tweak_book/completion/utils.py +lib/calibre/calibre/gui2/tweak_book/completion/worker.py lib/calibre/calibre/gui2/tweak_book/diff/__init__.py lib/calibre/calibre/gui2/tweak_book/diff/highlight.py lib/calibre/calibre/gui2/tweak_book/diff/main.py lib/calibre/calibre/gui2/tweak_book/diff/view.py lib/calibre/calibre/gui2/tweak_book/editor/__init__.py lib/calibre/calibre/gui2/tweak_book/editor/canvas.py +lib/calibre/calibre/gui2/tweak_book/editor/comments.py lib/calibre/calibre/gui2/tweak_book/editor/help.py lib/calibre/calibre/gui2/tweak_book/editor/image.py lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py -lib/calibre/calibre/gui2/tweak_book/editor/smart/__init__.py -lib/calibre/calibre/gui2/tweak_book/editor/smart/css.py -lib/calibre/calibre/gui2/tweak_book/editor/smart/html.py +lib/calibre/calibre/gui2/tweak_book/editor/smarts/__init__.py +lib/calibre/calibre/gui2/tweak_book/editor/smarts/css.py +lib/calibre/calibre/gui2/tweak_book/editor/smarts/html.py +lib/calibre/calibre/gui2/tweak_book/editor/smarts/python.py +lib/calibre/calibre/gui2/tweak_book/editor/smarts/utils.py +lib/calibre/calibre/gui2/tweak_book/editor/snippets.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/css.py lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/javascript.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/pygments_highlighter.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/python.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/utils.py +lib/calibre/calibre/gui2/tweak_book/editor/syntax/xml.py lib/calibre/calibre/gui2/tweak_book/editor/text.py lib/calibre/calibre/gui2/tweak_book/editor/themes.py lib/calibre/calibre/gui2/tweak_book/editor/widget.py lib/calibre/calibre/gui2/tweak_book/file_list.py +lib/calibre/calibre/gui2/tweak_book/function_replace.py lib/calibre/calibre/gui2/tweak_book/job.py lib/calibre/calibre/gui2/tweak_book/live_css.py lib/calibre/calibre/gui2/tweak_book/main.py @@ -1033,6 +1077,7 @@ lib/calibre/calibre/gui2/tweak_book/plug lib/calibre/calibre/gui2/tweak_book/polish.py lib/calibre/calibre/gui2/tweak_book/preferences.py lib/calibre/calibre/gui2/tweak_book/preview.py +lib/calibre/calibre/gui2/tweak_book/reports.py lib/calibre/calibre/gui2/tweak_book/save.py lib/calibre/calibre/gui2/tweak_book/search.py lib/calibre/calibre/gui2/tweak_book/spell.py @@ -1049,6 +1094,7 @@ lib/calibre/calibre/gui2/viewer/config.p lib/calibre/calibre/gui2/viewer/config_ui.py lib/calibre/calibre/gui2/viewer/documentview.py lib/calibre/calibre/gui2/viewer/flip.py +lib/calibre/calibre/gui2/viewer/footnote.py lib/calibre/calibre/gui2/viewer/gestures.py lib/calibre/calibre/gui2/viewer/image_popup.py lib/calibre/calibre/gui2/viewer/inspector.py @@ -1070,6 +1116,7 @@ lib/calibre/calibre/gui2/wizard/library_ lib/calibre/calibre/gui2/wizard/send_email.py lib/calibre/calibre/gui2/wizard/send_email_ui.py lib/calibre/calibre/gui2/wizard/stanza_ui.py +lib/calibre/calibre/gui_launch.py lib/calibre/calibre/library/__init__.py lib/calibre/calibre/library/add_to_library.py lib/calibre/calibre/library/caches.py @@ -1087,7 +1134,6 @@ lib/calibre/calibre/library/custom_colum lib/calibre/calibre/library/database.py lib/calibre/calibre/library/database2.py lib/calibre/calibre/library/field_metadata.py -lib/calibre/calibre/library/move.py lib/calibre/calibre/library/prefs.py lib/calibre/calibre/library/restore.py lib/calibre/calibre/library/save_to_disk.py @@ -1106,22 +1152,25 @@ lib/calibre/calibre/library/server/xml.p lib/calibre/calibre/library/sqlite.py 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/_patiencediff_c.so lib/calibre/calibre/plugins/_regex.so lib/calibre/calibre/plugins/bzzdec.so lib/calibre/calibre/plugins/cPalmdoc.so -lib/calibre/calibre/plugins/calibre_style.so +lib/calibre/calibre/plugins/certgen.so lib/calibre/calibre/plugins/chm_extra.so lib/calibre/calibre/plugins/chmlib.so +lib/calibre/calibre/plugins/dukpy.so lib/calibre/calibre/plugins/freetype.so lib/calibre/calibre/plugins/html.so lib/calibre/calibre/plugins/hunspell.so lib/calibre/calibre/plugins/icu.so +lib/calibre/calibre/plugins/libheadless.so +lib/calibre/calibre/plugins/lzma_binding.so lib/calibre/calibre/plugins/lzx.so lib/calibre/calibre/plugins/magick.so lib/calibre/calibre/plugins/matcher.so +lib/calibre/calibre/plugins/monotonic.so lib/calibre/calibre/plugins/msdes.so lib/calibre/calibre/plugins/pictureflow.so lib/calibre/calibre/plugins/podofo.so @@ -1131,13 +1180,45 @@ lib/calibre/calibre/plugins/speedup.so lib/calibre/calibre/plugins/sqlite_custom.so lib/calibre/calibre/plugins/tokenizer.so lib/calibre/calibre/plugins/unrar.so -lib/calibre/calibre/plugins/woff.so +lib/calibre/calibre/plugins/z%%QT_LIBDIR%%2.so lib/calibre/calibre/ptempfile.py lib/calibre/calibre/rpdb.py lib/calibre/calibre/spell/__init__.py lib/calibre/calibre/spell/break_iterator.py lib/calibre/calibre/spell/dictionary.py lib/calibre/calibre/spell/import_from.py +lib/calibre/calibre/srv/__init__.py +lib/calibre/calibre/srv/ajax.py +lib/calibre/calibre/srv/auth.py +lib/calibre/calibre/srv/auto_reload.py +lib/calibre/calibre/srv/bonjour.py +lib/calibre/calibre/srv/code.py +lib/calibre/calibre/srv/content.py +lib/calibre/calibre/srv/errors.py +lib/calibre/calibre/srv/handler.py +lib/calibre/calibre/srv/http_request.py +lib/calibre/calibre/srv/http_response.py +lib/calibre/calibre/srv/loop.py +lib/calibre/calibre/srv/metadata.py +lib/calibre/calibre/srv/opts.py +lib/calibre/calibre/srv/pool.py +lib/calibre/calibre/srv/pre_activated.py +lib/calibre/calibre/srv/routes.py +lib/calibre/calibre/srv/sendfile.py +lib/calibre/calibre/srv/standalone.py +lib/calibre/calibre/srv/tests/__init__.py +lib/calibre/calibre/srv/tests/ajax.py +lib/calibre/calibre/srv/tests/auth.py +lib/calibre/calibre/srv/tests/base.py +lib/calibre/calibre/srv/tests/content.py +lib/calibre/calibre/srv/tests/http.py +lib/calibre/calibre/srv/tests/loop.py +lib/calibre/calibre/srv/tests/main.py +lib/calibre/calibre/srv/tests/routes.py +lib/calibre/calibre/srv/tests/web_sockets.py +lib/calibre/calibre/srv/users.py +lib/calibre/calibre/srv/utils.py +lib/calibre/calibre/srv/web_socket.py lib/calibre/calibre/startup.py lib/calibre/calibre/test_build.py lib/calibre/calibre/translations/__init__.py @@ -1148,6 +1229,7 @@ lib/calibre/calibre/utils/__init__.py lib/calibre/calibre/utils/apsw_shell.py lib/calibre/calibre/utils/bibtex.py lib/calibre/calibre/utils/browser.py +lib/calibre/calibre/utils/certgen.py lib/calibre/calibre/utils/chm/__init__.py lib/calibre/calibre/utils/chm/chm.py lib/calibre/calibre/utils/chm/chmlib.py @@ -1156,7 +1238,9 @@ lib/calibre/calibre/utils/complete.py lib/calibre/calibre/utils/config.py lib/calibre/calibre/utils/config_base.py lib/calibre/calibre/utils/date.py +lib/calibre/calibre/utils/dbus_service.py lib/calibre/calibre/utils/file_associations.py +lib/calibre/calibre/utils/file_type_icons.py lib/calibre/calibre/utils/filenames.py lib/calibre/calibre/utils/fonts/__init__.py lib/calibre/calibre/utils/fonts/free_type.py @@ -1182,17 +1266,19 @@ lib/calibre/calibre/utils/fonts/sfnt/met lib/calibre/calibre/utils/fonts/sfnt/subset.py lib/calibre/calibre/utils/fonts/utils.py lib/calibre/calibre/utils/fonts/win_fonts.py -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/https.py lib/calibre/calibre/utils/icu.py lib/calibre/calibre/utils/icu_test.py +lib/calibre/calibre/utils/img.py lib/calibre/calibre/utils/imghdr.py +lib/calibre/calibre/utils/inotify.py lib/calibre/calibre/utils/ipc/__init__.py lib/calibre/calibre/utils/ipc/job.py lib/calibre/calibre/utils/ipc/launch.py +lib/calibre/calibre/utils/ipc/pool.py lib/calibre/calibre/utils/ipc/proxy.py lib/calibre/calibre/utils/ipc/server.py lib/calibre/calibre/utils/ipc/simple_worker.py @@ -1203,6 +1289,7 @@ lib/calibre/calibre/utils/localization.p lib/calibre/calibre/utils/localunzip.py lib/calibre/calibre/utils/lock.py lib/calibre/calibre/utils/logging.py +lib/calibre/calibre/utils/lru_cache.py lib/calibre/calibre/utils/magick/__init__.py lib/calibre/calibre/utils/magick/draw.py lib/calibre/calibre/utils/magick/generate.py @@ -1212,13 +1299,15 @@ lib/calibre/calibre/utils/mem.py lib/calibre/calibre/utils/monotonic.py lib/calibre/calibre/utils/mreplace.py lib/calibre/calibre/utils/network.py +lib/calibre/calibre/utils/open_with/__init__.py +lib/calibre/calibre/utils/open_with/linux.py +lib/calibre/calibre/utils/open_with/osx.py +lib/calibre/calibre/utils/open_with/windows.py lib/calibre/calibre/utils/opensearch/__init__.py lib/calibre/calibre/utils/opensearch/description.py lib/calibre/calibre/utils/opensearch/query.py lib/calibre/calibre/utils/opensearch/url.py lib/calibre/calibre/utils/ordered_dict.py -lib/calibre/calibre/utils/osx_symlinks.py -lib/calibre/calibre/utils/pdftk.py lib/calibre/calibre/utils/podofo/__init__.py lib/calibre/calibre/utils/pyconsole/__init__.py lib/calibre/calibre/utils/pyconsole/console.py @@ -1228,12 +1317,15 @@ lib/calibre/calibre/utils/pyconsole/hist lib/calibre/calibre/utils/pyconsole/interpreter.py lib/calibre/calibre/utils/pyconsole/main.py lib/calibre/calibre/utils/pyparsing.py +lib/calibre/calibre/utils/rapydscript.py lib/calibre/calibre/utils/recycle_bin.py lib/calibre/calibre/utils/resources.py lib/calibre/calibre/utils/rss_gen.py lib/calibre/calibre/utils/search_query_parser.py lib/calibre/calibre/utils/serve_coffee.py lib/calibre/calibre/utils/sftp.py +lib/calibre/calibre/utils/shared_file.py +lib/calibre/calibre/utils/short_uuid.py lib/calibre/calibre/utils/smartypants.py lib/calibre/calibre/utils/smtp.py lib/calibre/calibre/utils/smtplib.py @@ -1246,6 +1338,10 @@ lib/calibre/calibre/utils/threadpool.py lib/calibre/calibre/utils/titlecase.py lib/calibre/calibre/utils/unrar.py lib/calibre/calibre/utils/unsmarten.py +lib/calibre/calibre/utils/winreg/__init__.py +lib/calibre/calibre/utils/winreg/dde.py +lib/calibre/calibre/utils/winreg/default_programs.py +lib/calibre/calibre/utils/winreg/lib.py lib/calibre/calibre/utils/wmf/__init__.py lib/calibre/calibre/utils/wmf/emf.py lib/calibre/calibre/utils/wmf/parse.py @@ -1351,11 +1447,19 @@ lib/calibre/cherrypy/wsgiserver/ssl_buil lib/calibre/cherrypy/wsgiserver/ssl_pyopenssl.py lib/calibre/cherrypy/wsgiserver/wsgiserver2.py lib/calibre/cherrypy/wsgiserver/wsgiserver3.py +lib/calibre/css_selectors/__init__.py +lib/calibre/css_selectors/errors.py +lib/calibre/css_selectors/ordered_set.py +lib/calibre/css_selectors/parser.py +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/alphabeticalattributes.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 @@ -1384,9 +1488,13 @@ lib/calibre/html5lib/treewalkers/lxmletr lib/calibre/html5lib/treewalkers/pulldom.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/trie/py.py lib/calibre/html5lib/utils.py +lib/calibre/lzma/__init__.py +lib/calibre/lzma/errors.py +lib/calibre/lzma/lzma1.py +lib/calibre/lzma/xz.py lib/calibre/odf/__init__.py lib/calibre/odf/anim.py lib/calibre/odf/attrconverters.py @@ -1421,7 +1529,6 @@ lib/calibre/odf/text.py 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 @@ -1453,13 +1560,6 @@ lib/calibre/tinycss/token_data.py lib/calibre/tinycss/tokenizer.py lib/calibre/tinycss/version.py %%PYTHON_SITELIBDIR%%/init_calibre.py -share/appdata/calibre-ebook-edit.appdata.xml -share/appdata/calibre-ebook-viewer.appdata.xml -share/appdata/calibre-gui.appdata.xml -share/applications/calibre-ebook-edit.desktop -share/applications/calibre-ebook-viewer.desktop -share/applications/calibre-gui.desktop -share/applications/calibre-lrfviewer.desktop %%DATADIR%%/builtin_recipes.xml %%DATADIR%%/builtin_recipes.zip %%DATADIR%%/calibre-ebook-root-CA.crt @@ -1471,7 +1571,20 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/catalog/section_list_templates.py %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml +%%DATADIR%%/coffee-script.js %%DATADIR%%/compiled_coffeescript.zip +%%DATADIR%%/content-server/autoreload.js +%%DATADIR%%/content-server/empty.html +%%DATADIR%%/content-server/font-awesome/FontAwesome.otf +%%DATADIR%%/content-server/font-awesome/fa.css +%%DATADIR%%/content-server/font-awesome/fontawesome-webfont.eot +%%DATADIR%%/content-server/font-awesome/fontawesome-webfont.svg +%%DATADIR%%/content-server/font-awesome/fontawesome-webfont.ttf +%%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff +%%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff2 +%%DATADIR%%/content-server/index.html +%%DATADIR%%/content-server/main.js +%%DATADIR%%/content-server/reset.css %%DATADIR%%/content_server/av.jpg %%DATADIR%%/content_server/bg_search_box.png %%DATADIR%%/content_server/browse/browse.css @@ -1532,6 +1645,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/dictionaries/es-ES/es-ES.dic %%DATADIR%%/dictionaries/es-ES/locales %%DATADIR%%/ebook-convert-complete.pickle +%%DATADIR%%/editor-functions.json %%DATADIR%%/editor-help/css.json %%DATADIR%%/editor-help/html.json %%DATADIR%%/editor-help/mathml.json @@ -1569,11 +1683,13 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/clear_left.png %%DATADIR%%/images/code.png %%DATADIR%%/images/column.png +%%DATADIR%%/images/compress-image.png %%DATADIR%%/images/config.png %%DATADIR%%/images/connect_share.png %%DATADIR%%/images/connect_share_on.png %%DATADIR%%/images/console.png %%DATADIR%%/images/convert.png +%%DATADIR%%/images/copy-to-library.png %%DATADIR%%/images/cover_flow.png %%DATADIR%%/images/cover_texture.png %%DATADIR%%/images/debug.png @@ -1600,6 +1716,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/donate.png %%DATADIR%%/images/dot_green.png %%DATADIR%%/images/dot_red.png +%%DATADIR%%/images/download-metadata.png %%DATADIR%%/images/drawer.png %%DATADIR%%/images/drm-locked.png %%DATADIR%%/images/drm-unlocked.png @@ -1720,12 +1837,12 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/plusplus.png %%DATADIR%%/images/polish.png %%DATADIR%%/images/previous.png -%%DATADIR%%/images/print-preview.png %%DATADIR%%/images/print.png %%DATADIR%%/images/publisher.png %%DATADIR%%/images/random.png %%DATADIR%%/images/rating.png %%DATADIR%%/images/reader.png +%%DATADIR%%/images/reports.png %%DATADIR%%/images/resize.png %%DATADIR%%/images/rotate-right.png %%DATADIR%%/images/save.png @@ -1738,6 +1855,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/search_delete_saved.png %%DATADIR%%/images/series.png %%DATADIR%%/images/smarten-punctuation.png +%%DATADIR%%/images/snippets.png %%DATADIR%%/images/spell-check.png %%DATADIR%%/images/store.png %%DATADIR%%/images/subset-fonts.png @@ -1780,6 +1898,14 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/quick_start/deu.epub %%DATADIR%%/quick_start/eng.epub %%DATADIR%%/quick_start/fra.epub +%%DATADIR%%/quick_start/ita.epub +%%DATADIR%%/rapydscript/compiler.js.xz +%%DATADIR%%/rapydscript/lib/elementmaker.pyj +%%DATADIR%%/rapydscript/lib/gettext.pyj +%%DATADIR%%/rapydscript/lib/math.pyj +%%DATADIR%%/rapydscript/lib/operator.pyj +%%DATADIR%%/rapydscript/lib/random.pyj +%%DATADIR%%/rapydscript/lib/re.pyj %%DATADIR%%/scripts.pickle %%DATADIR%%/template-functions.json %%DATADIR%%/templates/book_details.css @@ -1788,9 +1914,12 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/templates/html_export_default.css %%DATADIR%%/templates/html_export_default.tmpl %%DATADIR%%/templates/html_export_default_index.tmpl +%%DATADIR%%/templates/inline_toc_styles.css %%DATADIR%%/templates/lrf.xsl +%%DATADIR%%/templates/new_book.html %%DATADIR%%/templates/rtf.xsl %%DATADIR%%/tracer.epub +%%DATADIR%%/user-manual-translation-stats.json %%DATADIR%%/viewer/blank.html %%DATADIR%%/viewer/bookmarks.js %%DATADIR%%/viewer/hyphenate/Hyphenator.js @@ -1991,10 +2120,16 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js %%DATADIR%%/viewer/referencing.js share/bash-completion/completions/calibre -share/gnome/apps/calibre-ebook-edit.desktop -share/gnome/apps/calibre-ebook-viewer.desktop -share/gnome/apps/calibre-gui.desktop -share/gnome/apps/calibre-lrfviewer.desktop +share/appdata/calibre-ebook-edit.appdata.xml +share/appdata/calibre-ebook-viewer.appdata.xml +share/appdata/calibre-gui.appdata.xml +share/applications/calibre-ebook-edit.desktop +share/applications/calibre-ebook-viewer.desktop +share/applications/calibre-gui.desktop +share/applications/calibre-lrfviewer.desktop +share/icons/hicolor/128x128/apps/calibre-ebook-edit.png +share/icons/hicolor/128x128/apps/calibre-gui.png +share/icons/hicolor/128x128/apps/calibre-viewer.png share/icons/hicolor/128x128/mimetypes/application-lrf.png share/icons/hicolor/128x128/mimetypes/application-x-kindle-application.png share/icons/hicolor/128x128/mimetypes/application-x-mobi8-ebook.png @@ -2007,9 +2142,81 @@ share/icons/hicolor/128x128/mimetypes/gn share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-topaz-ebook.png share/icons/hicolor/128x128/mimetypes/gnome-mime-text-lrs.png share/icons/hicolor/128x128/mimetypes/text-lrs.png +share/icons/hicolor/16x16/apps/calibre-ebook-edit.png +share/icons/hicolor/16x16/apps/calibre-gui.png +share/icons/hicolor/16x16/apps/calibre-viewer.png +share/icons/hicolor/16x16/mimetypes/application-lrf.png +share/icons/hicolor/16x16/mimetypes/application-x-kindle-application.png +share/icons/hicolor/16x16/mimetypes/application-x-mobi8-ebook.png +share/icons/hicolor/16x16/mimetypes/application-x-mobipocket-ebook.png +share/icons/hicolor/16x16/mimetypes/application-x-topaz-ebook.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-application-lrf.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-kindle-application.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-mobi8-ebook.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-mobipocket-ebook.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-topaz-ebook.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-text-lrs.png +share/icons/hicolor/16x16/mimetypes/text-lrs.png share/icons/hicolor/256x256/apps/calibre-ebook-edit.png share/icons/hicolor/256x256/apps/calibre-gui.png share/icons/hicolor/256x256/apps/calibre-viewer.png +share/icons/hicolor/256x256/mimetypes/application-lrf.png +share/icons/hicolor/256x256/mimetypes/application-x-kindle-application.png +share/icons/hicolor/256x256/mimetypes/application-x-mobi8-ebook.png +share/icons/hicolor/256x256/mimetypes/application-x-mobipocket-ebook.png +share/icons/hicolor/256x256/mimetypes/application-x-topaz-ebook.png +share/icons/hicolor/256x256/mimetypes/gnome-mime-application-lrf.png +share/icons/hicolor/256x256/mimetypes/gnome-mime-application-x-kindle-application.png +share/icons/hicolor/256x256/mimetypes/gnome-mime-application-x-mobi8-ebook.png +share/icons/hicolor/256x256/mimetypes/gnome-mime-application-x-mobipocket-ebook.png +share/icons/hicolor/256x256/mimetypes/gnome-mime-application-x-topaz-ebook.png +share/icons/hicolor/256x256/mimetypes/gnome-mime-text-lrs.png +share/icons/hicolor/256x256/mimetypes/text-lrs.png +share/icons/hicolor/32x32/apps/calibre-ebook-edit.png +share/icons/hicolor/32x32/apps/calibre-gui.png +share/icons/hicolor/32x32/apps/calibre-viewer.png +share/icons/hicolor/32x32/mimetypes/application-lrf.png +share/icons/hicolor/32x32/mimetypes/application-x-kindle-application.png +share/icons/hicolor/32x32/mimetypes/application-x-mobi8-ebook.png +share/icons/hicolor/32x32/mimetypes/application-x-mobipocket-ebook.png +share/icons/hicolor/32x32/mimetypes/application-x-topaz-ebook.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-application-lrf.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-kindle-application.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-mobi8-ebook.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-mobipocket-ebook.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-topaz-ebook.png +share/icons/hicolor/32x32/mimetypes/gnome-mime-text-lrs.png +share/icons/hicolor/32x32/mimetypes/text-lrs.png +share/icons/hicolor/48x48/apps/calibre-ebook-edit.png +share/icons/hicolor/48x48/apps/calibre-gui.png +share/icons/hicolor/48x48/apps/calibre-viewer.png +share/icons/hicolor/48x48/mimetypes/application-lrf.png +share/icons/hicolor/48x48/mimetypes/application-x-kindle-application.png +share/icons/hicolor/48x48/mimetypes/application-x-mobi8-ebook.png +share/icons/hicolor/48x48/mimetypes/application-x-mobipocket-ebook.png +share/icons/hicolor/48x48/mimetypes/application-x-topaz-ebook.png +share/icons/hicolor/48x48/mimetypes/gnome-mime-application-lrf.png +share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-kindle-application.png +share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-mobi8-ebook.png +share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-mobipocket-ebook.png *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512141352.tBEDqBus003474>