diff options
Diffstat (limited to 'python/python3/patches/python3.x86_64.diff')
-rw-r--r-- | python/python3/patches/python3.x86_64.diff | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/python/python3/patches/python3.x86_64.diff b/python/python3/patches/python3.x86_64.diff index 31ea63fdab..5d5ce5f726 100644 --- a/python/python3/patches/python3.x86_64.diff +++ b/python/python3/patches/python3.x86_64.diff @@ -1,6 +1,6 @@ -diff -uar Python-3.3.0.orig/Lib/distutils/command/install.py Python-3.3.0/Lib/distutils/command/install.py ---- Python-3.3.0.orig/Lib/distutils/command/install.py 2012-09-29 11:00:27.000000000 +0300 -+++ Python-3.3.0/Lib/distutils/command/install.py 2012-10-09 21:15:04.125445023 +0300 +diff -uar Python-3.3.3.orig/Lib/distutils/command/install.py Python-3.3.3/Lib/distutils/command/install.py +--- Python-3.3.3.orig/Lib/distutils/command/install.py 2013-11-17 09:22:30.000000000 +0200 ++++ Python-3.3.3/Lib/distutils/command/install.py 2013-12-29 13:48:10.102637141 +0200 @@ -44,15 +44,15 @@ INSTALL_SCHEMES = { @@ -21,10 +21,10 @@ diff -uar Python-3.3.0.orig/Lib/distutils/command/install.py Python-3.3.0/Lib/di 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -diff -uar Python-3.3.0.orig/Lib/distutils/sysconfig.py Python-3.3.0/Lib/distutils/sysconfig.py ---- Python-3.3.0.orig/Lib/distutils/sysconfig.py 2012-09-29 11:00:28.000000000 +0300 -+++ Python-3.3.0/Lib/distutils/sysconfig.py 2012-10-09 21:16:03.057946912 +0300 -@@ -140,7 +140,7 @@ +diff -uar Python-3.3.3.orig/Lib/distutils/sysconfig.py Python-3.3.3/Lib/distutils/sysconfig.py +--- Python-3.3.3.orig/Lib/distutils/sysconfig.py 2013-11-17 09:22:30.000000000 +0200 ++++ Python-3.3.3/Lib/distutils/sysconfig.py 2013-12-29 13:48:10.103637173 +0200 +@@ -144,7 +144,7 @@ if os.name == "posix": libpython = os.path.join(prefix, @@ -33,9 +33,10 @@ diff -uar Python-3.3.0.orig/Lib/distutils/sysconfig.py Python-3.3.0/Lib/distutil if standard_lib: return libpython else: -diff -uar Python-3.3.0.orig/Lib/site.py Python-3.3.0/Lib/site.py ---- Python-3.3.0.orig/Lib/site.py 2012-09-29 11:00:31.000000000 +0300 -+++ Python-3.3.0/Lib/site.py 2012-10-09 21:17:48.131059160 +0300 +Only in Python-3.3.3/Lib/distutils: sysconfig.py.orig +diff -uar Python-3.3.3.orig/Lib/site.py Python-3.3.3/Lib/site.py +--- Python-3.3.3.orig/Lib/site.py 2013-11-17 09:22:38.000000000 +0200 ++++ Python-3.3.3/Lib/site.py 2013-12-29 13:48:10.103637173 +0200 @@ -303,13 +303,13 @@ if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) @@ -52,9 +53,9 @@ diff -uar Python-3.3.0.orig/Lib/site.py Python-3.3.0/Lib/site.py if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -diff -uar Python-3.3.0.orig/Lib/sysconfig.py Python-3.3.0/Lib/sysconfig.py ---- Python-3.3.0.orig/Lib/sysconfig.py 2012-09-29 11:00:31.000000000 +0300 -+++ Python-3.3.0/Lib/sysconfig.py 2012-10-09 21:24:26.697695600 +0300 +diff -uar Python-3.3.3.orig/Lib/sysconfig.py Python-3.3.3/Lib/sysconfig.py +--- Python-3.3.3.orig/Lib/sysconfig.py 2013-11-17 09:22:39.000000000 +0200 ++++ Python-3.3.3/Lib/sysconfig.py 2013-12-29 13:48:10.103637173 +0200 @@ -21,10 +21,10 @@ _INSTALL_SCHEMES = { @@ -100,10 +101,10 @@ diff -uar Python-3.3.0.orig/Lib/sysconfig.py Python-3.3.0/Lib/sysconfig.py 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -diff -uar Python-3.3.0.orig/Lib/venv/__init__.py Python-3.3.0/Lib/venv/__init__.py ---- Python-3.3.0.orig/Lib/venv/__init__.py 2012-09-29 11:00:40.000000000 +0300 -+++ Python-3.3.0/Lib/venv/__init__.py 2013-02-10 13:29:16.859718301 +0200 -@@ -127,7 +127,7 @@ +diff -uar Python-3.3.3.orig/Lib/venv/__init__.py Python-3.3.3/Lib/venv/__init__.py +--- Python-3.3.3.orig/Lib/venv/__init__.py 2013-11-17 09:22:53.000000000 +0200 ++++ Python-3.3.3/Lib/venv/__init__.py 2013-12-29 13:48:10.103637173 +0200 +@@ -117,7 +117,7 @@ else: binname = 'bin' incpath = 'include' @@ -112,10 +113,11 @@ diff -uar Python-3.3.0.orig/Lib/venv/__init__.py Python-3.3.0/Lib/venv/__init__. context.inc_path = path = os.path.join(env_dir, incpath) create_if_needed(path) create_if_needed(libpath) -diff -uar Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in ---- Python-3.3.0.orig/Makefile.pre.in 2012-09-29 11:00:41.000000000 +0300 -+++ Python-3.3.0/Makefile.pre.in 2012-10-09 21:26:05.949858929 +0300 -@@ -108,7 +108,7 @@ +Only in Python-3.3.3/Lib/venv: __init__.py.orig +diff -uar Python-3.3.3.orig/Makefile.pre.in Python-3.3.3/Makefile.pre.in +--- Python-3.3.3.orig/Makefile.pre.in 2013-11-17 09:22:55.000000000 +0200 ++++ Python-3.3.3/Makefile.pre.in 2013-12-29 13:48:10.104637203 +0200 +@@ -115,7 +115,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -124,9 +126,10 @@ diff -uar Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -diff -uar Python-3.3.0.orig/Modules/getpath.c Python-3.3.0/Modules/getpath.c ---- Python-3.3.0.orig/Modules/getpath.c 2012-09-29 11:00:45.000000000 +0300 -+++ Python-3.3.0/Modules/getpath.c 2012-10-09 21:30:59.047390113 +0300 +Only in Python-3.3.3: Makefile.pre.in.orig +diff -uar Python-3.3.3.orig/Modules/getpath.c Python-3.3.3/Modules/getpath.c +--- Python-3.3.3.orig/Modules/getpath.c 2013-11-17 09:23:01.000000000 +0200 ++++ Python-3.3.3/Modules/getpath.c 2013-12-29 13:48:10.104637203 +0200 @@ -122,8 +122,8 @@ #endif @@ -147,7 +150,7 @@ diff -uar Python-3.3.0.orig/Modules/getpath.c Python-3.3.0/Modules/getpath.c static void reduce(wchar_t *dir) -@@ -677,7 +677,7 @@ +@@ -685,7 +685,7 @@ } else wcsncpy(zip_path, _prefix, MAXPATHLEN); @@ -156,7 +159,7 @@ diff -uar Python-3.3.0.orig/Modules/getpath.c Python-3.3.0/Modules/getpath.c bufsz = wcslen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; -@@ -687,7 +687,7 @@ +@@ -695,7 +695,7 @@ fprintf(stderr, "Could not find platform dependent libraries <exec_prefix>\n"); wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); @@ -165,10 +168,11 @@ diff -uar Python-3.3.0.orig/Modules/getpath.c Python-3.3.0/Modules/getpath.c } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ -diff -uar Python-3.3.0.orig/setup.py Python-3.3.0/setup.py ---- Python-3.3.0.orig/setup.py 2012-09-29 11:00:50.000000000 +0300 -+++ Python-3.3.0/setup.py 2012-10-09 21:33:43.444006602 +0300 -@@ -459,7 +459,7 @@ +Only in Python-3.3.3/Modules: getpath.c.orig +diff -uar Python-3.3.3.orig/setup.py Python-3.3.3/setup.py +--- Python-3.3.3.orig/setup.py 2013-11-17 09:23:09.000000000 +0200 ++++ Python-3.3.3/setup.py 2013-12-29 13:48:10.105637233 +0200 +@@ -439,7 +439,7 @@ # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -177,7 +181,7 @@ diff -uar Python-3.3.0.orig/setup.py Python-3.3.0/setup.py add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: -@@ -729,11 +729,11 @@ +@@ -712,11 +712,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -191,7 +195,7 @@ diff -uar Python-3.3.0.orig/setup.py Python-3.3.0/setup.py extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -770,8 +770,8 @@ +@@ -753,8 +753,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |