diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-17 20:54:03 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-17 20:54:03 -0500 |
| commit | 5e3b8e62a291527fe292e2575222bad07c59a522 (patch) | |
| tree | 1c20c9bf75f75bdba336521c4870184691af7454 /libre/calibre-libre | |
| parent | 2ae18ab33a078f690593def4751997ca432153d7 (diff) | |
| parent | 57b827189188ff6b4c2563c7c11f97dfc0a2bb17 (diff) | |
| download | abslibre-5e3b8e62a291527fe292e2575222bad07c59a522.tar.gz abslibre-5e3b8e62a291527fe292e2575222bad07c59a522.tar.bz2 abslibre-5e3b8e62a291527fe292e2575222bad07c59a522.zip | |
Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre/calibre-libre')
| -rw-r--r-- | libre/calibre-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 20 |
2 files changed, 16 insertions, 14 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 18cd20770..5da84aa34 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102328 2013-12-08 20:04:25Z 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> @@ -9,8 +9,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.14.0 -pkgrel=1 +pkgver=1.15.0 +pkgrel=2 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -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=('1191a9313fb3dd9d4d47dfb5a3e52690' - '971802d53fd0480c930735174ec25311' +md5sums=('ee72ec13e501b51f22916ea94d26c610' + '95ca4eb3afa7c737c8371708a23bdad9' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index 2749e1d1c..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-06 05:13:34.000000000 +0100 -+++ calibre.new/src/calibre/linux.py 2013-12-08 20:30:59.097240827 +0100 +--- calibre/src/calibre/linux.py 2013-12-13 03:47:23.000000000 +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,48 +645,28 @@ +@@ -657,71 +645,45 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -57,14 +57,15 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - 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')) +- 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')) + dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') + os.mkdir(dir) + 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('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png')) mimetypes = set([]) for x in all_input_formats(): @@ -87,8 +88,9 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py + 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 @@ +- f = open('calibre-ebook-edit.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb') + f.write(ETWEAK) mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED] f.write('MimeType=%s;\n'%';'.join(mt)) f.close() @@ -98,7 +100,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py write_mimetypes(f) f.close() - des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop', 'calibre-ebook-tweak.desktop') +- 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') - for x in des: - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - cc(' '.join(cmd), shell=True) |