diff options
| -rw-r--r-- | libre/calibre-libre/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 24 |
2 files changed, 20 insertions, 12 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 9fe1b4729..18cd20770 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101612 2013-11-29 07:52:50Z jelle $ +# $Id: PKGBUILD 102328 2013-12-08 20:04:25Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.13.0 +pkgver=1.14.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,8 +30,8 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('aeee6229f36eacdd1a28bade3bc1dd9f' - '8353d1878c5a498b3e49eddef473605f' +md5sums=('1191a9313fb3dd9d4d47dfb5a3e52690' + '971802d53fd0480c930735174ec25311' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index 2c6f07672..2749e1d1c 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,6 +1,7 @@ ---- a/src/calibre/linux.py 2013-03-01 05:49:28.000000000 +0100 -+++ b/src/calibre/linux.py 2013-03-03 14:53:05.000000000 +0100 -@@ -447,19 +447,6 @@ +diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py +--- calibre/src/calibre/linux.py 2013-12-06 05:13:34.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2013-12-08 20:30:59.097240827 +0100 +@@ -451,18 +451,6 @@ self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() @@ -16,11 +17,10 @@ - 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)) - for args, kwargs in self.warnings: -@@ -508,7 +495,7 @@ +@@ -513,7 +501,7 @@ if isnetbsd: f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') else: @@ -29,7 +29,7 @@ if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) if zsh.dest: -@@ -651,63 +638,39 @@ +@@ -657,48 +645,28 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -57,6 +57,9 @@ - render_img('viewer.png', 'calibre-viewer.png') - cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) - self.icon_resources.append(('apps', 'calibre-viewer', '128')) +- render_img('tweak.png', 'calibre-ebook-tweak.png') +- cc('xdg-icon-resource install --size 128 calibre-ebook-tweak.png calibre-ebook-tweak', shell=True) +- self.icon_resources.append(('apps', 'calibre-ebook-tweak', '128')) + dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') + os.mkdir(dir) + render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) @@ -73,6 +76,7 @@ def write_mimetypes(f): f.write('MimeType=%s;\n'%';'.join(mimetypes)) + from calibre.ebooks.oeb.polish.main import SUPPORTED - f = open('calibre-lrfviewer.desktop', 'wb') + dir = os.path.join(self.opts.staging_sharedir,'../applications') + os.mkdir(dir) @@ -83,6 +87,10 @@ + f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') f.write(EVIEWER) write_mimetypes(f) + f = open('calibre-ebook-tweak.desktop', 'wb') +@@ -706,22 +674,15 @@ + mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED] + f.write('MimeType=%s;\n'%';'.join(mt)) f.close() - f = open('calibre-gui.desktop', 'wb') + f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') @@ -90,7 +98,7 @@ write_mimetypes(f) f.close() - des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop') +- 'calibre-ebook-viewer.desktop', 'calibre-ebook-tweak.desktop') - for x in des: - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - cc(' '.join(cmd), shell=True) |