diff options
| -rw-r--r-- | libre/calibre-libre/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 47 |
2 files changed, 18 insertions, 37 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index cb6ac5238..0a1502d15 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106016 2014-02-21 08:27:06Z jelle $ +# $Id: PKGBUILD 106341 2014-02-28 10:31:18Z 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.25.0 +pkgver=1.26.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=('66151757e67a9d0abdb0fd3b7e91614e' - '8e1855ce1ae254c34d12ddbc358b7a36' +md5sums=('530485d30087c569c604df1c7e2b3d3a' + 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index da3c7a52e..f1a66c020 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,7 +1,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py ---- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100 -+++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100 -@@ -451,18 +451,6 @@ +--- calibre/src/calibre/linux.py 2014-02-28 04:06:35.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2014-02-28 11:18:00.518362669 +0100 +@@ -495,18 +495,6 @@ self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() @@ -19,8 +19,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - os.rmdir(config_dir) if warn is None and self.warnings: - self.info('There were %d warnings'%len(self.warnings)) -@@ -513,7 +501,7 @@ + self.info('\n\nThere were %d warnings\n'%len(self.warnings)) +@@ -564,7 +552,7 @@ if isnetbsd: f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') else: @@ -28,8 +28,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py + f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) - if zsh.dest: -@@ -657,56 +645,37 @@ + bash_comp_dest, zsh_comp_dest = f, None +@@ -713,56 +701,37 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -53,13 +53,13 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) - render_img('lt.png', 'calibre-gui.png', width=256, height=256) - 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') -- 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-edit.png') -- cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True) -- self.icon_resources.append(('apps', 'calibre-ebook-edit', '128')) +- self.icon_resources.append(('apps', 'calibre-gui', '256')) +- render_img('viewer.png', 'calibre-viewer.png', width=256, height=256) +- cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '256')) +- render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256) +- cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True) +- self.icon_resources.append(('apps', 'calibre-ebook-edit', '256')) + dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') + os.mkdir(dir) + render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) @@ -99,22 +99,3 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py f.write(GUI) write_mimetypes(f) f.close() -@@ -725,15 +694,9 @@ - translators = dict(get_all_translators()) - - APPDATA = get_appdata() -- for x in des: -- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] -- cc(' '.join(cmd), shell=True) -- self.menu_resources.append(x) -- ak = x.partition('.')[0] -- if ak in APPDATA and os.access(appdata, os.W_OK): -- write_appdata(ak, APPDATA[ak], appdata, translators) -- cc(['xdg-desktop-menu', 'forceupdate']) -- f = open('calibre-mimetypes.xml', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') -+ os.makedirs(dir) -+ f = open(os.path.join(dir, 'calibre.xml'), 'wb') - f.write(MIME) - f.close() - self.mime_resources.append('calibre-mimetypes.xml') |