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

python: drop patch no longer required

Browse Source 
minwg-w64 is fixed now
This commit is contained in:
Christoph Reiter
2021-02-19 19:01:39 +01:00
parent eca741f88c
commit d85e6bb6d2
2 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mingw-w64-python/3010-workaround-missing-lconv-members-mingw.patch
View File

@@ -1,31 +0,0 @@
--- Python-3.8.7/Modules/_localemodule.c.orig 2020-12-26 06:59:08.920163200 +0100
+++ Python-3.8.7/Modules/_localemodule.c 2020-12-26 07:01:52.023610900 +0100
@@ -177,7 +177,7 @@
#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#else /* MS_WINDOWS */
/* Use _W_* fields of Windows struct lconv */
-#define GET_LOCALE_STRING(ATTR) PyUnicode_FromWideChar(lc->_W_ ## ATTR, -1)
+#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#endif /* MS_WINDOWS */
int res = -1;
@@ -249,7 +249,7 @@
#ifdef MS_WINDOWS
/* Use _W_* fields of Windows struct lconv */
-#define GET_LOCALE_STRING(ATTR) PyUnicode_FromWideChar(lc->_W_ ## ATTR, -1)
+#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#else
#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#endif
--- Python-3.8.7/Python/fileutils.c.orig 2020-12-21 17:25:24.000000000 +0100
+++ Python-3.8.7/Python/fileutils.c 2020-12-26 06:52:52.517357800 +0100
@@ -1975,7 +1975,7 @@
#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#else /* MS_WINDOWS */
/* Use _W_* fields of Windows strcut lconv */
-#define GET_LOCALE_STRING(ATTR) PyUnicode_FromWideChar(lc->_W_ ## ATTR, -1)
+#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#endif /* MS_WINDOWS */
int res = -1;

8
mingw-w64-python/PKGBUILD
View File

@@ -18,7 +18,7 @@ pkgbase="mingw-w64-${_realname}"
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_pybasever=3.8
pkgver=${_pybasever}.8
pkgrel=1
pkgrel=2
provides=("${MINGW_PACKAGE_PREFIX}-python3=${pkgver}")
conflicts=("${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-python2<2.7.16-7")
@@ -132,7 +132,6 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
2080-pkg-config-windows-must-link-ext-with-python-lib.patch
3000-importlib-bootstrap-path-sep.patch
3001-pathlib-path-sep.patch
3010-workaround-missing-lconv-members-mingw.patch
3011-fix-build-testinternalcapi.patch
3020-extend-MS_WINDOWS-flag.patch
5000-warnings-fixes.patch
@@ -299,10 +298,6 @@ prepare() {
apply_patch_with_msg 5000-warnings-fixes.patch
# https://sourceforge.net/p/mingw-w64/bugs/870/
# This can be skipped with a newer msvcrt
apply_patch_with_msg 3010-workaround-missing-lconv-members-mingw.patch
apply_patch_with_msg 3011-fix-build-testinternalcapi.patch
apply_patch_with_msg 3020-extend-MS_WINDOWS-flag.patch
@@ -549,7 +544,6 @@ sha256sums=('7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc'
'487c92837717975ad6c63fe2a1f8e8c5c9e0554e96000102d83c82f4a77fd9bd'
'f6ecf2edc9468210111d77e396853af49cb8a43d9bc0d20212f88cf2bc33685d'
'6efc39323d14239f2a55576a8b3f32cb79eeefdd5881ba813493c14be2939f3c'
'd7bbac08482c68d7c45afb5ab7b76832e93ab0490524238eae5886535f35cb4a'
'005381222cfef42ccc21151845b6d43d25c861f35c2192e5e23c2a14df7938f0'
'b6b3f8f2c809dc7ef43bc26306516edf4a5d1e038343ad8c7a45f666011c2e8b'
'24151631c3e70306ae92ffb8fea38992a752cd0a76771a5e53445f56c2be1f00'