- up to 4.14.0

[packages/calibre.git] / calibre-prefix.patch

diff --git a/calibre-prefix.patch b/calibre-prefix.patch
index f6b3638bb4e58d2a0935c968e811d22a973d9de9..cb4fa73000cb5431caa5ac18fcfffd536ed1cce6 100644 (file)
--- a/calibre-prefix.patch
+++ b/calibre-prefix.patch
@@ -14,9 +14,33 @@
 -        if self.staging_sharedir is None:
 -            self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'share')
 +
-+        self.staging_libdir = opts.staging_libdir = self.j(opts.staging_root, 'usr/', 'lib')
++        self.staging_libdir = opts.staging_libdir = opts.staging_root + self.libdir
 +        self.staging_bindir = opts.staging_bindir = self.j(opts.staging_root, 'usr/', 'bin')
 +        self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'usr/', 'share')
  
          self.staging_libdir = opts.staging_libdir = self.j(self.staging_libdir, 'calibre')
          self.staging_sharedir = opts.staging_sharedir = self.j(self.staging_sharedir, 'calibre')
+--- calibre-3.44.0/src/calibre/linux.py~       2019-06-09 19:23:04.000000000 +0200
++++ calibre-3.44.0/src/calibre/linux.py        2019-06-09 19:27:46.476130247 +0200
+@@ -685,10 +685,10 @@
+             self.warn = self.warning
+ 
+         if not self.opts.staging_bindir:
+-            self.opts.staging_bindir = os.path.join(self.opts.staging_root,
++            self.opts.staging_bindir = os.path.join(self.opts.staging_root, 'usr',
+             'bin')
+         if not self.opts.staging_sharedir:
+-            self.opts.staging_sharedir = os.path.join(self.opts.staging_root,
++            self.opts.staging_sharedir = os.path.join(self.opts.staging_root, 'usr',
+             'share', 'calibre')
+         self.opts.staging_etc = '/etc' if self.opts.staging_root == '/usr' else \
+                 os.path.join(self.opts.staging_root, 'etc')
+@@ -696,7 +696,7 @@
+         prefix = getattr(self.opts, 'prefix', None)
+         if prefix and prefix != self.opts.staging_root:
+             self.opts.staged_install = True
+-            os.environ['XDG_DATA_DIRS'] = os.path.join(self.opts.staging_root, 'share')
++            os.environ['XDG_DATA_DIRS'] = os.path.join(self.opts.staging_root, 'usr', 'share')
+             os.environ['XDG_UTILS_INSTALL_MODE'] = 'system'
+ 
+         from calibre.utils.serialize import msgpack_loads