Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python3: Update to 3.6.1 (#2587)

Browse Source 
* python3: Update to 3.6.1

The patches starting with 16 are new to fix the build.
Some no longer relevant patches were dropped, the rest is just refreshed.

* Bump pkgrel of all packages containing Python 3 bytecode/extensions.

The package list was generated using:
    pkgfile.exe -R mingw64 -r "cpython.*\\.(py[cod]|dll)"

* lensfun: Add cmake to makedepends

* numpy: Don't hardcode the Python version

* blender: rebuild for new Python

* boost: Don't hardcode Python versions; rebuild

* pillow: Don't hardcode Python version; rebuild

* python-dateutil: Don't hardcode Python versions

* sip: Don't hardcode Python versions

* pyqt4: Don't hardcode Python versions; rebuild

* pyqt5: Don't hardcode Python versions; rebuild

* opencv: Update Python3 version in patch
This commit is contained in:
Christoph Reiter
2017-06-15 16:40:51 +02:00
committed by Алексей
parent e903b1ea94
commit 9757046077
142 changed files with 447 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch
View File

@@ -1,7 +1,6 @@
diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
--- Python-3.5.2-orig/PC/getpathp.c 2016-07-12 14:20:55.989800700 +0300
+++ Python-3.5.2/PC/getpathp.c 2016-07-12 14:21:11.286800700 +0300
@@ -104,10 +104,17 @@
--- Python-3.6.1/PC/getpathp.c.orig 2017-06-13 18:34:39.009203800 +0200
+++ Python-3.6.1/PC/getpathp.c 2017-06-13 18:36:41.448206900 +0200
@@ -129,10 +129,17 @@
# define USE_POSIX_PREFIX
@@ -19,7 +18,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t dllpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
@@ -299,6 +306,82 @@
@@ -356,6 +363,82 @@
/* a string loaded from the DLL at startup.*/
extern const char *PyWin_DLLVersionString;
@@ -102,7 +101,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
/* Load a PYTHONPATH value from the registry.
Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER.
@@ -573,6 +656,9 @@
@@ -713,6 +796,9 @@
#ifdef USE_POSIX_PREFIX
int pfound;
#endif
@@ -110,9 +109,9 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
+ int efound;
+#endif
#ifdef MS_WINDOWS
int skiphome, skipdefault;
@@ -668,6 +754,16 @@
wchar_t *machinepath = NULL;
@@ -805,6 +891,15 @@
if (envpath && *envpath == '\0')
envpath = NULL;
@@ -125,11 +124,10 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
+ join(exec_prefix, L"lib-dynload");
+ }
+#endif
+
#ifdef MS_WINDOWS
/* Calculate zip archive path from DLL or exe path */
if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath))
@@ -722,6 +818,9 @@
skiphome = pythonhome==NULL ? 0 : 1;
#ifdef Py_ENABLE_SHARED
@@ -844,6 +939,9 @@
#ifdef USE_POSIX_PREFIX
bufsz += wcslen(prefix) + 1;
#endif
@@ -138,8 +136,8 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
+#endif
bufsz += wcslen(PYTHONPATH) + 1;
bufsz += wcslen(argv0_path) + 1;
#ifdef MS_WINDOWS
@@ -771,6 +870,11 @@
if (userpath)
@@ -888,6 +986,11 @@
buf = wcschr(buf, L'\0');
*buf++ = DELIM;
#endif
@@ -151,7 +149,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
if (userpath) {
if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath))
Py_FatalError("buffer overflow in getpathp.c's calculate_path()");
@@ -844,6 +948,17 @@
@@ -953,6 +1056,17 @@
reduce(prefix);
reduce(prefix);
}
@@ -169,7 +167,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c
#endif
if (*prefix==L'\0') {
wchar_t lookBuf[MAXPATHLEN+1];
@@ -913,7 +1028,13 @@
@@ -1022,7 +1136,13 @@
wchar_t *
Py_GetExecPrefix(void)
{