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

Jelle van der Waa jelle at nymeria.archlinux.org
Tue Dec 17 20:22:43 UTC 2013


    Date: Tuesday, December 17, 2013 @ 21:22:43
  Author: jelle
Revision: 102727

upgpkg: calibre 1.15.0-1

fix FS#38164

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

---------------------------+
 PKGBUILD                  |    3 +++
 desktop_integration.patch |   10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-17 20:17:14 UTC (rev 102726)
+++ PKGBUILD	2013-12-17 20:22:43 UTC (rev 102727)
@@ -90,3 +90,6 @@
 md5sums=('ee72ec13e501b51f22916ea94d26c610'
          'b46ad0d81c20a888f10dd3c03571d365'
          '675cd87d41342119827ef706055491e7')
+md5sums=('ee72ec13e501b51f22916ea94d26c610'
+         '95ca4eb3afa7c737c8371708a23bdad9'
+         '675cd87d41342119827ef706055491e7')

Modified: desktop_integration.patch
===================================================================
--- desktop_integration.patch	2013-12-17 20:17:14 UTC (rev 102726)
+++ desktop_integration.patch	2013-12-17 20:22:43 UTC (rev 102727)
@@ -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 @@
              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 @@
 +                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 @@
                  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()




More information about the arch-commits mailing list