From 276102a7d10ee6824643a97e12b0071770089dc2 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 10 Aug 2014 19:50:37 +0000 Subject: [PATCH] update to Calibre 1.48.0 --- textproc/calibre/Makefile | 4 +-- textproc/calibre/distinfo | 4 +-- .../patch-src_calibre_gui2___init___py | 8 +++--- .../patches/patch-src_calibre_linux_py | 8 +++--- textproc/calibre/pkg/PLIST | 27 ++++++++++++------- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile index ad7f45caa32..7178c273f3b 100644 --- a/textproc/calibre/Makefile +++ b/textproc/calibre/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.35 2014/07/15 23:33:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.36 2014/08/10 19:50:37 sthen Exp $ COMMENT = ebook management application -DISTNAME = calibre-1.44.0 +DISTNAME = calibre-1.48.0 CATEGORIES = textproc MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=calibre/} EXTRACT_SUFX = .tar.xz diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo index fedfb342d6e..c907b8422ae 100644 --- a/textproc/calibre/distinfo +++ b/textproc/calibre/distinfo @@ -1,2 +1,2 @@ -SHA256 (calibre-1.44.0.tar.xz) = sqSUhezhZFQWnf3Z2nSB+r8K5kS45T8/0RTeTO7PaZI= -SIZE (calibre-1.44.0.tar.xz) = 36438768 +SHA256 (calibre-1.48.0.tar.xz) = 5wQJD2YRxeN0JSw/G1jgd8zTFwo+o5iT5b9ocoer9HI= +SIZE (calibre-1.48.0.tar.xz) = 35126680 diff --git a/textproc/calibre/patches/patch-src_calibre_gui2___init___py b/textproc/calibre/patches/patch-src_calibre_gui2___init___py index e1daba35920..252dcc5bb43 100644 --- a/textproc/calibre/patches/patch-src_calibre_gui2___init___py +++ b/textproc/calibre/patches/patch-src_calibre_gui2___init___py @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_calibre_gui2___init___py,v 1.1 2014/07/08 09:55:16 sthen Exp $ +$OpenBSD: patch-src_calibre_gui2___init___py,v 1.2 2014/08/10 19:50:37 sthen Exp $ - enable --detach, used by some .desktop files ---- src/calibre/gui2/__init__.py.orig Fri Jul 4 05:05:26 2014 -+++ src/calibre/gui2/__init__.py Tue Jul 8 10:36:29 2014 -@@ -852,12 +852,12 @@ def load_builtin_fonts(): +--- src/calibre/gui2/__init__.py.orig Fri Aug 1 03:44:22 2014 ++++ src/calibre/gui2/__init__.py Sat Aug 2 11:55:21 2014 +@@ -860,12 +860,12 @@ def load_builtin_fonts(): _rating_font = u'calibre Symbols' def setup_gui_option_parser(parser): diff --git a/textproc/calibre/patches/patch-src_calibre_linux_py b/textproc/calibre/patches/patch-src_calibre_linux_py index f0880530390..03c56ba0a17 100644 --- a/textproc/calibre/patches/patch-src_calibre_linux_py +++ b/textproc/calibre/patches/patch-src_calibre_linux_py @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_calibre_linux_py,v 1.5 2014/07/15 23:33:48 sthen Exp $ +$OpenBSD: patch-src_calibre_linux_py,v 1.6 2014/08/10 19:50:37 sthen Exp $ - skip uninstaller parts ---- src/calibre/linux.py.orig Fri Jul 11 03:19:43 2014 -+++ src/calibre/linux.py Mon Jul 14 13:24:14 2014 -@@ -644,18 +644,6 @@ class PostInstall: +--- src/calibre/linux.py.orig Fri Aug 8 04:21:35 2014 ++++ src/calibre/linux.py Sun Aug 10 20:27:19 2014 +@@ -691,18 +691,6 @@ class PostInstall: self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() diff --git a/textproc/calibre/pkg/PLIST b/textproc/calibre/pkg/PLIST index da3e9c196ed..1dce047d93a 100644 --- a/textproc/calibre/pkg/PLIST +++ b/textproc/calibre/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2014/07/15 23:33:48 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.18 2014/08/10 19:50:37 sthen Exp $ bin/calibre bin/calibre-complete bin/calibre-customize @@ -794,6 +794,8 @@ lib/calibre/calibre/ebooks/mobi/__init__.pyc lib/calibre/calibre/ebooks/mobi/debug/ lib/calibre/calibre/ebooks/mobi/debug/__init__.py lib/calibre/calibre/ebooks/mobi/debug/__init__.pyc +lib/calibre/calibre/ebooks/mobi/debug/containers.py +lib/calibre/calibre/ebooks/mobi/debug/containers.pyc lib/calibre/calibre/ebooks/mobi/debug/headers.py lib/calibre/calibre/ebooks/mobi/debug/headers.pyc lib/calibre/calibre/ebooks/mobi/debug/index.py @@ -813,6 +815,8 @@ lib/calibre/calibre/ebooks/mobi/mobiml.pyc lib/calibre/calibre/ebooks/mobi/reader/ lib/calibre/calibre/ebooks/mobi/reader/__init__.py lib/calibre/calibre/ebooks/mobi/reader/__init__.pyc +lib/calibre/calibre/ebooks/mobi/reader/containers.py +lib/calibre/calibre/ebooks/mobi/reader/containers.pyc lib/calibre/calibre/ebooks/mobi/reader/headers.py lib/calibre/calibre/ebooks/mobi/reader/headers.pyc lib/calibre/calibre/ebooks/mobi/reader/index.py @@ -2124,6 +2128,8 @@ lib/calibre/calibre/gui2/tweak_book/editor/__init__.py lib/calibre/calibre/gui2/tweak_book/editor/__init__.pyc lib/calibre/calibre/gui2/tweak_book/editor/canvas.py lib/calibre/calibre/gui2/tweak_book/editor/canvas.pyc +lib/calibre/calibre/gui2/tweak_book/editor/help.py +lib/calibre/calibre/gui2/tweak_book/editor/help.pyc lib/calibre/calibre/gui2/tweak_book/editor/image.py lib/calibre/calibre/gui2/tweak_book/editor/image.pyc lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py @@ -2193,14 +2199,10 @@ lib/calibre/calibre/gui2/viewer/__init__.py lib/calibre/calibre/gui2/viewer/__init__.pyc lib/calibre/calibre/gui2/viewer/bookmarkmanager.py lib/calibre/calibre/gui2/viewer/bookmarkmanager.pyc -lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py -lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.pyc lib/calibre/calibre/gui2/viewer/config.py lib/calibre/calibre/gui2/viewer/config.pyc lib/calibre/calibre/gui2/viewer/config_ui.py lib/calibre/calibre/gui2/viewer/config_ui.pyc -lib/calibre/calibre/gui2/viewer/dictionary.py -lib/calibre/calibre/gui2/viewer/dictionary.pyc lib/calibre/calibre/gui2/viewer/documentview.py lib/calibre/calibre/gui2/viewer/documentview.pyc lib/calibre/calibre/gui2/viewer/flip.py @@ -2217,8 +2219,6 @@ lib/calibre/calibre/gui2/viewer/keys.py lib/calibre/calibre/gui2/viewer/keys.pyc lib/calibre/calibre/gui2/viewer/main.py lib/calibre/calibre/gui2/viewer/main.pyc -lib/calibre/calibre/gui2/viewer/main_ui.py -lib/calibre/calibre/gui2/viewer/main_ui.pyc lib/calibre/calibre/gui2/viewer/position.py lib/calibre/calibre/gui2/viewer/position.pyc lib/calibre/calibre/gui2/viewer/printing.py @@ -2227,6 +2227,8 @@ lib/calibre/calibre/gui2/viewer/table_popup.py lib/calibre/calibre/gui2/viewer/table_popup.pyc lib/calibre/calibre/gui2/viewer/toc.py lib/calibre/calibre/gui2/viewer/toc.pyc +lib/calibre/calibre/gui2/viewer/ui.py +lib/calibre/calibre/gui2/viewer/ui.pyc lib/calibre/calibre/gui2/widgets.py lib/calibre/calibre/gui2/widgets.pyc lib/calibre/calibre/gui2/widgets2.py @@ -2406,8 +2408,6 @@ lib/calibre/calibre/utils/config_base.py lib/calibre/calibre/utils/config_base.pyc lib/calibre/calibre/utils/date.py lib/calibre/calibre/utils/date.pyc -lib/calibre/calibre/utils/dictclient.py -lib/calibre/calibre/utils/dictclient.pyc lib/calibre/calibre/utils/file_associations.py lib/calibre/calibre/utils/file_associations.pyc lib/calibre/calibre/utils/filenames.py @@ -3038,6 +3038,13 @@ share/calibre/dictionaries/es-ES/es-ES.aff share/calibre/dictionaries/es-ES/es-ES.dic share/calibre/dictionaries/es-ES/locales share/calibre/ebook-convert-complete.pickle +share/calibre/editor-help/ +share/calibre/editor-help/css.json +share/calibre/editor-help/html.json +share/calibre/editor-help/mathml.json +share/calibre/editor-help/opf2.json +share/calibre/editor-help/opf3.json +share/calibre/editor-help/svg.json share/calibre/fonts/ share/calibre/fonts/calibreSymbols.otf share/calibre/fonts/liberation/ @@ -3098,6 +3105,7 @@ share/calibre/images/dialog_warning.png share/calibre/images/dictionary.png share/calibre/images/diff.png share/calibre/images/document-encrypt.png +share/calibre/images/document-import.png share/calibre/images/document-new.png share/calibre/images/document_open.png share/calibre/images/donate.png @@ -3118,6 +3126,7 @@ share/calibre/images/eject.png share/calibre/images/embed-fonts.png share/calibre/images/exec.png share/calibre/images/filter.png +share/calibre/images/folder_saved_search.png share/calibre/images/font.png share/calibre/images/font_size_larger.png share/calibre/images/font_size_smaller.png