- rediff patches

[packages/calibre.git] / desktop-integration.patch

diff --git a/desktop-integration.patch b/desktop-integration.patch
index 49c698976b65cd0e42824f2c7efd20664d9a215e..458fe5e0c3d422241d3cfb39ad13100893e15cf8 100644 (file)
--- a/desktop-integration.patch
+++ b/desktop-integration.patch
@@ -1,15 +1,16 @@
---- calibre-2.44.1/src/calibre/linux.py.orig   2015-11-21 11:22:06.420641478 +0100
-+++ calibre-2.44.1/src/calibre/linux.py        2015-11-21 11:20:41.000000000 +0100
-@@ -781,7 +781,7 @@
+diff -urNp -x '*.orig' calibre-4.20.0.org/src/calibre/linux.py calibre-4.20.0/src/calibre/linux.py
+--- calibre-4.20.0.org/src/calibre/linux.py    2021-06-23 14:08:51.192699952 +0200
++++ calibre-4.20.0/src/calibre/linux.py        2021-06-23 14:08:53.186104962 +0200
+@@ -875,7 +875,7 @@ class PostInstall:
                  def install_single_icon(iconsrc, basename, size, context, is_last_icon=False):
                      filename = '%s-%s.png' % (basename, size)
                      render_img(iconsrc, filename, width=int(size), height=int(size))
--                    cmd = ['xdg-icon-resource', 'install', '--noupdate', '--context', context, '--size', str(size), filename, basename]
-+                    cmd = ['xdg-icon-resource', 'install', '--noupdate', '--novendor', '--context', context, '--size', str(size), filename, basename]
+-                    cmd = ['xdg-icon-resource', 'install', '--noupdate', '--context', context, '--size', unicode_type(size), filename, basename]
++                    cmd = ['xdg-icon-resource', 'install', '--noupdate', '--novendor', '--context', context, '--size', unicode_type(size), filename, basename]
                      if is_last_icon:
                          del cmd[2]
                      cc(cmd)
-@@ -850,7 +850,7 @@
+@@ -941,7 +941,7 @@ class PostInstall:
  
                  APPDATA = get_appdata()
                  for x in des:
@@ -18,12 +19,13 @@
                      cc(' '.join(cmd), shell=True)
                      self.menu_resources.append(x)
                      ak = x.partition('.')[0]
-@@ -859,7 +859,7 @@
-                 cc(['xdg-desktop-menu', 'forceupdate'])
-                 MIME = P('calibre-mimetypes.xml')
-                 self.mime_resources.append(MIME)
--                cc(['xdg-mime', 'install', MIME])
-+                cc(['xdg-mime', 'install', '--novendor', MIME])
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise
+@@ -951,8 +951,7 @@ class PostInstall:
+                 MIME = P(MIME_BASE)
+                 self.mime_resources.append(MIME_BASE)
+                 if not getattr(self.opts, 'staged_install', False):
+-                    cc(['xdg-mime', 'install', MIME])
+-                    cc(['xdg-desktop-menu', 'forceupdate'])
++                    cc(['xdg-mime', 'install', '--novendor', MIME])
+                 else:
+                     from shutil import copyfile
+                     copyfile(MIME, os.path.join(env['XDG_DATA_DIRS'], 'mime', 'packages', MIME_BASE))