update to calibre 1.44.0

This commit is contained in:
sthen 2014-07-15 23:33:48 +00:00
parent 0bd42cae81
commit 151dc678b3
4 changed files with 18 additions and 34 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.34 2014/07/08 09:55:16 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2014/07/15 23:33:48 sthen Exp $
COMMENT = ebook management application
DISTNAME = calibre-1.43.0
DISTNAME = calibre-1.44.0
CATEGORIES = textproc
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=calibre/}
EXTRACT_SUFX = .tar.xz

View File

@ -1,2 +1,2 @@
SHA256 (calibre-1.43.0.tar.xz) = PE7xdZHgM+ObqATRhEL2PD68FoPad2gz1H2KopAPck0=
SIZE (calibre-1.43.0.tar.xz) = 35549180
SHA256 (calibre-1.44.0.tar.xz) = sqSUhezhZFQWnf3Z2nSB+r8K5kS45T8/0RTeTO7PaZI=
SIZE (calibre-1.44.0.tar.xz) = 36438768

View File

@ -1,25 +1,15 @@
$OpenBSD: patch-src_calibre_linux_py,v 1.4 2014/03/19 02:15:46 sthen Exp $
$OpenBSD: patch-src_calibre_linux_py,v 1.5 2014/07/15 23:33:48 sthen Exp $
- skip uninstaller parts
- correct path for bash completion samples
--- src/calibre/linux.py.orig Fri Mar 14 04:21:05 2014
+++ src/calibre/linux.py Wed Mar 19 00:37:52 2014
@@ -8,7 +8,7 @@ from subprocess import check_call
from functools import partial
from calibre import __appname__, prints, guess_type
-from calibre.constants import islinux, isnetbsd, isbsd
+from calibre.constants import islinux, isnetbsd, isopenbsd, isbsd
from calibre.customize.ui import all_input_formats
from calibre.ptempfile import TemporaryDirectory
from calibre import CurrentDir
@@ -495,19 +495,7 @@ class PostInstall:
--- 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:
self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
- self.create_uninstaller()
-
- from calibre.utils.config import config_dir
- if os.path.exists(config_dir):
- os.chdir(config_dir)
@ -30,16 +20,6 @@ $OpenBSD: patch-src_calibre_linux_py,v 1.4 2014/03/19 02:15:46 sthen Exp $
- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
- if os.stat(config_dir).st_uid == 0:
- os.rmdir(config_dir)
-
if warn is None and self.warnings:
self.info('\n\nThere were %d warnings\n'%len(self.warnings))
for args, kwargs in self.warnings:
@@ -561,7 +549,7 @@ class PostInstall:
if os.path.exists(bc):
f = os.path.join(bc, 'calibre')
else:
- if isnetbsd:
+ if isnetbsd or isopenbsd:
f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
else:
f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2014/07/08 09:55:16 sthen Exp $
@comment $OpenBSD: PLIST,v 1.17 2014/07/15 23:33:48 sthen Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@ -2160,6 +2160,8 @@ lib/calibre/calibre/gui2/tweak_book/main.py
lib/calibre/calibre/gui2/tweak_book/main.pyc
lib/calibre/calibre/gui2/tweak_book/manage_fonts.py
lib/calibre/calibre/gui2/tweak_book/manage_fonts.pyc
lib/calibre/calibre/gui2/tweak_book/plugin.py
lib/calibre/calibre/gui2/tweak_book/plugin.pyc
lib/calibre/calibre/gui2/tweak_book/polish.py
lib/calibre/calibre/gui2/tweak_book/polish.pyc
lib/calibre/calibre/gui2/tweak_book/preferences.py
@ -2945,9 +2947,8 @@ share/applications/calibre-ebook-edit.desktop
share/applications/calibre-ebook-viewer.desktop
share/applications/calibre-gui.desktop
share/applications/calibre-lrfviewer.desktop
share/bash_completion.d/
share/bash-completion/completions/calibre
@sample ${SYSCONFDIR}/bash_completion.d/
share/bash_completion.d/calibre
@sample ${SYSCONFDIR}/bash_completion.d/calibre
share/calibre/
share/calibre/builtin_recipes.xml
@ -3284,7 +3285,10 @@ share/calibre/localization/pykakasi/kanwadict2.pickle
share/calibre/localization/stats.pickle
share/calibre/metadata_sqlite.sql
share/calibre/mime.types
share/calibre/quick_start.epub
share/calibre/quick_start/
share/calibre/quick_start/deu.epub
share/calibre/quick_start/eng.epub
share/calibre/quick_start/fra.epub
share/calibre/recipes/
share/calibre/recipes/10minutos.recipe
share/calibre/recipes/180.recipe