calibre-prefix.patch

   1 diff -urNp -x '*.orig' calibre-4.20.0.org/setup/install.py calibre-4.20.0/setup/install.py
   2 --- calibre-4.20.0.org/setup/install.py 2020-07-03 04:11:13.000000000 +0200
   3 +++ calibre-4.20.0/setup/install.py     2021-06-23 14:08:38.902233250 +0200
   4 @@ -100,15 +100,10 @@ class Develop(Command):
   5              self.sharedir = self.j(opts.prefix, 'share')
   6          if not getattr(opts, 'staging_root', None):
   7              opts.staging_root = opts.prefix
   8 -        self.staging_libdir = getattr(opts, 'staging_libdir', None)
   9 -        if self.staging_libdir is None:
  10 -            self.staging_libdir = opts.staging_libdir = self.j(opts.staging_root, 'lib')
  11 -        self.staging_bindir = getattr(opts, 'staging_bindir', None)
  12 -        if self.staging_bindir is None:
  13 -            self.staging_bindir = opts.staging_bindir = self.j(opts.staging_root, 'bin')
  14 -        self.staging_sharedir = getattr(opts, 'staging_sharedir', None)
  15 -        if self.staging_sharedir is None:
  16 -            self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'share')
  17 +
  18 +        self.staging_libdir = opts.staging_libdir = opts.staging_root + self.libdir
  19 +        self.staging_bindir = opts.staging_bindir = self.j(opts.staging_root, 'usr/', 'bin')
  20 +        self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'usr/', 'share')
  21
  22          self.staging_libdir = opts.staging_libdir = self.j(self.staging_libdir, 'calibre')
  23          self.staging_sharedir = opts.staging_sharedir = self.j(self.staging_sharedir, 'calibre')
  24 diff -urNp -x '*.orig' calibre-4.20.0.org/src/calibre/linux.py calibre-4.20.0/src/calibre/linux.py
  25 --- calibre-4.20.0.org/src/calibre/linux.py     2020-07-03 04:11:13.000000000 +0200
  26 +++ calibre-4.20.0/src/calibre/linux.py 2021-06-23 14:08:38.902233250 +0200
  27 @@ -737,10 +737,10 @@ class PostInstall:
  28              self.warn = self.warning
  29
  30          if not self.opts.staging_bindir:
  31 -            self.opts.staging_bindir = os.path.join(self.opts.staging_root,
  32 +            self.opts.staging_bindir = os.path.join(self.opts.staging_root, 'usr',
  33              'bin')
  34          if not self.opts.staging_sharedir:
  35 -            self.opts.staging_sharedir = os.path.join(self.opts.staging_root,
  36 +            self.opts.staging_sharedir = os.path.join(self.opts.staging_root, 'usr',
  37              'share', 'calibre')
  38          self.opts.staging_etc = '/etc' if self.opts.staging_root == '/usr' else \
  39                  os.path.join(self.opts.staging_root, 'etc')
  40 @@ -748,7 +748,7 @@ class PostInstall:
  41          prefix = getattr(self.opts, 'prefix', None)
  42          if prefix and prefix != self.opts.staging_root:
  43              self.opts.staged_install = True
  44 -            os.environ['XDG_DATA_DIRS'] = os.path.join(self.opts.staging_root, 'share')
  45 +            os.environ['XDG_DATA_DIRS'] = os.path.join(self.opts.staging_root, 'usr', 'share')
  46              os.environ['XDG_UTILS_INSTALL_MODE'] = 'system'
  47
  48          from calibre.utils.serialize import msgpack_loads