diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-12-17 20:24:38 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-12-17 20:24:38 -0200 |
| commit | 9f1a4cf369402b92e92eb2e8dfefa390f994808a (patch) | |
| tree | eaecaf76e901f4bf06a0d525903e23d4b3ae3a78 /libre | |
| parent | 6528d9db649a9aa90f6eae8962554ec056b6f42c (diff) | |
| download | abslibre-9f1a4cf369402b92e92eb2e8dfefa390f994808a.tar.gz abslibre-9f1a4cf369402b92e92eb2e8dfefa390f994808a.tar.bz2 abslibre-9f1a4cf369402b92e92eb2e8dfefa390f994808a.zip | |
calibre-libre-1.15.0-2: fix FS#38164 => https://bugs.archlinux.org/task/38164
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/calibre-libre/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1452f10db..5da84aa34 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102596 2013-12-16 08:56:46Z jelle $ +# $Id: PKGBUILD 102730 2013-12-17 20:47:06Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -10,7 +10,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=1.15.0 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -31,7 +31,7 @@ source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') md5sums=('ee72ec13e501b51f22916ea94d26c610' - 'b46ad0d81c20a888f10dd3c03571d365' + '95ca4eb3afa7c737c8371708a23bdad9' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index c98b225b8..9b20820e6 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,6 +1,6 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py --- calibre/src/calibre/linux.py 2013-12-13 03:47:23.000000000 +0100 -+++ calibre.new/src/calibre/linux.py 2013-12-13 11:24:15.165257058 +0100 ++++ calibre.new/src/calibre/linux.py 2013-12-17 20:11:58.319040313 +0100 @@ -451,18 +451,6 @@ self.setup_completion() if islinux or isbsd: @@ -29,7 +29,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) if zsh.dest: -@@ -657,51 +645,32 @@ +@@ -657,71 +645,45 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -65,7 +65,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py + render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) + render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) + render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) -+ render_img('edit.png', os.path.join(dir, 'calibre-ebook-tweak.png')) ++ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png')) mimetypes = set([]) for x in all_input_formats(): @@ -93,7 +93,9 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py f.write(ETWEAK) mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED] f.write('MimeType=%s;\n'%';'.join(mt)) -@@ -710,18 +679,11 @@ + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') f.write(GUI) write_mimetypes(f) f.close() |