Commit edc98ae5 authored by Anke's avatar Anke

calibre update

parent 7c08d1d8
......@@ -4,7 +4,7 @@
# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
pkgname=calibre
pkgver=0.8.59
pkgver=0.8.60
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
......@@ -20,8 +20,8 @@ screenshot=('https://lh5.googleusercontent.com/_lG58t3XWd3c/TcNwiXkAx_I/AAAAAAAA
install=calibre.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
'desktop_integration.patch')
md5sums=('4a88b55f5efa735193533014e8e95c60'
'd4273962f670c7a089e7747473827e3e')
md5sums=('6ff046cb66d244121f998d0ec5f8db1f'
'049558ae8372a011aee43e873171fbf2')
build() {
cd "${srcdir}/${pkgname}"
......
--- a/src/calibre/linux.py 2012-07-06 04:46:21.000000000 +0200
+++ b/src/calibre/linux.py 2012-07-08 11:59:14.000000000 +0200
@@ -179,18 +179,6 @@
--- a/src/calibre/linux.py 2012-07-13 07:21:34.000000000 +0200
+++ b/src/calibre/linux.py 2012-07-14 20:45:30.000000000 +0200
@@ -180,19 +180,6 @@
self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
......@@ -16,10 +16,11 @@
- 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('There were %d warnings'%len(self.warnings))
@@ -237,7 +225,7 @@
for args, kwargs in self.warnings:
@@ -238,7 +225,7 @@
if isnetbsd:
f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
else:
......@@ -28,21 +29,21 @@
if not os.path.exists(os.path.dirname(f)):
os.makedirs(os.path.dirname(f))
self.manifest.append(f)
@@ -348,51 +336,39 @@
@@ -358,51 +345,39 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():
- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
- self.icon_resources.append(('mimetypes', 'application-lrs',
- '128'))
- render_img('lt.png', 'calibre-gui.png', width=256, height=256)
- check_call('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
- self.icon_resources.append(('apps', 'calibre-gui', '128'))
- render_img('viewer.png', 'calibre-viewer.png')
- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
+ os.mkdir(dir)
......@@ -80,9 +81,9 @@
- 'calibre-ebook-viewer.desktop')
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
- check_call(' '.join(cmd), shell=True)
- cc(' '.join(cmd), shell=True)
- self.menu_resources.append(x)
- check_call(['xdg-desktop-menu', 'forceupdate'])
- cc(['xdg-desktop-menu', 'forceupdate'])
- f = open('calibre-mimetypes', 'wb')
+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
+ os.makedirs(dir)
......@@ -90,7 +91,8 @@
f.write(MIME)
f.close()
- self.mime_resources.append('calibre-mimetypes')
- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
- cc('xdg-mime install ./calibre-mimetypes', shell=True)
except Exception:
if self.opts.fatal_errors:
raise
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment