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

   1 diff -uNr Python-2.7.13/Lib/aifc.py Python-2.7.13.mod/Lib/aifc.py
   2 --- Python-2.7.13/Lib/aifc.py   2016-12-17 22:05:05.000000000 +0200
   3 +++ Python-2.7.13.mod/Lib/aifc.py       2017-09-15 14:39:33.972798330 +0300
   4 @@ -960,7 +960,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      f = open(fn, 'r')
  12      try:
  13 diff -uNr Python-2.7.13/Lib/mailcap.py Python-2.7.13.mod/Lib/mailcap.py
  14 --- Python-2.7.13/Lib/mailcap.py        2016-12-17 22:05:06.000000000 +0200
  15 +++ Python-2.7.13.mod/Lib/mailcap.py    2017-09-15 14:48:24.432797951 +0300
  16 @@ -44,7 +44,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-2.7.13/Lib/mimetypes.py Python-2.7.13.mod/Lib/mimetypes.py
  27 --- Python-2.7.13/Lib/mimetypes.py      2016-12-17 22:05:06.000000000 +0200
  28 +++ Python-2.7.13.mod/Lib/mimetypes.py  2017-09-15 14:22:15.642799073 +0300
  29 @@ -47,6 +47,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-2.7.13/Lib/posixpath.py Python-2.7.13.mod/Lib/posixpath.py
  38 --- Python-2.7.13/Lib/posixpath.py      2016-12-17 22:05:06.000000000 +0200
  39 +++ Python-2.7.13.mod/Lib/posixpath.py  2017-09-15 14:47:13.762798002 +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-2.7.13/Lib/uuid.py Python-2.7.13.mod/Lib/uuid.py
  50 --- Python-2.7.13/Lib/uuid.py   2016-12-17 22:05:06.000000000 +0200
  51 +++ Python-2.7.13.mod/Lib/uuid.py       2017-09-15 14:46:19.442798040 +0300
  52 @@ -296,7 +296,7 @@
  53  def _popen(command, args):
  54      import os
  55      path = os.environ.get("PATH", os.defpath).split(os.pathsep)
  56 -    path.extend(('/sbin', '/usr/sbin'))
  57 +    path.extend(('@TERMUX_PREFIX@/bin', '@TERMUX_PREFIX@/bin/applets'))
  58      for dir in path:
  59          executable = os.path.join(dir, command)
  60          if (os.path.exists(executable) and