chiark - git - mdw - termux-packages/blob - packages/python/fix-paths.patch

   1 diff -uNr Python-3.6.2/Lib/aifc.py Python-3.6.2.mod/Lib/aifc.py
   2 --- Python-3.6.2/Lib/aifc.py    2017-07-08 06:33:27.000000000 +0300
   3 +++ Python-3.6.2.mod/Lib/aifc.py        2017-09-15 15:09:08.092797061 +0300
   4 @@ -920,7 +920,7 @@
   5  if __name__ == '__main__':
   6      import sys
   7      if not sys.argv[1:]:
   8 -        sys.argv.append('/usr/demos/data/audio/bach.aiff')
   9 +        sys.argv.append('@TERMUX_PREFIX@/demos/data/audio/bach.aiff')
  10      fn = sys.argv[1]
  11      with open(fn, 'r') as f:
  12          print("Reading", fn)
  13 diff -uNr Python-3.6.2/Lib/mailcap.py Python-3.6.2.mod/Lib/mailcap.py
  14 --- Python-3.6.2/Lib/mailcap.py 2017-07-08 06:33:27.000000000 +0300
  15 +++ Python-3.6.2.mod/Lib/mailcap.py     2017-09-15 15:08:41.312797081 +0300
  16 @@ -55,7 +55,8 @@
  17              # Don't bother with getpwuid()
  18              home = '.' # Last resort
  19          mailcaps = [home + '/.mailcap', '/etc/mailcap',
  20 -                '/usr/etc/mailcap', '/usr/local/etc/mailcap']
  21 +                '/usr/etc/mailcap', '/usr/local/etc/mailcap',
  22 +                '@TERMUX_PREFIX@/etc/mailcap']
  23      return mailcaps
  24
  25
  26 diff -uNr Python-3.6.2/Lib/mimetypes.py Python-3.6.2.mod/Lib/mimetypes.py
  27 --- Python-3.6.2/Lib/mimetypes.py       2017-07-08 06:33:27.000000000 +0300
  28 +++ Python-3.6.2.mod/Lib/mimetypes.py   2017-09-15 15:08:05.522797106 +0300
  29 @@ -49,6 +49,7 @@
  30      "/usr/local/lib/netscape/mime.types",
  31      "/usr/local/etc/httpd/conf/mime.types",     # Apache 1.2
  32      "/usr/local/etc/mime.types",                # Apache 1.3
  33 +    "@TERMUX_PREFIX@/etc/mime.types",           # Termux
  34      ]
  35
  36  inited = False
  37 diff -uNr Python-3.6.2/Lib/posixpath.py Python-3.6.2.mod/Lib/posixpath.py
  38 --- Python-3.6.2/Lib/posixpath.py       2017-07-08 06:33:27.000000000 +0300
  39 +++ Python-3.6.2.mod/Lib/posixpath.py   2017-09-15 15:07:20.872797138 +0300
  40 @@ -32,7 +32,7 @@
  41  extsep = '.'
  42  sep = '/'
  43  pathsep = ':'
  44 -defpath = ':/bin:/usr/bin'
  45 +defpath = ':@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/bin/applets'
  46  altsep = None
  47  devnull = '/dev/null'
  48
  49 diff -uNr Python-3.6.2/Lib/uuid.py Python-3.6.2.mod/Lib/uuid.py
  50 --- Python-3.6.2/Lib/uuid.py    2017-07-08 06:33:27.000000000 +0300
  51 +++ Python-3.6.2.mod/Lib/uuid.py        2017-09-15 15:06:36.372797170 +0300
  52 @@ -306,7 +306,7 @@
  53      import os, shutil, subprocess
  54      executable = shutil.which(command)
  55      if executable is None:
  56 -        path = os.pathsep.join(('/sbin', '/usr/sbin'))
  57 +        path = os.pathsep.join(('@TERMUX_PREFIX@/bin', '@TERMUX_PREFIX@/bin/applets'))
  58          executable = shutil.which(command, path=path)
  59          if executable is None:
  60              return None