[arch-commits] Commit in calibre/trunk (PKGBUILD desktop_integration.patch)

[Jelle van der Waa]

    Date: Monday, December 16, 2013 @ 09:56:46
  Author: jelle
Revision: 102596

upgpkg: calibre 1.15.0-1

Modified:
  calibre/trunk/PKGBUILD
  calibre/trunk/desktop_integration.patch

---------------------------+
 PKGBUILD                  |    6 +++---
 desktop_integration.patch |   24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-16 08:40:54 UTC (rev 102595)
+++ PKGBUILD	2013-12-16 08:56:46 UTC (rev 102596)
@@ -7,7 +7,7 @@
 # Contributor: Larry Hajali <larryhaja at gmail.com>
 
 pkgname=calibre
-pkgver=1.14.0
+pkgver=1.15.0
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -87,6 +87,6 @@
   # Compiling optimized bytecode FS33392
   python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
 }
-md5sums=('1191a9313fb3dd9d4d47dfb5a3e52690'
-         '971802d53fd0480c930735174ec25311'
+md5sums=('ee72ec13e501b51f22916ea94d26c610'
+         'b46ad0d81c20a888f10dd3c03571d365'
          '675cd87d41342119827ef706055491e7')

Modified: desktop_integration.patch
===================================================================
--- desktop_integration.patch	2013-12-16 08:40:54 UTC (rev 102595)
+++ desktop_integration.patch	2013-12-16 08:56:46 UTC (rev 102596)
@@ -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-13 11:24:15.165257058 +0100
 @@ -451,18 +451,6 @@
              self.setup_completion()
          if islinux or isbsd:
@@ -29,7 +29,7 @@
              if not os.path.exists(os.path.dirname(f)):
                  os.makedirs(os.path.dirname(f))
              if zsh.dest:
-@@ -657,48 +645,28 @@
+@@ -657,51 +645,32 @@
  
              with TemporaryDirectory() as tdir, CurrentDir(tdir), \
                                  PreserveMIMEDefaults():
@@ -57,14 +57,15 @@
 -                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('edit.png', os.path.join(dir, 'calibre-ebook-tweak.png'))
  
                  mimetypes = set([])
                  for x in all_input_formats():
@@ -87,18 +88,17 @@
 +                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()
--                f = open('calibre-gui.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
+@@ -710,18 +679,11 @@
                  f.write(GUI)
                  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)