pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/calibre Update to 0.8.48.
details: https://anonhg.NetBSD.org/pkgsrc/rev/be144c561be8
branches: trunk
changeset: 602923:be144c561be8
user: gls <gls%pkgsrc.org@localhost>
date: Sun Apr 22 19:33:01 2012 +0000
description:
Update to 0.8.48.
pkgsrc changes:
---------------
Add a patch from Neil Booth to fix PLIST.
Should fix part of pkg/46331.
Upstream changes:
-----------------
Way too long CHANGELOG to list here.
Highlights from upstream are:
E-book viewer: A whole new full screen mode. [0.8.44]
-----------------------------------------------------
Closes tickets: 959830 [External link]
The new mode has no toolbars to distract from the text and the ability to set
the width of the column of text via Preferences in the ebook viewer. Click the
Fullscreen button on the toolbar in the viewer to enter fullscreen mode (or
press the F11 or Ctrl+Shit+F keys)
Support for reading Amazon's new KF8 format [0.8.42]
----------------------------------------------------
calibre can now both view and convert MOBI files that contain Amazon's new KF8
(Kindle Fire) format
Complete changelog is here: http://calibre-ebook.com/whats-new
`
diffstat:
misc/calibre/Makefile | 191 +++++++------
misc/calibre/PLIST | 80 +++++-
misc/calibre/distinfo | 13 +-
misc/calibre/patches/patch-src_calibre_constants.py | 16 +
misc/calibre/patches/patch-src_calibre_devices_scanner.py | 4 +-
misc/calibre/patches/patch-src_calibre_linux_py | 147 +++++-----
6 files changed, 274 insertions(+), 177 deletions(-)
diffs (truncated from 898 to 300 lines):
diff -r cb0749ced4ff -r be144c561be8 misc/calibre/Makefile
--- a/misc/calibre/Makefile Sun Apr 22 19:08:03 2012 +0000
+++ b/misc/calibre/Makefile Sun Apr 22 19:33:01 2012 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2012/03/09 12:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2012/04/22 19:33:01 gls Exp $
#
-DISTNAME= calibre-0.8.39
-PKGREVISION= 2
+DISTNAME= calibre-0.8.48
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
EXTRACT_SUFX= .tar.xz
@@ -42,96 +41,100 @@
INSTALLATION_DIRS= share/icons
INSTALLATION_DIRS= share/calibre/recipes
-FIX_PYTHON+= recipes/*.recipe
-FIX_PYTHON+= resources/catalog/*.py
-FIX_PYTHON+= resources/*.py
-FIX_PYTHON+= *.py
-FIX_PYTHON+= setup/*.py
-FIX_PYTHON+= setup/installer/*.py
-FIX_PYTHON+= setup/installer/linux/*.py
-FIX_PYTHON+= setup/installer/osx/*.py
-FIX_PYTHON+= setup/installer/osx/app/*.py
-FIX_PYTHON+= setup/installer/windows/*.py
-FIX_PYTHON+= src/calibre/*.py
-FIX_PYTHON+= src/calibre/customize/*.py
-FIX_PYTHON+= src/calibre/db/*.py
-FIX_PYTHON+= src/calibre/db/tests/*.py
-FIX_PYTHON+= src/calibre/devices/*.py
-FIX_PYTHON+= src/calibre/devices/android/*.py
-FIX_PYTHON+= src/calibre/devices/eslick/*.py
-FIX_PYTHON+= src/calibre/devices/folder_device/*.py
-FIX_PYTHON+= src/calibre/devices/iriver/*.py
-FIX_PYTHON+= src/calibre/devices/kobo/*.py
-FIX_PYTHON+= src/calibre/devices/prs505/*.py
-FIX_PYTHON+= src/calibre/devices/prst1/*.py
-FIX_PYTHON+= src/calibre/devices/teclast/*.py
-FIX_PYTHON+= src/calibre/ebooks/*.py
-FIX_PYTHON+= src/calibre/ebooks/chm/*.py
-FIX_PYTHON+= src/calibre/ebooks/comic/*.py
-FIX_PYTHON+= src/calibre/ebooks/compression/*.py
-FIX_PYTHON+= src/calibre/ebooks/conversion/*.py
-FIX_PYTHON+= src/calibre/ebooks/conversion/plugins/*.py
-FIX_PYTHON+= src/calibre/ebooks/djvu/*.py
-FIX_PYTHON+= src/calibre/ebooks/epub/fix/*.py
-FIX_PYTHON+= src/calibre/ebooks/epub/*.py
-FIX_PYTHON+= src/calibre/ebooks/html/*.py
-FIX_PYTHON+= src/calibre/ebooks/iterator/*.py
-FIX_PYTHON+= src/calibre/ebooks/lit/*.py
-FIX_PYTHON+= src/calibre/ebooks/lrf/html/*.py
-FIX_PYTHON+= src/calibre/ebooks/lrf/*.py
-FIX_PYTHON+= src/calibre/ebooks/lrf/pylrs/*.py
-FIX_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py
-FIX_PYTHON+= src/calibre/ebooks/metadata/*.py
-FIX_PYTHON+= src/calibre/ebooks/metadata/book/*.py
-FIX_PYTHON+= src/calibre/ebooks/metadata/book/*.py
-FIX_PYTHON+= src/calibre/ebooks/metadata/sources/*.py
-FIX_PYTHON+= src/calibre/ebooks/mobi/*.py
-FIX_PYTHON+= src/calibre/ebooks/mobi/writer2/*.py
-FIX_PYTHON+= src/calibre/ebooks/odt/__init__.py
-FIX_PYTHON+= src/calibre/ebooks/oeb/*.py
-FIX_PYTHON+= src/calibre/ebooks/oeb/display/test-cfi/*.py
-FIX_PYTHON+= src/calibre/ebooks/oeb/transforms/*.py
-FIX_PYTHON+= src/calibre/ebooks/pdf/__init__.py
-FIX_PYTHON+= src/calibre/ebooks/pdf/reflow.py
-FIX_PYTHON+= src/calibre/ebooks/readability/*.py
-FIX_PYTHON+= src/calibre/ebooks/rtf/*.py
-FIX_PYTHON+= src/calibre/ebooks/rtf2xml/*.py
-FIX_PYTHON+= src/calibre/ebooks/snb/*.py
-FIX_PYTHON+= src/calibre/ebooks/textile/*.py
-FIX_PYTHON+= src/calibre/ebooks/txt/*.py
-FIX_PYTHON+= src/calibre/gui2/*.py
-FIX_PYTHON+= src/calibre/gui2/actions/*.py
-FIX_PYTHON+= src/calibre/gui2/add_wizard/*.py
-FIX_PYTHON+= src/calibre/gui2/catalog/*.py
-FIX_PYTHON+= src/calibre/gui2/convert/*.py
-FIX_PYTHON+= src/calibre/gui2/dialogs/*.py
-FIX_PYTHON+= src/calibre/gui2/library/*.py
-FIX_PYTHON+= src/calibre/gui2/metadata/*.py
-FIX_PYTHON+= src/calibre/gui2/preferences/*.py
-FIX_PYTHON+= src/calibre/gui2/progress_indicator/*.py
-FIX_PYTHON+= src/calibre/gui2/tag_browser/*.py
-FIX_PYTHON+= src/calibre/gui2/viewer/*.py
-FIX_PYTHON+= src/calibre/gui2/wizard/*.py
-FIX_PYTHON+= src/calibre/library/*.py
-FIX_PYTHON+= src/calibre/library/catalogs/*.py
-FIX_PYTHON+= src/calibre/library/server/*.py
-FIX_PYTHON+= src/calibre/manual/*.py
-FIX_PYTHON+= src/calibre/manual/plugin_examples/helloworld/*.py
-FIX_PYTHON+= src/calibre/manual/plugin_examples/interface_demo/*.py
-FIX_PYTHON+= src/calibre/trac/*.py
-FIX_PYTHON+= src/calibre/translations/*.py
-FIX_PYTHON+= src/calibre/utils/*.py
-FIX_PYTHON+= src/calibre/utils/fonts/*.py
-FIX_PYTHON+= src/calibre/utils/ipc/*.py
-FIX_PYTHON+= src/calibre/utils/magick/*.py
-FIX_PYTHON+= src/calibre/utils/podofo/*.py
-FIX_PYTHON+= src/calibre/utils/pyconsole/*.py
-FIX_PYTHON+= src/calibre/utils/wmf/*.py
-FIX_PYTHON+= src/calibre/web/feeds/*.py
-FIX_PYTHON+= src/calibre/web/feeds/recipes/*.py
-FIX_PYTHON+= src/calibre/web/fetch/*.py
-FIX_PYTHON+= src/calibre/web/jsbrowser/*.py
-FIX_PYTHON+= src/templite/*.py
+FIX_PYTHON_PATHS+= recipes/*.recipe
+FIX_PYTHON_PATHS+= resources/catalog/*.py
+FIX_PYTHON_PATHS+= resources/*.py
+FIX_PYTHON_PATHS+= *.py
+FIX_PYTHON_PATHS+= setup/*.py
+FIX_PYTHON_PATHS+= setup/installer/*.py
+FIX_PYTHON_PATHS+= setup/installer/linux/*.py
+FIX_PYTHON_PATHS+= setup/installer/osx/*.py
+FIX_PYTHON_PATHS+= setup/installer/osx/app/*.py
+FIX_PYTHON_PATHS+= setup/installer/windows/*.py
+FIX_PYTHON_PATHS+= src/calibre/*.py
+FIX_PYTHON_PATHS+= src/calibre/customize/*.py
+FIX_PYTHON_PATHS+= src/calibre/db/*.py
+FIX_PYTHON_PATHS+= src/calibre/db/tests/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/android/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/eslick/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/folder_device/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/iriver/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/kobo/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/prs505/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/prst1/*.py
+FIX_PYTHON_PATHS+= src/calibre/devices/teclast/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/chm/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/comic/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/compression/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/plugins/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/djvu/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/fix/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/html/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/iterator/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/lit/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/html/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/pylrs/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/markdown/extensions/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/sources/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/debug/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/reader/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer2/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer8/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/odt/__init__.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/test-cfi/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/transforms/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/__init__.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/reflow.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/readability/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf2xml/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/snb/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/textile/*.py
+FIX_PYTHON_PATHS+= src/calibre/ebooks/txt/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/actions/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/add_wizard/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/catalog/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/convert/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/dialogs/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/library/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/metadata/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/preferences/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/progress_indicator/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/tag_browser/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/viewer/*.py
+FIX_PYTHON_PATHS+= src/calibre/gui2/wizard/*.py
+FIX_PYTHON_PATHS+= src/calibre/library/*.py
+FIX_PYTHON_PATHS+= src/calibre/library/catalogs/*.py
+FIX_PYTHON_PATHS+= src/calibre/library/server/*.py
+FIX_PYTHON_PATHS+= src/calibre/manual/*.py
+FIX_PYTHON_PATHS+= src/calibre/manual/plugin_examples/helloworld/*.py
+FIX_PYTHON_PATHS+= src/calibre/manual/plugin_examples/interface_demo/*.py
+FIX_PYTHON_PATHS+= src/calibre/trac/*.py
+FIX_PYTHON_PATHS+= src/calibre/translations/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/fonts/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/ipc/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/magick/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/podofo/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/pyconsole/*.py
+FIX_PYTHON_PATHS+= src/calibre/utils/wmf/*.py
+FIX_PYTHON_PATHS+= src/calibre/web/feeds/*.py
+FIX_PYTHON_PATHS+= src/calibre/web/feeds/recipes/*.py
+FIX_PYTHON_PATHS+= src/calibre/web/fetch/*.py
+FIX_PYTHON_PATHS+= src/calibre/web/jsbrowser/*.py
+FIX_PYTHON_PATHS+= src/templite/*.py
SUBST_CLASSES+= prefix
SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
@@ -144,7 +147,7 @@
SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
SUBST_MESSAGE.path= Fixing path to python.
SUBST_STAGE.path= post-patch
-SUBST_FILES.path= ${FIX_PYTHON}
+SUBST_FILES.path= ${FIX_PYTHON_PATHS}
# These ones are for replacing python[0-9*] with PYTHONBIN
REPLACE_PYTHON+= recipes/animal_politico.recipe
diff -r cb0749ced4ff -r be144c561be8 misc/calibre/PLIST
--- a/misc/calibre/PLIST Sun Apr 22 19:08:03 2012 +0000
+++ b/misc/calibre/PLIST Sun Apr 22 19:33:01 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/02/16 21:29:36 gls Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/04/22 19:33:01 gls Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@@ -268,6 +268,7 @@
lib/calibre/calibre/ebooks/metadata/ereader.py
lib/calibre/calibre/ebooks/metadata/extz.py
lib/calibre/calibre/ebooks/metadata/fb2.py
+lib/calibre/calibre/ebooks/metadata/haodoo.py
lib/calibre/calibre/ebooks/metadata/html.py
lib/calibre/calibre/ebooks/metadata/imp.py
lib/calibre/calibre/ebooks/metadata/kdl.py
@@ -299,6 +300,7 @@
lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
lib/calibre/calibre/ebooks/metadata/sources/ozon.py
lib/calibre/calibre/ebooks/metadata/sources/test.py
+lib/calibre/calibre/ebooks/metadata/sources/worker.py
lib/calibre/calibre/ebooks/metadata/toc.py
lib/calibre/calibre/ebooks/metadata/topaz.py
lib/calibre/calibre/ebooks/metadata/txt.py
@@ -306,22 +308,38 @@
lib/calibre/calibre/ebooks/metadata/xisbn.py
lib/calibre/calibre/ebooks/metadata/zip.py
lib/calibre/calibre/ebooks/mobi/__init__.py
-lib/calibre/calibre/ebooks/mobi/debug.py
+lib/calibre/calibre/ebooks/mobi/debug/__init__.py
+lib/calibre/calibre/ebooks/mobi/debug/headers.py
+lib/calibre/calibre/ebooks/mobi/debug/index.py
+lib/calibre/calibre/ebooks/mobi/debug/main.py
+lib/calibre/calibre/ebooks/mobi/debug/mobi6.py
+lib/calibre/calibre/ebooks/mobi/debug/mobi8.py
lib/calibre/calibre/ebooks/mobi/huffcdic.py
lib/calibre/calibre/ebooks/mobi/langcodes.py
lib/calibre/calibre/ebooks/mobi/mobiml.py
-lib/calibre/calibre/ebooks/mobi/reader.py
+lib/calibre/calibre/ebooks/mobi/reader/__init__.py
+lib/calibre/calibre/ebooks/mobi/reader/headers.py
+lib/calibre/calibre/ebooks/mobi/reader/index.py
+lib/calibre/calibre/ebooks/mobi/reader/markup.py
+lib/calibre/calibre/ebooks/mobi/reader/mobi6.py
+lib/calibre/calibre/ebooks/mobi/reader/mobi8.py
+lib/calibre/calibre/ebooks/mobi/reader/ncx.py
lib/calibre/calibre/ebooks/mobi/utils.py
-lib/calibre/calibre/ebooks/mobi/writer.py
lib/calibre/calibre/ebooks/mobi/writer2/__init__.py
lib/calibre/calibre/ebooks/mobi/writer2/indexer.py
lib/calibre/calibre/ebooks/mobi/writer2/main.py
+lib/calibre/calibre/ebooks/mobi/writer2/resources.py
lib/calibre/calibre/ebooks/mobi/writer2/serializer.py
+lib/calibre/calibre/ebooks/mobi/writer8/__init__.py
+lib/calibre/calibre/ebooks/mobi/writer8/main.py
+lib/calibre/calibre/ebooks/mobi/writer8/skeleton.py
lib/calibre/calibre/ebooks/odt/__init__.py
lib/calibre/calibre/ebooks/odt/input.py
lib/calibre/calibre/ebooks/oeb/__init__.py
lib/calibre/calibre/ebooks/oeb/base.py
+lib/calibre/calibre/ebooks/oeb/display/__init__.py
lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
+lib/calibre/calibre/ebooks/oeb/display/webview.py
lib/calibre/calibre/ebooks/oeb/iterator.py
lib/calibre/calibre/ebooks/oeb/parse_utils.py
lib/calibre/calibre/ebooks/oeb/reader.py
@@ -353,6 +371,8 @@
lib/calibre/calibre/ebooks/pdb/ereader/writer.py
lib/calibre/calibre/ebooks/pdb/formatreader.py
lib/calibre/calibre/ebooks/pdb/formatwriter.py
+lib/calibre/calibre/ebooks/pdb/haodoo/__init__.py
+lib/calibre/calibre/ebooks/pdb/haodoo/reader.py
lib/calibre/calibre/ebooks/pdb/header.py
lib/calibre/calibre/ebooks/pdb/palmdoc/__init__.py
lib/calibre/calibre/ebooks/pdb/palmdoc/reader.py
@@ -822,7 +842,6 @@
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/wizards_tower_books_plugin.py
lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
lib/calibre/calibre/gui2/store/stores/zixo_plugin.py
@@ -951,6 +970,7 @@
lib/calibre/calibre/utils/formatter_functions.py
Home |
Main Index |
Thread Index |
Old Index