From a3cf4cf601b90f7cb8615e94cbb3072fcec869c3 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:17 +0000 Subject: [PATCH 01/52] cython: update to 0.29.24 --- mingw-w64-cython/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-cython/PKGBUILD b/mingw-w64-cython/PKGBUILD index ea8c622ca4..668d024902 100644 --- a/mingw-w64-cython/PKGBUILD +++ b/mingw-w64-cython/PKGBUILD @@ -4,8 +4,8 @@ _realname=cython pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-cython") -pkgver=0.29.23 -pkgrel=2 +pkgver=0.29.24 +pkgrel=1 pkgdesc="C-Extensions for Python (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -14,7 +14,7 @@ license=('APACHE') depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cython/cython/archive/${pkgver}.tar.gz") -sha256sums=('b10e32255418203c612b22d3647de75eafad20d79c55123ca696c7dda32d7f98') +sha256sums=('a5efb97612f0f97164e87c54cc295b2e2d06c539487670079963adeab872de80') prepare() { cd "${srcdir}" From 789fcee414c5efc96d182c405d56204ba2d3d8df Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:18 +0000 Subject: [PATCH 02/52] gi-docgen: update to 2021.7 --- mingw-w64-gi-docgen/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-gi-docgen/PKGBUILD b/mingw-w64-gi-docgen/PKGBUILD index b527f5094e..b71d8fcef2 100644 --- a/mingw-w64-gi-docgen/PKGBUILD +++ b/mingw-w64-gi-docgen/PKGBUILD @@ -4,8 +4,8 @@ _pyname=gi-docgen _realname=gi-docgen pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2021.6 -pkgrel=2 +pkgver=2021.7 +pkgrel=1 pkgdesc='Documentation tool for GObject-based libraries (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -25,7 +25,7 @@ makedepends=( source=( "${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz" ) -sha256sums=('369c6da3a83b49f7bad5dc5538dd78173a6a81855ccec4507c99d719fa10194f') +sha256sums=('0fd3f22b02204931d8feb4279fa00d4310d0b8a1f94d14025d440cddb4fe3e0a') prepare() { cd "$srcdir" From 6bd535cf15eb7057416462df1c1180a079a4bec0 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:19 +0000 Subject: [PATCH 03/52] python-build: update to 0.6.0.post1 --- mingw-w64-python-build/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-python-build/PKGBUILD b/mingw-w64-python-build/PKGBUILD index 55114e1672..9c7cdac213 100644 --- a/mingw-w64-python-build/PKGBUILD +++ b/mingw-w64-python-build/PKGBUILD @@ -3,8 +3,8 @@ _realname=build pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=0.5.1 -pkgrel=2 +pkgver=0.6.0.post1 +pkgrel=1 pkgdesc="A simple, correct PEP517 package builder (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -13,7 +13,7 @@ license=('MIT') depends=("${MINGW_PACKAGE_PREFIX}-python-colorama" "${MINGW_PACKAGE_PREFIX}-python-packaging" "${MINGW_PACKAGE_PREFIX}-python-pep517" - "${MINGW_PACKAGE_PREFIX}-python-toml" + "${MINGW_PACKAGE_PREFIX}-python-tomli" "${MINGW_PACKAGE_PREFIX}-python-virtualenv") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock" @@ -21,7 +21,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock" "${MINGW_PACKAGE_PREFIX}-python-pytest") source=("${_realname}-$pkgver.tar.gz"::"https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz" "0001-pass-ignore_errors-to-shutil.patch") -sha512sums=('72e82ed1f4d6185a862726b2c2f3b4bd05c3105ff5c3bf8e7595c0c1e0ab457304eda7849c2312e41a3bb4a9262c1099263fc87c3a759fc801dbe5cb6ccaef52' +sha512sums=('44e74173942471fde980958eedacfa44e1f322a27a0bde6bd42acece5e9d1cb8929ad6011dd867be6fdc5ff88c0617510d587b58dd19995749d0eecfb61bbe6e' '759940325ebaa073f3adb6b59b9afc8a7bf85583db1b98d48effca2f4c26602b134905778a72041855eef177cca317d9804c89f76d0a51262688f2c0274c9dd7') From a4b1b52a2de4ff72c528fa9dae853c3d1c87f94c Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:19 +0000 Subject: [PATCH 04/52] python-faker: update to 8.12.1 --- mingw-w64-python-faker/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-faker/PKGBUILD b/mingw-w64-python-faker/PKGBUILD index f2e21aca3a..c28fccdb51 100644 --- a/mingw-w64-python-faker/PKGBUILD +++ b/mingw-w64-python-faker/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=8.9.1 -pkgrel=2 +pkgver=8.12.1 +pkgrel=1 pkgdesc="Faker generates fake data for you (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -21,7 +21,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-ukpostcodeparser" "${MINGW_PACKAGE_PREFIX}-python-email-validator") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/joke2k/faker/archive/v${pkgver}.tar.gz") -sha512sums=('b5e244537fe6f8aa61e58e0df38837f20579a7fb811af772ae1f0ef8bb66c1f87d828d4a5ade65749793dd8dd2cb21a21f5694c19cdd6cfbd54203a3f02a6ec2') +sha512sums=('2c10c072add8ce6c5e0a0b1b2c490087c6630c6726e95cd6f987a8d62345ccd5d851463a732081ff1985d66f724b867094f8539a36ff725709118935352c4d7f') prepare() { cd "${srcdir}" From f5a2dc198dd561b9b30607a10a3bf2e2b475cd8e Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:19 +0000 Subject: [PATCH 05/52] python-fonttools: update to 4.26.2 --- mingw-w64-python-fonttools/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-fonttools/PKGBUILD b/mingw-w64-python-fonttools/PKGBUILD index fd67f9ea36..bae3a807d9 100644 --- a/mingw-w64-python-fonttools/PKGBUILD +++ b/mingw-w64-python-fonttools/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=4.24.4 -pkgrel=2 +pkgver=4.26.2 +pkgrel=1 pkgdesc="Converts OpenType and TrueType fonts to and from XML (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib" checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.zip::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.zip") -sha256sums=('df7fab667b039cd2a00a1fffcba73a32b2c630ef2a12ab7069ef6df5333f20c3') +sha256sums=('c1c0e03dd823e9e905232e875ea02dbb2dcd2ba195418c6d11bfaea49b9c774d') prepare() { rm -rf python-build-${CARCH} From 8b56b9029d8e2e1b7fa550a6fb0f3ec3e2d2724c Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:20 +0000 Subject: [PATCH 06/52] python-hypothesis: update to 6.18.0 --- mingw-w64-python-hypothesis/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-hypothesis/PKGBUILD b/mingw-w64-python-hypothesis/PKGBUILD index c7461454c0..ea186a31bc 100644 --- a/mingw-w64-python-hypothesis/PKGBUILD +++ b/mingw-w64-python-hypothesis/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=6.14.1 -pkgrel=2 +pkgver=6.18.0 +pkgrel=1 pkgdesc="Advanced Quickcheck style testing library for Python (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -34,7 +34,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") # "${MINGW_PACKAGE_PREFIX}-python-pandas") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${pkgver}.tar.gz") -sha512sums=('b84776e2bfff130c4db7582defbe9bc55183d624b45defffebdc954ca8e1dda1dec78f921e1bc7839a1167c37bce693711cd500da547dc6f2a8fa610c0bd3540') +sha512sums=('069deaa91b7dc7244c8fccb046e384c60009365418dfb7f76ed75428446a731ec860613201d0657c2c8b3b29e4fce3c403a93aa082f48b072471f919b7a1af5a') # Helper macros to help make tasks easier # apply_patch_with_msg() { From 91517f00eac0086d181154e70025fa532ed36cdb Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:20 +0000 Subject: [PATCH 07/52] python-importlib-metadata: update to 4.8.1 --- mingw-w64-python-importlib-metadata/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-importlib-metadata/PKGBUILD b/mingw-w64-python-importlib-metadata/PKGBUILD index 354124ecc4..e0be0fe761 100644 --- a/mingw-w64-python-importlib-metadata/PKGBUILD +++ b/mingw-w64-python-importlib-metadata/PKGBUILD @@ -3,8 +3,8 @@ _realname=importlib-metadata pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=4.6.0 -pkgrel=2 +pkgver=4.8.1 +pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") @@ -21,7 +21,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pip" "${MINGW_PACKAGE_PREFIX}-python-pytest-runner" "${MINGW_PACKAGE_PREFIX}-python-wheel") source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname//-/_}/${_realname//-/_}-${pkgver}.tar.gz") -sha256sums=('4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb') +sha256sums=('f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1') # Helper macros to help make tasks easier # apply_patch_with_msg() { From 08a3c659b66edf1a7f7f6358ac81083534777efe Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:20 +0000 Subject: [PATCH 08/52] python-ipython: update to 7.27.0 --- mingw-w64-python-ipython/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-ipython/PKGBUILD b/mingw-w64-python-ipython/PKGBUILD index f71523e47e..e767a0ff34 100644 --- a/mingw-w64-python-ipython/PKGBUILD +++ b/mingw-w64-python-ipython/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=7.25.0 -pkgrel=2 +pkgver=7.27.0 +pkgrel=1 pkgdesc="An enhanced Interactive Python shell (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -39,7 +39,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-requests" "${MINGW_PACKAGE_PREFIX}-python-ipykernel" "${MINGW_PACKAGE_PREFIX}-python-numpy") source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/${pkgver}.tar.gz") -sha256sums=('e4a61cde3dddf9d81099511d6906c87c3a01e0e39903fa9a6e725d74d76f337d') +sha256sums=('7dd6dd06d0ee527e45053fad8a8a9feb733d6934b9a5507ee4f050898b14217d') prepare() { cd "${srcdir}" From 7204f48fb55ad4230e0afd7704153e9b7cc04b8b Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:20 +0000 Subject: [PATCH 09/52] python-more-itertools: update to 8.9.0 --- mingw-w64-python-more-itertools/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-more-itertools/PKGBUILD b/mingw-w64-python-more-itertools/PKGBUILD index 67bad2ac0d..9276fd33eb 100644 --- a/mingw-w64-python-more-itertools/PKGBUILD +++ b/mingw-w64-python-more-itertools/PKGBUILD @@ -3,8 +3,8 @@ _realname=more-itertools pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=8.8.0 -pkgrel=2 +pkgver=8.9.0 +pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") @@ -17,7 +17,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/erikrose/more-itertools/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz") -sha256sums=('83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a') +sha256sums=('8c746e0d09871661520da4f1241ba6b908dc903839733c8203b552cffaf173bd') prepare() { cd "${srcdir}" From be0864fedee50820a97efe785fd1e296f64af558 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:21 +0000 Subject: [PATCH 10/52] python-numpy: update to 1.21.2 --- mingw-w64-python-numpy/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD index cba0ae30ef..efe98ae913 100644 --- a/mingw-w64-python-numpy/PKGBUILD +++ b/mingw-w64-python-numpy/PKGBUILD @@ -8,8 +8,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.21.0 -pkgrel=4 +pkgver=1.21.2 +pkgrel=1 pkgdesc="Scientific tools for Python (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -38,7 +38,7 @@ source=(https://github.com/numpy/numpy/releases/download/v${pkgver}/${_realname} 0010-mingw-inline-stuff.patch 0011-dont-die-if-no-fcompiler.patch 0012-clang-no-gcc-workaround.patch) -sha256sums=('b662c841b29848c04d9134f31dbaa7d4c8e673f45bb3a5f28d02f49c424d558a' +sha256sums=('76af194fbc117934ec5bbe2ff15177adbd05aeed23f18ee209ed88edcd777e05' '94f111ab238c4a82e8613ed14e4cbeb553eabff26523f576e5fcafdbfdc8ee29' '3aacb1d92e7764c9f0f24afa1a97b136a069fcd81d63c9fa55565c40c5a29974' '2679482ce9396b551e1e1e7674f373d139b3e8a2f9729026000dd3c581de41d7' From f46db6d1d92ff27811117549d19227be88e58bf1 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:21 +0000 Subject: [PATCH 11/52] python-packaging: update to 21.0 --- mingw-w64-python-packaging/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mingw-w64-python-packaging/PKGBUILD b/mingw-w64-python-packaging/PKGBUILD index 06ca37f642..bea2b5ab32 100644 --- a/mingw-w64-python-packaging/PKGBUILD +++ b/mingw-w64-python-packaging/PKGBUILD @@ -6,23 +6,23 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=20.9 -pkgrel=2 +pkgver=21.0 +pkgrel=1 pkgdesc="Core utilities for Python packages (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://github.com/pypa/packaging" license=('Apache') -depends=("${MINGW_PACKAGE_PREFIX}-python" +depends=("${MINGW_PACKAGE_PREFIX}-python-attrs" "${MINGW_PACKAGE_PREFIX}-python-pyparsing" - "${MINGW_PACKAGE_PREFIX}-python-six" - "${MINGW_PACKAGE_PREFIX}-python-attrs") + "${MINGW_PACKAGE_PREFIX}-python-pyparsing" + "${MINGW_PACKAGE_PREFIX}-python-six") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner" "${MINGW_PACKAGE_PREFIX}-python-pretend" "${MINGW_PACKAGE_PREFIX}-python-coverage") source=(https://pypi.io/packages/source/p/packaging/${_realname}-${pkgver}.tar.gz) -sha256sums=('5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5') +sha256sums=('7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7') prepare() { cd "${srcdir}" From bdffbf9130b78e76a9be6336c7ebee5d18521ca3 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:22 +0000 Subject: [PATCH 12/52] python-pip: update to 21.2.4 --- mingw-w64-python-pip/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-pip/PKGBUILD b/mingw-w64-python-pip/PKGBUILD index 308ee266a7..506fc7627f 100644 --- a/mingw-w64-python-pip/PKGBUILD +++ b/mingw-w64-python-pip/PKGBUILD @@ -7,8 +7,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=21.1.3 -pkgrel=2 +pkgver=21.2.4 +pkgrel=1 pkgdesc="The PyPA recommended tool for installing Python packages. (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -27,7 +27,7 @@ source=( "${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz" "0001-use-system-distlib.patch" ) -sha256sums=('b5b1eb91b36894bd01b8e5a56a422c2f3838573da0b0a1c63a096bb454e3b23f' +sha256sums=('0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b' 'c7f98690afa60e59324f1ce52e72bd7809cbfaba4e29a2d933f08c1a025f8246') prepare() { From 04cf33a8c379474ebc60597f28bca2ed50ae9b4f Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:22 +0000 Subject: [PATCH 13/52] python-pkgconfig: update to 1.5.5 --- mingw-w64-python-pkgconfig/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-pkgconfig/PKGBUILD b/mingw-w64-python-pkgconfig/PKGBUILD index 6abfcb3b0c..64e2e82499 100644 --- a/mingw-w64-python-pkgconfig/PKGBUILD +++ b/mingw-w64-python-pkgconfig/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.5.4 -pkgrel=2 +pkgver=1.5.5 +pkgrel=1 pkgdesc="A Python interface to the pkg-config command line tool" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -19,7 +19,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest" "${MINGW_PACKAGE_PREFIX}-python-nose") options=('staticlibs' 'strip' '!debug') source=("https://pypi.io/packages/source/p/pkgconfig/${_realname}-${pkgver}.tar.gz") -sha512sums=('56779390d2312508bc22ae44b05fa242f929005d6a96e485d6fa594ba160b4b44cfeed8c76feb196e7a2fae37bf3780917e544db97783dc024c3bdeace5623c3') +sha512sums=('ffa838d0146125c4158b747b619cc5eed41da0e2f04664a4db89909a486922120a0e1779f99dfcda0da3e98b8770c57b638a9c7bc5994cd8102aa3cf990905b0') prepare() { cd "${srcdir}" From a75070121cf812f3268ec08caa40b8ba0824159c Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:22 +0000 Subject: [PATCH 14/52] python-pluggy: update to 1.0.0 --- mingw-w64-python-pluggy/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-pluggy/PKGBUILD b/mingw-w64-python-pluggy/PKGBUILD index efdf1b68eb..adc3cca5c3 100644 --- a/mingw-w64-python-pluggy/PKGBUILD +++ b/mingw-w64-python-pluggy/PKGBUILD @@ -3,8 +3,8 @@ _realname=pluggy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=0.13.1 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") @@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pytest-dev/pluggy/archive/${pkgver}.tar.gz") -sha512sums=('3269f7ad7801a70ba8aa3182c568f70e2ee88a90b6f6335be631f9737dd42fac3fb1b27c5b6fe6422de128ddcc58736f0c41ed60b7c0177126dd676b98ece301') +sha512sums=('88f1180d2607115d6516cba07fa7c1f0e284d1e16fb7ed42c4a05d5d2b0dc1419d2bdbdadc34e2eb7f6b0cc9fc97715c6b184542c01f6bc33242a872c46d7903') prepare() { rm -rf python-build-${CARCH} | true From 698a61db0b9b3e7b4f6498c913b3283e4fa608e8 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:23 +0000 Subject: [PATCH 15/52] python-prettytable: update to 2.2.0 --- mingw-w64-python-prettytable/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-prettytable/PKGBUILD b/mingw-w64-python-prettytable/PKGBUILD index b74723c93a..5a06fae7e8 100644 --- a/mingw-w64-python-prettytable/PKGBUILD +++ b/mingw-w64-python-prettytable/PKGBUILD @@ -7,8 +7,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=1 pkgdesc="A simple Python library for easily displaying tabular data (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -20,7 +20,7 @@ options=('staticlibs' 'strip' '!debug') _dtoken=dc2e9370bf3be766302dbd6cd9729e258e875d31a7a21c9f760aaa5b5b5e source=("${_realname}-${pkgver}.tar.gz::https://files.pythonhosted.org/packages/source/P/PrettyTable/${_realname}-${pkgver}.tar.gz" "0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch") -sha256sums=('5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0' +sha256sums=('bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416' 'e9dd93c51ca3769c41cd2b7b27c58d8e6683fd4b6f4665291ad542d7917765d0') prepare() { From cadae251ac83abadd276562b4de5095b2b4b7fbc Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:23 +0000 Subject: [PATCH 16/52] python-prompt_toolkit: update to 3.0.20 --- mingw-w64-python-prompt_toolkit/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-prompt_toolkit/PKGBUILD b/mingw-w64-python-prompt_toolkit/PKGBUILD index 591cd20455..b08203377b 100644 --- a/mingw-w64-python-prompt_toolkit/PKGBUILD +++ b/mingw-w64-python-prompt_toolkit/PKGBUILD @@ -4,8 +4,8 @@ _pyname=prompt-toolkit _realname=prompt_toolkit pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=3.0.19 -pkgrel=2 +pkgver=3.0.20 +pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") @@ -18,7 +18,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-wcwidth") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") source=("${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz") -sha256sums=('08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f') +sha256sums=('eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c') prepare() { cd "${srcdir}" From 736f46f4a7cc46816122be00673e5213ff6e6c5d Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:23 +0000 Subject: [PATCH 17/52] python-pygments: update to 2.10.0 --- mingw-w64-python-pygments/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-pygments/PKGBUILD b/mingw-w64-python-pygments/PKGBUILD index 66292d539c..af48852ca3 100644 --- a/mingw-w64-python-pygments/PKGBUILD +++ b/mingw-w64-python-pygments/PKGBUILD @@ -8,8 +8,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=2.9.0 -pkgrel=2 +pkgver=2.10.0 +pkgrel=1 pkgdesc="Python syntax highlighter (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -18,7 +18,7 @@ url="http://pygments.org/" makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("https://pypi.org/packages/source/P/Pygments/${_pyname}-${pkgver}.tar.gz") noextract=("${_pyname}-${pkgver}.tar.gz") -sha256sums=('a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f') +sha256sums=('f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6') prepare() { # workaround for symlink issue From 5dd469445e5b7a51a02b912f9b6db2949dccfe7f Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:24 +0000 Subject: [PATCH 18/52] python-pytest-checkdocs: update to 2.7.1 --- mingw-w64-python-pytest-checkdocs/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-pytest-checkdocs/PKGBUILD b/mingw-w64-python-pytest-checkdocs/PKGBUILD index d28f77d49c..1ac6cbdfed 100644 --- a/mingw-w64-python-pytest-checkdocs/PKGBUILD +++ b/mingw-w64-python-pytest-checkdocs/PKGBUILD @@ -4,8 +4,8 @@ _pyname=pytest-checkdocs _realname=pytest-checkdocs pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=2.7.0 -pkgrel=2 +pkgver=2.7.1 +pkgrel=1 pkgdesc='check the README when running tests (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -19,7 +19,7 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm" ) source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") -sha256sums=('6eef175c9f30ee5572007aae2a94acaac3ba8ed55cccd351a38dcce21ca8c25d') +sha256sums=('2b33b85eddfe5846a69bea4a759303e2d5a3be11d03bc7149f5ba1ef47e6c1ae') prepare() { cd "$srcdir" From f51c7c82d9f32c03e77ff91a5a5a088867a198e4 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:24 +0000 Subject: [PATCH 19/52] python-pytest: update to 6.2.5 --- mingw-w64-python-pytest/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-pytest/PKGBUILD b/mingw-w64-python-pytest/PKGBUILD index 45af1bca4a..4fa644704b 100644 --- a/mingw-w64-python-pytest/PKGBUILD +++ b/mingw-w64-python-pytest/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=6.2.4 -pkgrel=2 +pkgver=6.2.5 +pkgrel=1 pkgdesc='simple powerful testing with Python (mingw-w64)' url='https://pytest.org/' license=('MIT') @@ -30,7 +30,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-hypothesis" "${MINGW_PACKAGE_PREFIX}-python-tox" "${MINGW_PACKAGE_PREFIX}-python-yaml") source=("${_realname}-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz") -sha256sums=('c83540d271f7d58d601f97f9f2dbe858e92d9bea5ff7867110e5505c12358406') +sha256sums=('4790fe991c954befb41cb2a2031efc0bd2e67ee514438425993ab00604c477e8') prepare() { sed -i "s/'_pytest.vendored_packages'//" ${_realname}-${pkgver}/setup.py From 04935953678066c5e10b3444ce7b8ca9b8231156 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:24 +0000 Subject: [PATCH 20/52] python-rich: update to 10.9.0 --- mingw-w64-python-rich/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-rich/PKGBUILD b/mingw-w64-python-rich/PKGBUILD index 6269bb763b..efba5d554c 100644 --- a/mingw-w64-python-rich/PKGBUILD +++ b/mingw-w64-python-rich/PKGBUILD @@ -3,8 +3,8 @@ _realname=rich pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=10.4.0 -pkgrel=2 +pkgver=10.9.0 +pkgrel=1 pkgdesc="Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -15,7 +15,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-colorama" "${MINGW_PACKAGE_PREFIX}-python-pygments") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("${_realname}-${pkgver}.tar.gz::https://pypi.io/packages/source/r/${_realname}/${_realname}-${pkgver}.tar.gz") -sha256sums=('6e8a3e2c61e6cf6193bfcffbb89865a0973af7779d3ead913fdbbbc33f457c2c') +sha256sums=('ba285f1c519519490034284e6a9d2e6e3f16dc7690f2de3d9140737d81304d22') prepare() { cd "${srcdir}" From 5945dc57786e0ea5e8c53d68f0fff5b553b0e621 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:24 +0000 Subject: [PATCH 21/52] python-setuptools-scm: update to 6.3.1 --- mingw-w64-python-setuptools-scm/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mingw-w64-python-setuptools-scm/PKGBUILD b/mingw-w64-python-setuptools-scm/PKGBUILD index 08b10d5909..cafbb3e987 100644 --- a/mingw-w64-python-setuptools-scm/PKGBUILD +++ b/mingw-w64-python-setuptools-scm/PKGBUILD @@ -6,18 +6,19 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=6.0.1 -pkgrel=2 +pkgver=6.3.1 +pkgrel=1 pkgdesc='Handles managing your python package versions in scm metadata (mingw-w64)' url='https://github.com/pypa/setuptools_scm' license=('MIT') arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') -depends=("${MINGW_PACKAGE_PREFIX}-python" +depends=("${MINGW_PACKAGE_PREFIX}-python-packaging" "${MINGW_PACKAGE_PREFIX}-python-setuptools" - "${MINGW_PACKAGE_PREFIX}-python-toml") + "${MINGW_PACKAGE_PREFIX}-python-toml" + "${MINGW_PACKAGE_PREFIX}-python-tomli") source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz") -sha256sums=('d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92') +sha256sums=('0f6a263912b13798c028b9a271d91af3bde0e42784091c797deccc3ad3a7f596') prepare() { cd "${srcdir}" From 859def7724b602d3b2e7be3d84eb5e5173c17cba Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:25 +0000 Subject: [PATCH 22/52] python-setuptools: update to 58.0.0 --- mingw-w64-python-setuptools/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-setuptools/PKGBUILD b/mingw-w64-python-setuptools/PKGBUILD index 8e8b1a5ef7..4c98f01dd0 100644 --- a/mingw-w64-python-setuptools/PKGBUILD +++ b/mingw-w64-python-setuptools/PKGBUILD @@ -8,8 +8,8 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-setuptools<42.0.2") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=57.1.0 -pkgrel=2 +pkgver=58.0.0 +pkgrel=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -48,7 +48,7 @@ checkdepends=( #"${MINGW_PACKAGE_PREFIX}-python-pytest-mypy" 'git' ) -sha256sums=('cfca9c97e7eebbc8abe18d5e5e962a08dcad55bb63afddd82d681de4d22a597b' +sha256sums=('ee45f4d69c4bbd21a27b60a7f1f32cbdcd34755cb613e5c4edcb58145394a0a3' '7b196884ac0151801f9638dabbf9a789fa9070a3b07a4c9e625c5523e8d47387' 'fa54581e3dddb9f4edd332dedbc101f48939a9ca5878e13cf9cf9b3408bc8c22' '39503256652c7c23ce07e26539e8123d269eb5c09f5d9b07e5784b2d7fb8c96f' From 0170dba6e256abcc82895366a4b83b5940af51d9 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:25 +0000 Subject: [PATCH 23/52] python-singledispatch: update to 3.7.0 --- mingw-w64-python-singledispatch/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-singledispatch/PKGBUILD b/mingw-w64-python-singledispatch/PKGBUILD index df21a9a2ba..8f9820f6bc 100644 --- a/mingw-w64-python-singledispatch/PKGBUILD +++ b/mingw-w64-python-singledispatch/PKGBUILD @@ -4,8 +4,8 @@ _pyname=singledispatch _realname=singledispatch pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=3.6.2 -pkgrel=2 +pkgver=3.7.0 +pkgrel=1 pkgdesc='Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3. (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -19,7 +19,7 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm" ) source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") -sha256sums=('d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391') +sha256sums=('c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092') prepare() { cd "$srcdir" From 78d7f61c26b0339a7d8da142c3ccd5d95cde919d Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:25 +0000 Subject: [PATCH 24/52] python-sphinx: update to 4.1.2 --- mingw-w64-python-sphinx/PKGBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mingw-w64-python-sphinx/PKGBUILD b/mingw-w64-python-sphinx/PKGBUILD index 2ade9559c1..b287e17feb 100644 --- a/mingw-w64-python-sphinx/PKGBUILD +++ b/mingw-w64-python-sphinx/PKGBUILD @@ -8,8 +8,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=4.0.2 -pkgrel=3 +pkgver=4.1.2 +pkgrel=1 pkgdesc="Python documentation generator (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -31,15 +31,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-babel" "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-htmlhelp" "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-jsmath" "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-qthelp" - "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-serializinghtml" - "${MINGW_PACKAGE_PREFIX}-python") + "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-serializinghtml") optdepends=( "${MINGW_PACKAGE_PREFIX}-imagemagick: ext.imageconverter" "${MINGW_PACKAGE_PREFIX}-texlive-latex-extra: for generation of PDF documentation" ) checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") source=("${_pyname}-${pkgver}.tar.gz"::"https://pypi.org/packages/source/S/${_pyname}/${_pyname}-${pkgver}.tar.gz") -sha256sums=('b5c2ae4120bf00c799ba9b3699bc895816d272d120080fbc967292f29b52b48c') +sha256sums=('3092d929cd807926d846018f2ace47ba2f3b671b309c7a89cd3306e80c826b13') prepare() { cd ${srcdir}/${_pyname}-${pkgver} From 70892ba884393bae2ef1eefec3cf9894caade286 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:26 +0000 Subject: [PATCH 25/52] python-stevedore: update to 3.4.0 --- mingw-w64-python-stevedore/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-stevedore/PKGBUILD b/mingw-w64-python-stevedore/PKGBUILD index 1ed2727a96..aa436e2aba 100644 --- a/mingw-w64-python-stevedore/PKGBUILD +++ b/mingw-w64-python-stevedore/PKGBUILD @@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=3.3.0 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Manage dynamic plugins for Python applications (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -17,7 +17,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-pbr") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") options=('staticlibs' 'strip' '!debug') source=(https://pypi.org/packages/source/s/stevedore/stevedore-${pkgver}.tar.gz) -sha256sums=('3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee') +sha256sums=('59b58edb7f57b11897f150475e7bc0c39c5381f0b8e3fa9f5c20ce6c89ec4aa1') # Helper macros to help make tasks easier # apply_patch_with_msg() { From 847104e26f845a3b6d5bb20bca27dcc58f6eb1c8 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:26 +0000 Subject: [PATCH 26/52] python-testtools: update to 2.5.0 --- mingw-w64-python-testtools/PKGBUILD | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/mingw-w64-python-testtools/PKGBUILD b/mingw-w64-python-testtools/PKGBUILD index cf20480069..fc1ec96198 100644 --- a/mingw-w64-python-testtools/PKGBUILD +++ b/mingw-w64-python-testtools/PKGBUILD @@ -6,24 +6,21 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=2.4.0 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="Extensions to the Python standard library unit testing framework (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url='https://github.com/testing-cabal/testtools' license=('MIT') -depends=("${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-python-pbr" - "${MINGW_PACKAGE_PREFIX}-python-extras" +depends=("${MINGW_PACKAGE_PREFIX}-python-extras" "${MINGW_PACKAGE_PREFIX}-python-fixtures" - "${MINGW_PACKAGE_PREFIX}-python-pyrsistent" - "${MINGW_PACKAGE_PREFIX}-python-mimeparse") + "${MINGW_PACKAGE_PREFIX}-python-pbr") makedepends=('git' "${MINGW_PACKAGE_PREFIX}-python3-setuptools") options=('staticlibs' 'strip' '!debug') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/testing-cabal/testtools/archive/${pkgver}.tar.gz") -sha256sums=('8b152cd95244fedad2e7bcb824d172978b12533317c827ae7845a8c0dbb6dd0c') +sha256sums=('5b332ceec9a893303647a152d1217653e47f7ab2c32d6a9eb16bdbce57f93757') prepare() { rm -rf python-build-${CARCH} | true From 8e91b205b7891ffe097248bc7e53ec1a587690c3 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:26 +0000 Subject: [PATCH 27/52] python-tqdm: update to 4.62.2 --- mingw-w64-python-tqdm/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-python-tqdm/PKGBUILD b/mingw-w64-python-tqdm/PKGBUILD index 347b2ac0d1..57cdfa0157 100644 --- a/mingw-w64-python-tqdm/PKGBUILD +++ b/mingw-w64-python-tqdm/PKGBUILD @@ -3,18 +3,18 @@ _realname=tqdm pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=4.61.1 -pkgrel=2 +pkgver=4.62.2 +pkgrel=1 pkgdesc='Fast, Extensible Progress Meter (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://github.com/tqdm/tqdm" license=('MIT' 'MPL') -depends=("${MINGW_PACKAGE_PREFIX}-python") +depends=("${MINGW_PACKAGE_PREFIX}-python-colorama") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-asyncio" "${MINGW_PACKAGE_PREFIX}-python-pandas" "${MINGW_PACKAGE_PREFIX}-python-numpy") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools-scm") source=("${_realname}-$pkgver.tar.gz::https://github.com/tqdm/tqdm/archive/v$pkgver.tar.gz") -sha256sums=('270cbd7a5b2d1e3ed13b084437b573bdac547e200a5f498eb09408eedacb2e25') +sha256sums=('c461d885ceaab8f4ac44e50e5ef9ea2e49788b3e5ee6e204a9a449fdb6f2b130') export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver From 612cac1a5957044ea10d527cc939517b06cb5517 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:27 +0000 Subject: [PATCH 28/52] python-traitlets: update to 5.1.0 --- mingw-w64-python-traitlets/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-python-traitlets/PKGBUILD b/mingw-w64-python-traitlets/PKGBUILD index fcad145748..1238c14058 100644 --- a/mingw-w64-python-traitlets/PKGBUILD +++ b/mingw-w64-python-traitlets/PKGBUILD @@ -6,18 +6,18 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=5.0.5 -pkgrel=2 +pkgver=5.1.0 +pkgrel=1 pkgdesc="A lightweight Traits like module (mingw-w64)" url="https://github.com/ipython/traitlets" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') license=('Modified BSD') -depends=("${MINGW_PACKAGE_PREFIX}-python-ipython_genutils") +depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz") -sha256sums=('dece08aa6205e9b494e134f93c2454d387f4677b50422565ec324aaf5ddf410d') +sha256sums=('ea523391b908c1ec5f2c80bb70398e7b5112d0ff825bba01a488d2106e77334d') prepare() { cd "${srcdir}" From b1b3b7d4da6930efc8a5c99a68bd8e6c1a4130e4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 17 Sep 2021 09:14:28 +0200 Subject: [PATCH 29/52] openscad: rebuild --- mingw-w64-openscad/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-openscad/PKGBUILD b/mingw-w64-openscad/PKGBUILD index a0cde5c09e..106764b165 100644 --- a/mingw-w64-openscad/PKGBUILD +++ b/mingw-w64-openscad/PKGBUILD @@ -4,7 +4,7 @@ _realname=openscad pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2021.01 -pkgrel=4 +pkgrel=6 pkgdesc="The programmers solid 3D CAD modeller (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') From 1e44524e072f00a26a75ef78b6ceaa4747b921c3 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:27 +0000 Subject: [PATCH 30/52] python-typing_extensions: update to 3.10.0.2 --- mingw-w64-python-typing_extensions/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-typing_extensions/PKGBUILD b/mingw-w64-python-typing_extensions/PKGBUILD index 2604550fa5..98f7ecba09 100644 --- a/mingw-w64-python-typing_extensions/PKGBUILD +++ b/mingw-w64-python-typing_extensions/PKGBUILD @@ -5,8 +5,8 @@ _pyname=typing-extensions _realname=typing_extensions pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=3.10.0.0 -pkgrel=2 +pkgver=3.10.0.2 +pkgrel=1 pkgdesc='Backported and Experimental Type Hints for Python 3.5+ (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -15,7 +15,7 @@ license=('PSF') depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("${_realname}-${pkgver}.tar.gz::https://pypi.python.org/packages/source/${_pyname:0:1}/${_pyname}/${_realname}-${pkgver}.tar.gz") -sha256sums=('50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342') +sha256sums=('49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e') prepare() { cd "${srcdir}" From 581d7d978e13dba20fe122ad956de71f50d16688 Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 6 Sep 2021 11:16:28 +0000 Subject: [PATCH 31/52] python-xlsxwriter: update to 3.0.1 --- mingw-w64-python-xlsxwriter/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-xlsxwriter/PKGBUILD b/mingw-w64-python-xlsxwriter/PKGBUILD index 3522305734..d7bd759407 100644 --- a/mingw-w64-python-xlsxwriter/PKGBUILD +++ b/mingw-w64-python-xlsxwriter/PKGBUILD @@ -3,8 +3,8 @@ _realname=xlsxwriter pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=1.4.3 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") @@ -17,7 +17,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") source=(${_realname}-${pkgver}.tar.gz::"https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${pkgver}.tar.gz") -sha256sums=('88ca0d5a5446df800694479364da94cd90e861a2f5d5b8f2e0b8dac6cea9ae5d') +sha256sums=('27d053943ee0fe302d711687ad37335187b9352db001f3b5d6b1c527a528667f') build() { cd "${srcdir}/XlsxWriter-RELEASE_${pkgver}" From 871170bf872d231c96110612ad3bc878bfa93860 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 6 Sep 2021 18:15:50 +0530 Subject: [PATCH 32/52] tomli: new package no idea why but many python packages started to depend on this suddenly. --- mingw-w64-python-tomli/PKGBUILD | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 mingw-w64-python-tomli/PKGBUILD diff --git a/mingw-w64-python-tomli/PKGBUILD b/mingw-w64-python-tomli/PKGBUILD new file mode 100644 index 0000000000..4938a91f12 --- /dev/null +++ b/mingw-w64-python-tomli/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Naveen M K + +_pyname=tomli +_realname=tomli +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") +pkgver=1.2.1 +pkgrel=1 +pkgdesc="A lil' TOML parser (mingw-w64)" +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +url="https://pypi.org/project/tomli/" +license=('MIT') +depends=( + "${MINGW_PACKAGE_PREFIX}-python" +) +makedepends=( + "${MINGW_PACKAGE_PREFIX}-python-setuptools" +) +source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") +sha256sums=('a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442') + +prepare() { + cd "$srcdir" + rm -rf python-build-${CARCH} | true + cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}" + export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} +} + +build() { + msg "Python build for ${CARCH}" + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py build +} + +package() { + cd "${srcdir}/python-build-${CARCH}" + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" --optimize=1 --skip-build + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" +} From 7689a5edb216655be1cb65863fd0fdb286214ea6 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 7 Sep 2021 13:45:36 +0530 Subject: [PATCH 33/52] flit: new package --- mingw-w64-python-flit/PKGBUILD | 87 +++++++++++++++++++++++++++++++++ mingw-w64-python-tomli/PKGBUILD | 6 ++- 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-python-flit/PKGBUILD diff --git a/mingw-w64-python-flit/PKGBUILD b/mingw-w64-python-flit/PKGBUILD new file mode 100644 index 0000000000..2d7f902743 --- /dev/null +++ b/mingw-w64-python-flit/PKGBUILD @@ -0,0 +1,87 @@ +# Maintainer: Naveen M K + +_pyname=flit +_realname=flit +pkgbase=mingw-w64-python-${_realname} +pkgname=( + "${MINGW_PACKAGE_PREFIX}-python-${_realname}" + "${MINGW_PACKAGE_PREFIX}-python-${_realname}-core" +) +pkgver=3.2.0 +pkgrel=1 +pkgdesc='Simplified packaging of Python modules (mingw-w64)' +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +url="https://github.com/takluyver/flit" +license=('BSD') +depends=( + "${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-toml" +) +makedepends=( + "${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-pip" +) +source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") +sha512sums=('b40768fb4b0b2a2e3116ac790dfa629da5a57cda34b10abb8ce6a8febcc3436795d5122dcfa3db2c6d07d493f00391d2ca7300112561c8ff2a0b04d77c879662') + +prepare() { + cd "$srcdir" + rm -rf python-build-${CARCH} | true + cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}" +} + +build() { + cd "${srcdir}/python-build-${CARCH}/flit_core" + ${MINGW_PREFIX}/bin/python -m build . -x -n -w + + cd "${srcdir}/python-build-${CARCH}" + PYTHONPATH=flit_core ${MINGW_PREFIX}/bin/python -m build . -x -n -w + cp flit_core/dist/*.whl dist/ +} + +package_python-flit() { + depends+=( + "${MINGW_PACKAGE_PREFIX}-python-flit-core" + "${MINGW_PACKAGE_PREFIX}-python-requests" + "${MINGW_PACKAGE_PREFIX}-python-docutils" + ) + + cd "${srcdir}/python-build-${CARCH}" + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python -m pip install dist/flit-${pkgver}-py3-none-any.whl \ + --compile \ + --no-deps \ + --no-warn-script-location \ + --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" + + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" +} + + +package_python-flit-core() { + pkgdesc+='Simplified packaging of Python modules (core backend) (mingw-w64)' + + cd "${srcdir}/python-build-${CARCH}" + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python -m pip install dist/flit_core-${pkgver}-py3-none-any.whl \ + --compile \ + --no-deps \ + --no-warn-script-location \ + --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" + + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}-core/LICENSE" +} + +# template start; name=mingw-w64-splitpkg-wrappers; version=1.0; +# vim: set ft=bash : + +# generate wrappers +for _name in "${pkgname[@]}"; do + _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}" + _func="$(declare -f "${_short}")" + eval "${_func/#${_short}/package_${_name}}" +done +# template end; diff --git a/mingw-w64-python-tomli/PKGBUILD b/mingw-w64-python-tomli/PKGBUILD index 4938a91f12..ee3f93ae8f 100644 --- a/mingw-w64-python-tomli/PKGBUILD +++ b/mingw-w64-python-tomli/PKGBUILD @@ -8,14 +8,14 @@ pkgver=1.2.1 pkgrel=1 pkgdesc="A lil' TOML parser (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://pypi.org/project/tomli/" license=('MIT') depends=( "${MINGW_PACKAGE_PREFIX}-python" ) makedepends=( - "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-build" ) source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") sha256sums=('a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442') @@ -25,6 +25,8 @@ prepare() { rm -rf python-build-${CARCH} | true cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}" export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} + + } build() { From 1c1cc68e8b46970fd727ff232d96d306b85f04e2 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 8 Sep 2021 19:03:07 +0530 Subject: [PATCH 34/52] tomli: makedep on flit --- mingw-w64-python-tomli/PKGBUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mingw-w64-python-tomli/PKGBUILD b/mingw-w64-python-tomli/PKGBUILD index ee3f93ae8f..f1ee6fe027 100644 --- a/mingw-w64-python-tomli/PKGBUILD +++ b/mingw-w64-python-tomli/PKGBUILD @@ -16,6 +16,8 @@ depends=( ) makedepends=( "${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-flit-core" + "${MINGW_PACKAGE_PREFIX}-python-pip" ) source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") sha256sums=('a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442') @@ -24,21 +26,23 @@ prepare() { cd "$srcdir" rm -rf python-build-${CARCH} | true cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}" - export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} - - } build() { msg "Python build for ${CARCH}" cd "${srcdir}/python-build-${CARCH}" - ${MINGW_PREFIX}/bin/python setup.py build + ${MINGW_PREFIX}/bin/python -m build . -x -n -w } package() { cd "${srcdir}/python-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ - --root="${pkgdir}" --optimize=1 --skip-build + ${MINGW_PREFIX}/bin/python -m pip install dist/${_pyname}-${pkgver}-py3-none-any.whl \ + --compile \ + --no-deps \ + --no-warn-script-location \ + --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" } From 258ee02e25d294277a4a337f04b6287e728e140e Mon Sep 17 00:00:00 2001 From: Rafal Date: Tue, 21 Sep 2021 19:02:38 +0200 Subject: [PATCH 35/52] Update PKGBUILD --- mingw-w64-scotch/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-scotch/PKGBUILD b/mingw-w64-scotch/PKGBUILD index 9f1994b761..b8d712cd3b 100644 --- a/mingw-w64-scotch/PKGBUILD +++ b/mingw-w64-scotch/PKGBUILD @@ -5,7 +5,7 @@ _realname=scotch pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgdesc='Graph partitioning and sparse matrix ordering package (mingw-w64)' -pkgver=6.1.0 +pkgver=6.1.1 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -14,13 +14,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-libgnurx") options=('strip' 'staticlibs') license=('CeCILL-C') url="https://www.labri.fr/perso/pelegrin/scotch/" -source=("https://gforge.inria.fr/frs/download.php/file/38352/${_realname}_${pkgver}.tar.gz" +source=("https://gforge.inria.fr/frs/download.php/file/38443/${_realname}_${pkgver}.tar.gz" "0001-makefile.inc.patch" "0002-pipe-fix.patch" "0003-thread-fix.patch" "0004-dummysizes-regex.patch" ) -sha256sums=('a3bc3fa3b243fcb52f8d68de4272562a0328afb18a96f535724d284e36730485' +sha256sums=('39052F59FF474A4A69CEFC25CF3CAF8429400889DEBA010EE6403CA188F8B311' '2c55b1e99a8d40c976e7147aa9102db2d1c489da1b760e526b424bf5ffd12716' '49d87533321504a9594d7bb4659fbced5afadd2fc0d73f0577b0b3ad47cc7d0f' '8a02cea7cdc3c685776012b2bb42cec8c5e98c435bdf1ffd62abf5ab6def9fbb' From 6c12e60f9295393920f0623b06aa7122d77e420b Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Tue, 21 Sep 2021 20:23:38 +0300 Subject: [PATCH 36/52] openscad: rebuild fix --- ...001-openscad-2021-libintl-collisions.patch | 22 +++++++++++++++++++ mingw-w64-openscad/PKGBUILD | 7 ++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-openscad/001-openscad-2021-libintl-collisions.patch diff --git a/mingw-w64-openscad/001-openscad-2021-libintl-collisions.patch b/mingw-w64-openscad/001-openscad-2021-libintl-collisions.patch new file mode 100644 index 0000000000..cad5c95439 --- /dev/null +++ b/mingw-w64-openscad/001-openscad-2021-libintl-collisions.patch @@ -0,0 +1,22 @@ +diff --git a/src/printutils.h b/src/printutils.h +index 5f887f0ef..0bb021eb4 100644 +--- a/src/printutils.h ++++ b/src/printutils.h +@@ -6,8 +6,17 @@ + #include + #include + #include ++ + #include ++// Undefine some defines from libintl.h to presolve ++// some collisions in boost headers later ++#if defined snprintf + #undef snprintf ++#endif ++#if defined vsnprintf ++#undef vsnprintf ++#endif ++ + #include + #include "AST.h" + #include diff --git a/mingw-w64-openscad/PKGBUILD b/mingw-w64-openscad/PKGBUILD index 106764b165..fbf414eb25 100644 --- a/mingw-w64-openscad/PKGBUILD +++ b/mingw-w64-openscad/PKGBUILD @@ -31,11 +31,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-eigen3" "${MINGW_PACKAGE_PREFIX}-imagemagick") options=(!strip staticlibs) -source=("https://files.openscad.org/${_realname}-${pkgver}.src.tar.gz") -sha256sums=('d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359') +source=("https://files.openscad.org/${_realname}-${pkgver}.src.tar.gz" + '001-openscad-2021-libintl-collisions.patch') +sha256sums=('d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359' + 'f295d41896cc55f6645e080e527ba3d033357bc744b7f7bb01b9271974ee930e') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + patch -p1 -i "${srcdir}/001-openscad-2021-libintl-collisions.patch" #rm -f libraries/MCAD/*.py } From f429a7b74d73923e56979ef31e4036867dad59f7 Mon Sep 17 00:00:00 2001 From: Ben Orchard Date: Tue, 21 Sep 2021 18:09:35 +0100 Subject: [PATCH 37/52] flint: Add new package --- mingw-w64-flint/PKGBUILD | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 mingw-w64-flint/PKGBUILD diff --git a/mingw-w64-flint/PKGBUILD b/mingw-w64-flint/PKGBUILD new file mode 100644 index 0000000000..2bcd4fb90a --- /dev/null +++ b/mingw-w64-flint/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Ben Orchard + +_realname=flint +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=2.8.0 +pkgrel=1 +pkgdesc="Fast Library for Number Theory (mingw-w64)" +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +depends=("${MINGW_PACKAGE_PREFIX}-mpfr" + "${MINGW_PACKAGE_PREFIX}-gmp") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") +license=('LGPL2.1') +url="https://www.flintlib.org/" +source=(https://www.flintlib.org/${_realname}-${pkgver}.tar.gz) +sha256sums=('584235cdc39d779d9920eaef16fe084f3c26ffeeea003a3fff64a20a0f33449e') + +build() { + [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" + mkdir -p "${srcdir}/build-${MSYSTEM}" + + cd "${srcdir}/build-${MSYSTEM}" + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + cmake \ + -G Ninja \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=true \ + "../${_realname}-${pkgver}" + + cmake --build . +} + +check() { + cd "${srcdir}/build-${MSYSTEM}" + cmake --build . --target test +} + +package() { + cd "${srcdir}/build-${MSYSTEM}" + DESTDIR="${pkgdir}" cmake --install . + install -Dm0644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" +} From 443fe68aefa8783d666bd2379c44393c2d54bccb Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Wed, 22 Sep 2021 10:40:50 +0800 Subject: [PATCH 38/52] Update Vala to 0.54.1 --- mingw-w64-vala/PKGBUILD | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD index 4bbd258719..a9210e0217 100644 --- a/mingw-w64-vala/PKGBUILD +++ b/mingw-w64-vala/PKGBUILD @@ -3,7 +3,7 @@ _realname=vala pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.52.5 +pkgver=0.54.1 pkgrel=1 pkgdesc="Compiler for the GObject type system (mingw-w64)" arch=('any') @@ -18,17 +18,17 @@ makedepends=("help2man" depends=("${MINGW_PACKAGE_PREFIX}-glib2" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \ echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround afer graphviz available -source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz - 001-change-pkg-config-invocations.mingw.patch - 002-use_time_s_functions_on_windows.mingw.patch) -sha256sums=('84a1bb312b3e5dcae4b7b25c45598d375e2cb69233cefb59a15d2350c76bdd91' - 'c588a3a69097aae30ada1d543001d5029865b1dd1f46132d9e60d12e1833b325' - '1309ae50867b81ea5d170487b36443a41c8dfee202213198c980a133300d6f9a') +source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz) +# 001-change-pkg-config-invocations.mingw.patch +# 002-use_time_s_functions_on_windows.mingw.patch) +sha256sums=('5dde77ac86f0633cb78a1eba7399edc77d5bbfe1e830c1203c51d594a169904a') +# 'c588a3a69097aae30ada1d543001d5029865b1dd1f46132d9e60d12e1833b325' +# '1309ae50867b81ea5d170487b36443a41c8dfee202213198c980a133300d6f9a') prepare() { cd "${srcdir}"/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-change-pkg-config-invocations.mingw.patch - patch -p1 -i ${srcdir}/002-use_time_s_functions_on_windows.mingw.patch + #patch -p1 -i ${srcdir}/001-change-pkg-config-invocations.mingw.patch + #patch -p1 -i ${srcdir}/002-use_time_s_functions_on_windows.mingw.patch autoreconf -ivf } @@ -56,4 +56,3 @@ package() { install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } - From d85caade6aea444b1f18a81fd753a037f6a871f6 Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Wed, 22 Sep 2021 10:57:29 +0800 Subject: [PATCH 39/52] Update to 0.54.1 --- ...-change-pkg-config-invocations.mingw.patch | 14 ---------- ...se_time_s_functions_on_windows.mingw.patch | 28 ------------------- mingw-w64-vala/PKGBUILD | 6 ---- 3 files changed, 48 deletions(-) delete mode 100644 mingw-w64-vala/001-change-pkg-config-invocations.mingw.patch delete mode 100644 mingw-w64-vala/002-use_time_s_functions_on_windows.mingw.patch diff --git a/mingw-w64-vala/001-change-pkg-config-invocations.mingw.patch b/mingw-w64-vala/001-change-pkg-config-invocations.mingw.patch deleted file mode 100644 index 23c4959e07..0000000000 --- a/mingw-w64-vala/001-change-pkg-config-invocations.mingw.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- vala-0.27.1/vapigen/vapigen.m4.orig 2015-01-14 14:51:42.117600000 +0300 -+++ vala-0.27.1/vapigen/vapigen.m4 2015-01-14 14:52:07.297000000 +0300 -@@ -85,9 +85,9 @@ - VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen - AS_IF([test "x$2" = "x"], [ -- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` -+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --dont-define-prefix --variable=vapidir $vapigen_pkg_name` - ], [ -- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` -+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --dont-define-prefix --variable=vapidir_versioned $vapigen_pkg_name` - ]) - ]) - diff --git a/mingw-w64-vala/002-use_time_s_functions_on_windows.mingw.patch b/mingw-w64-vala/002-use_time_s_functions_on_windows.mingw.patch deleted file mode 100644 index ee5ac0d622..0000000000 --- a/mingw-w64-vala/002-use_time_s_functions_on_windows.mingw.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- vala-0.46.4/vapi/glib-2.0.vapi.orig 2019-12-05 21:22:56.738635900 +0100 -+++ vala-0.46.4/vapi/glib-2.0.vapi 2019-12-05 21:23:59.901794000 +0100 -@@ -2950,19 +2950,19 @@ - [CCode (cname = "tm_isdst")] - public int isdst; - -- [CCode (cname = "gmtime_r", feature_test_macro = "_XOPEN_SOURCE")] -- static void gmtime_r (ref time_t time, out Time result); -- [CCode (cname = "localtime_r", feature_test_macro = "_XOPEN_SOURCE")] -- static void localtime_r (ref time_t time, out Time result); -+ [CCode (cname = "gmtime_s", feature_test_macro = "_XOPEN_SOURCE")] -+ static void gmtime_s (out Time result, ref time_t time); -+ [CCode (cname = "localtime_s", feature_test_macro = "_XOPEN_SOURCE")] -+ static void localtime_s (out Time result, ref time_t time); - - public static Time gm (time_t time) { - Time result; -- gmtime_r (ref time, out result); -+ gmtime_s (out result, ref time); - return result; - } - public static Time local (time_t time) { - Time result; -- localtime_r (ref time, out result); -+ localtime_s (out result, ref time); - return result; - } - diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD index a9210e0217..06c7617240 100644 --- a/mingw-w64-vala/PKGBUILD +++ b/mingw-w64-vala/PKGBUILD @@ -19,16 +19,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \ echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround afer graphviz available source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz) -# 001-change-pkg-config-invocations.mingw.patch -# 002-use_time_s_functions_on_windows.mingw.patch) sha256sums=('5dde77ac86f0633cb78a1eba7399edc77d5bbfe1e830c1203c51d594a169904a') -# 'c588a3a69097aae30ada1d543001d5029865b1dd1f46132d9e60d12e1833b325' -# '1309ae50867b81ea5d170487b36443a41c8dfee202213198c980a133300d6f9a') prepare() { cd "${srcdir}"/${_realname}-${pkgver} - #patch -p1 -i ${srcdir}/001-change-pkg-config-invocations.mingw.patch - #patch -p1 -i ${srcdir}/002-use_time_s_functions_on_windows.mingw.patch autoreconf -ivf } From 0adca526d1a2128cb9f57922e4632b71fab5036e Mon Sep 17 00:00:00 2001 From: Helge Konetzka <80620732+heljkon@users.noreply.github.com> Date: Wed, 8 Sep 2021 17:40:48 +0200 Subject: [PATCH 40/52] spice-gtk: Enable clang64 build by converting *sym-file to *.def --- mingw-w64-spice-gtk/002-export-symbols.patch | 63 ++++++++++++++++++++ mingw-w64-spice-gtk/PKGBUILD | 13 ++-- 2 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-spice-gtk/002-export-symbols.patch diff --git a/mingw-w64-spice-gtk/002-export-symbols.patch b/mingw-w64-spice-gtk/002-export-symbols.patch new file mode 100644 index 0000000000..a9faf5c230 --- /dev/null +++ b/mingw-w64-spice-gtk/002-export-symbols.patch @@ -0,0 +1,63 @@ +diff -Naur spice-gtk-0.39.orig/src/meson.build spice-gtk-0.39/src/meson.build +--- spice-gtk-0.39.orig/src/meson.build 2020-12-01 17:31:58.770751000 +0100 ++++ spice-gtk-0.39/src/meson.build 2021-09-19 14:37:59.316849400 +0200 +@@ -186,9 +186,9 @@ + spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) + spice_gtk_has_version_script = compiler.has_link_argument(spice_gtk_version_script) + if not spice_gtk_has_version_script +- spice_client_glib_syms = files('spice-glib-sym-file') +- spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file' +- spice_gtk_version_script = ['-export-symbols', spice_client_glib_syms_path] ++ spice_client_glib_syms = files('spice-glib-sym-file.def') ++ spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file.def' ++ spice_gtk_version_script = ['', spice_client_glib_syms_path] + endif + + # soversion +@@ -387,9 +387,9 @@ + # + spice_client_gtk_syms = spice_client_glib_syms + if not spice_gtk_has_version_script +- spice_client_gtk_syms = files('spice-gtk-sym-file') +- spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file' +- spice_gtk_version_script = ['-export-symbols', spice_client_gtk_syms_path] ++ spice_client_gtk_syms = files('spice-gtk-sym-file.def') ++ spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file.def' ++ spice_gtk_version_script = ['', spice_client_gtk_syms_path] + endif + + # soversion +diff -Naur spice-gtk-0.39.orig/src/spice-glib-sym-file.def spice-gtk-0.39/src/spice-glib-sym-file.def +--- spice-gtk-0.39.orig/src/spice-glib-sym-file.def 2020-12-01 17:31:58.774751000 +0100 ++++ spice-gtk-0.39/src/spice-glib-sym-file.def 2021-09-19 15:01:17.656147700 +0200 +@@ -1,3 +1,5 @@ ++LIBRARY "libspice-client-glib-2.0-8.dll" ++EXPORTS + spice_audio_get + spice_audio_get_type + spice_audio_new +@@ -151,6 +153,7 @@ + spice_usb_device_manager_can_redirect_device + spice_usb_device_manager_connect_device_async + spice_usb_device_manager_connect_device_finish ++spice_usb_device_manager_create_shared_cd_device + spice_usb_device_manager_disconnect_device + spice_usb_device_manager_disconnect_device_async + spice_usb_device_manager_disconnect_device_finish +@@ -159,6 +162,7 @@ + spice_usb_device_manager_get_devices_with_filter + spice_usb_device_manager_get_type + spice_usb_device_manager_is_device_connected ++spice_usb_device_manager_is_device_shared_cd + spice_usb_device_manager_is_redirecting + spice_usbredir_channel_get_type + spice_util_get_debug +diff -Naur spice-gtk-0.39.orig/src/spice-gtk-sym-file.def spice-gtk-0.39/src/spice-gtk-sym-file.def +--- spice-gtk-0.39.orig/src/spice-gtk-sym-file.def 2020-12-01 17:31:58.775750900 +0100 ++++ spice-gtk-0.39/src/spice-gtk-sym-file.def 2021-09-19 14:49:38.462620100 +0200 +@@ -1,3 +1,5 @@ ++LIBRARY "libspice-client-gtk-3.0-5.dll" ++EXPORTS + spice_display_get_grab_keys + spice_display_get_pixbuf + spice_display_get_type diff --git a/mingw-w64-spice-gtk/PKGBUILD b/mingw-w64-spice-gtk/PKGBUILD index 0ac6a2f8dd..0ffd94233f 100644 --- a/mingw-w64-spice-gtk/PKGBUILD +++ b/mingw-w64-spice-gtk/PKGBUILD @@ -4,7 +4,7 @@ _realname=spice-gtk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.39 -pkgrel=1 +pkgrel=2 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="GTK3 widget for SPICE clients (mingw-w64)" @@ -31,15 +31,20 @@ options=('strip' '!debug' 'staticlibs') license=("GPL 2") url="https://www.spice-space.org/" source=(https://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.xz{,.sig} - 001-win.patch) + 001-win.patch + 002-export-symbols.patch) sha256sums=('23acbee197eaaec9bce6e6bfd885bd8f79708332639243ff04833020865713cd' 'SKIP' - '8bb6f1896df080746736a74200f094bae4f48ac766d46a1793a761728fb01202') + '8bb6f1896df080746736a74200f094bae4f48ac766d46a1793a761728fb01202' + 'SKIP') validpgpkeys=('206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-win.patch + cp -p src/spice-glib-sym-file src/spice-glib-sym-file.def + cp -p src/spice-gtk-sym-file src/spice-gtk-sym-file.def + patch -p1 -i ${srcdir}/002-export-symbols.patch } build() { @@ -64,7 +69,7 @@ build() { -Dspice-common:manual=false \ "../${_realname}-${pkgver}" - ${MINGW_PREFIX}/bin/meson.exe compile + ${MINGW_PREFIX}/bin/meson.exe compile --verbose } check() { From 3326fb2f3af025660a2c7932f8dbf334fcd885d6 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Sun, 19 Sep 2021 13:25:34 -0700 Subject: [PATCH 41/52] try vs_module_defs linker option --- mingw-w64-spice-gtk/002-export-symbols.patch | 65 +++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/mingw-w64-spice-gtk/002-export-symbols.patch b/mingw-w64-spice-gtk/002-export-symbols.patch index a9faf5c230..13508d445f 100644 --- a/mingw-w64-spice-gtk/002-export-symbols.patch +++ b/mingw-w64-spice-gtk/002-export-symbols.patch @@ -1,37 +1,56 @@ -diff -Naur spice-gtk-0.39.orig/src/meson.build spice-gtk-0.39/src/meson.build ---- spice-gtk-0.39.orig/src/meson.build 2020-12-01 17:31:58.770751000 +0100 -+++ spice-gtk-0.39/src/meson.build 2021-09-19 14:37:59.316849400 +0200 -@@ -186,9 +186,9 @@ +diff --git a/src/meson.build b/src/meson.build +index 50e27d9..d3b43e8 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -186,9 +186,8 @@ spice_client_glib_syms_path = meson.current_source_dir() / 'map-file' spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) spice_gtk_has_version_script = compiler.has_link_argument(spice_gtk_version_script) if not spice_gtk_has_version_script - spice_client_glib_syms = files('spice-glib-sym-file') - spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file' - spice_gtk_version_script = ['-export-symbols', spice_client_glib_syms_path] -+ spice_client_glib_syms = files('spice-glib-sym-file.def') -+ spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file.def' -+ spice_gtk_version_script = ['', spice_client_glib_syms_path] ++ spice_client_glib_syms = [] ++ spice_gtk_version_script = [] endif # soversion -@@ -387,9 +387,9 @@ +@@ -207,7 +206,8 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc + include_directories : spice_gtk_include, + link_args : [spice_gtk_version_script], + link_depends : spice_client_glib_syms, +- dependencies : spice_glib_deps) ++ dependencies : spice_glib_deps, ++ vs_module_defs : 'spice-glib-sym-file.def') + + spice_client_glib_dep = declare_dependency(sources : [spice_marshals[1], spice_client_glib_enums[1]], + link_with : spice_client_glib_lib, +@@ -386,11 +386,6 @@ if spice_gtk_has_gtk + # libspice-client-gtk.so # spice_client_gtk_syms = spice_client_glib_syms - if not spice_gtk_has_version_script +- if not spice_gtk_has_version_script - spice_client_gtk_syms = files('spice-gtk-sym-file') - spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file' - spice_gtk_version_script = ['-export-symbols', spice_client_gtk_syms_path] -+ spice_client_gtk_syms = files('spice-gtk-sym-file.def') -+ spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file.def' -+ spice_gtk_version_script = ['', spice_client_gtk_syms_path] - endif +- endif # soversion -diff -Naur spice-gtk-0.39.orig/src/spice-glib-sym-file.def spice-gtk-0.39/src/spice-glib-sym-file.def ---- spice-gtk-0.39.orig/src/spice-glib-sym-file.def 2020-12-01 17:31:58.774751000 +0100 -+++ spice-gtk-0.39/src/spice-glib-sym-file.def 2021-09-19 15:01:17.656147700 +0200 -@@ -1,3 +1,5 @@ -+LIBRARY "libspice-client-glib-2.0-8.dll" + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +@@ -407,7 +402,8 @@ if spice_gtk_has_gtk + install : true, + link_args : [spice_gtk_version_script], + link_depends : spice_client_gtk_syms, +- dependencies : [spice_client_glib_dep, spice_gtk_deps, spice_wayland_deps]) ++ dependencies : [spice_client_glib_dep, spice_gtk_deps, spice_wayland_deps], ++ vs_module_defs : 'spice-gtk-sym-file.def') + + spice_client_gtk_dep = declare_dependency(sources : spice_widget_enums[1], + link_with : spice_client_gtk_lib, +diff --git a/src/spice-glib-sym-file.def b/src/spice-glib-sym-file.def +index 2cc80aa..baa63bd 100644 +--- a/src/spice-glib-sym-file.def ++++ b/src/spice-glib-sym-file.def +@@ -1,3 +1,4 @@ +EXPORTS spice_audio_get spice_audio_get_type @@ -52,11 +71,11 @@ diff -Naur spice-gtk-0.39.orig/src/spice-glib-sym-file.def spice-gtk-0.39/src/sp spice_usb_device_manager_is_redirecting spice_usbredir_channel_get_type spice_util_get_debug -diff -Naur spice-gtk-0.39.orig/src/spice-gtk-sym-file.def spice-gtk-0.39/src/spice-gtk-sym-file.def ---- spice-gtk-0.39.orig/src/spice-gtk-sym-file.def 2020-12-01 17:31:58.775750900 +0100 -+++ spice-gtk-0.39/src/spice-gtk-sym-file.def 2021-09-19 14:49:38.462620100 +0200 -@@ -1,3 +1,5 @@ -+LIBRARY "libspice-client-gtk-3.0-5.dll" +diff --git a/src/spice-gtk-sym-file.def b/src/spice-gtk-sym-file.def +index 5ba57cb..34ad225 100644 +--- a/src/spice-gtk-sym-file.def ++++ b/src/spice-gtk-sym-file.def +@@ -1,3 +1,4 @@ +EXPORTS spice_display_get_grab_keys spice_display_get_pixbuf From 4593e493ca5316c05621d161d85e01e955a6435c Mon Sep 17 00:00:00 2001 From: Helge Konetzka <80620732+heljkon@users.noreply.github.com> Date: Wed, 22 Sep 2021 08:42:25 +0200 Subject: [PATCH 42/52] spice-gtk: Enable clang64 build, cosmetics --- mingw-w64-spice-gtk/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-spice-gtk/PKGBUILD b/mingw-w64-spice-gtk/PKGBUILD index 0ffd94233f..f236a0fa9f 100644 --- a/mingw-w64-spice-gtk/PKGBUILD +++ b/mingw-w64-spice-gtk/PKGBUILD @@ -36,7 +36,7 @@ source=(https://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.xz{, sha256sums=('23acbee197eaaec9bce6e6bfd885bd8f79708332639243ff04833020865713cd' 'SKIP' '8bb6f1896df080746736a74200f094bae4f48ac766d46a1793a761728fb01202' - 'SKIP') + '3295af8a5656adad24c2b3f8858d458597f14acb00bb5782412c2a115cacf507') validpgpkeys=('206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho prepare() { @@ -69,7 +69,7 @@ build() { -Dspice-common:manual=false \ "../${_realname}-${pkgver}" - ${MINGW_PREFIX}/bin/meson.exe compile --verbose + ${MINGW_PREFIX}/bin/meson.exe compile } check() { From 8198ab6550b7bcb98838333f2facb8c1aab9d022 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 22 Sep 2021 09:11:46 +0200 Subject: [PATCH 43/52] python: Update to 3.9.7 This also adds builtin zoneinfo support like on Unix --- ...-make-_sysconfigdata.py-relocatable.patch} | 15 +- .../0002-restore-setup-config.patch | 6 +- ...-threads-and-make-it-default-on-min.patch} | 109 ++- ...gcc-internal-defines-to-python-platf.patch | 4 +- ...igure-MACHDEP-and-platform-for-build.patch | 66 +- ...0006-MINGW-preset-configure-defaults.patch | 8 +- ...largefile-support-for-windows-builds.patch | 6 +- ...0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 6 +- .../0009-MINGW-init-system-calls.patch | 8 +- ...INGW-build-in-windows-modules-winreg.patch | 6 +- ...etermine-if-pwdmodule-should-be-used.patch | 6 +- ...Mingw-recognition-to-pyport.h-to-al.patch} | 8 +- ...13-MINGW-configure-for-shared-build.patch} | 12 +- ... 0014-MINGW-dynamic-loading-support.patch} | 19 +- ...ore-main-program-for-frozen-scripts.patch} | 12 +- ...MINGW-setup-_multiprocessing-module.patch} | 10 +- ...h => 0017-MINGW-setup-select-module.patch} | 10 +- ...p-_ctypes-module-with-system-libffi.patch} | 12 +- ...t-winsock2-and-setup-_socket-module.patch} | 16 +- ...020-MINGW-exclude-unix-only-modules.patch} | 16 +- ...GW-setup-msvcrt-and-_winapi-modules.patch} | 12 +- ...nfig-MINGW-build-extensions-with-GCC.patch | 25 + ...tch => 0023-MINGW-setup-_ssl-module.patch} | 10 +- ...tion-of-posix-build-in-sysconfig.py.patch} | 14 +- ...-support-stdcall-without-underscore.patch} | 6 +- ...ad-rename-to-avoid-failure-on-windo.patch} | 10 +- ....patch => 0027-MINGW-customize-site.patch} | 6 +- ....patch => 0028-add-python-config-sh.patch} | 6 +- ....patch => 0029-cross-darwin-feature.patch} | 24 +- ...i.patch => 0030-mingw-system-libffi.patch} | 10 +- ...ys-mingw-prefer-unix-sep-if-MSYSTEM.patch} | 8 +- ...tch => 0032-mingw-use-posix-getpath.patch} | 10 +- ...ingw-add-ModuleFileName-dir-to-PATH.patch} | 6 +- ...d-BUILDIN_WIN32_MODULEs-time-msvcrt.patch} | 6 +- ...-cygwin-semi-native-build-sysconfig.patch} | 14 +- ...036-py3k-mingw-ntthreads-vs-pthreads.patch | 64 -- ...ysconfig-mingw-sysconfig-like-posix.patch} | 44 +- ...rlier-so-we-can-use-it-in-distutils-.patch | 39 + ...-multiarch-paths-if-cross-compiling.patch} | 10 +- ...gw-use-backslashes-in-compileall-py.patch} | 8 +- ...-msys-convert_path-fix-and-root-hack.patch | 42 + ...tk.patch => 0041-allow-static-tcltk.patch} | 16 +- ....patch => 0042-mingw-pdcurses_ISPAD.patch} | 6 +- ...r-fixes.patch => 0043-grammar-fixes.patch} | 6 +- ...-fixes.patch => 0044-builddir-fixes.patch} | 8 +- ...ys-monkeypatch-os-system-via-sh-exe.patch} | 8 +- ...lace-slashes-used-in-io-redirection.patch} | 18 +- ...tch => 0047-remove_path_max.default.patch} | 6 +- ...atch => 0048-dont-link-with-gettext.patch} | 8 +- ...dll.patch => 0049-ctypes-python-dll.patch} | 6 +- ....patch => 0050-gdbm-module-includes.patch} | 6 +- ...ch => 0051-use-gnu_printf-in-format.patch} | 6 +- ...-fix-ssl-dont-use-enum_certificates.patch} | 6 +- ...ix-using-dllhandle-and-winver-mingw.patch} | 6 +- ...config-so-msvccompiler-get_build_ve.patch} | 6 +- ...-MINGW-link-with-additional-library.patch} | 10 +- ...msilib.patch => 0056-install-msilib.patch} | 8 +- ...tch => 0057-fix-signal-module-build.patch} | 6 +- ...build-winconsoleio-and-_testconsole.patch} | 23 +- ...ink.patch => 0059-expose-sem_unlink.patch} | 6 +- ...-isatty.patch => 0060-cygpty-isatty.patch} | 16 +- ... => 0061-disable-broken-gdbm-module.patch} | 10 +- ...in-resource-files-and-build-pythonw.patch} | 55 +- ...mingw.patch => 0063-3.7-mpdec-mingw.patch} | 10 +- ...line.patch => 0064-disable-readline.patch} | 10 +- ...able.patch => 0065-fix-isselectable.patch} | 6 +- ...6-use-_wcsnicmp-instead-wcsncasecmp.patch} | 6 +- ...ch => 0067-_xxsubinterpretersmodule.patch} | 6 +- ...068-dont-include-system-ncurses-path.patch | 36 - ...atch => 0068-sqlite3-module-defines.patch} | 10 +- ...69-configure.ac-fix-inet_pton-check.patch} | 10 +- ...=> 0070-set-venv-activate-path-unix.patch} | 6 +- ...s.patch => 0071-venv-creation-fixes.patch} | 6 +- ...ch => 0072-pass-gen-profile-ldflags.patch} | 10 +- ...ndows-must-link-ext-with-python-lib.patch} | 12 +- ...> 0074-importlib-bootstrap-path-sep.patch} | 6 +- ...-sep.patch => 0075-pathlib-path-sep.patch} | 8 +- ...-fixes.patch => 0076-warnings-fixes.patch} | 8 +- ... => 0077-fix-build-testinternalcapi.patch} | 10 +- ...atch => 0078-extend-MS_WINDOWS-flag.patch} | 8 +- ...ang-arm64.patch => 0079-clang-arm64.patch} | 24 +- ...onfigure.ac-set-MINGW-stack-reserve.patch} | 8 +- ...81-Don-t-use-os.pathsep-to-find-EOF.patch} | 6 +- ...on-suffix-for-c-extensions-on-mingw.patch} | 33 +- ...he-get_platform-method-in-sysconfig.patch} | 49 +- ...er-customize-mingw-cygwin-compilers.patch} | 6 +- ...distutils-compiler-enable-new-dtags.patch} | 6 +- ...ils-MINGW-build-extensions-with-GCC.patch} | 31 +- ...gw32CCompiler-as-default-compiler-f.patch} | 7 +- ... 0088-distutils-find-import-library.patch} | 6 +- ...ircular-dependency-from-time-module.patch} | 7 +- ...ization-of-posix-build-in-distutils.patch} | 7 +- ...distutils-mingw-sysconfig-like-posix.patch | 28 + ...> 0092-distutils-get_versions-fixes.patch} | 44 +- ...3-distutils-install-layout-as-posix.patch} | 8 +- ...msys-convert_path-fix-and-root-hack.patch} | 52 +- ...distutils-mingw-build-optimized-ext.patch} | 8 +- .../0096-Add-CI-to-Build-and-Test.patch | 388 ---------- ...compiler-dont-strip-modules-if-pyde.patch} | 9 +- ...istutils-get-compilers-from-env-vars.patch | 161 ++++ ...utils-add-windmc-to-cygwinccompiler.patch} | 12 +- ... => 0099-distutils-fix-msvc9-import.patch} | 6 +- .../0100-Add-a-test-to-build-C-Ext.patch | 108 --- ...ils-mingw-add-LIBPL-to-library-dirs.patch} | 6 +- ...0101-Add-some-platform-related-tests.patch | 45 -- ...-the-get_platform-method-in-distutil.patch | 44 ++ ...2-build-Fix-ncursesw-include-lookup.patch} | 48 +- mingw-w64-python/0102-squash-CI-use-O2.patch | 30 - .../0103-squash-Fixup-.rc-handling.patch | 69 -- ....patch => 0103-tests-fix-test_bytes.patch} | 6 +- .../0104-squash-Set-MS_DLL_ID.patch | 25 - ...-not-raising-for-invalid-year-value.patch} | 6 +- ...rary-c-should-return-None-with-ucrt.patch} | 6 +- .../0105-squash-CI-Clean-up.patch | 115 --- ...ild-Disable-checks-for-dlopen-dlfcn.patch} | 8 +- .../0106-squash-CI-use-srcdir-builddir.patch | 69 -- ...tall-location-of-the-import-library.patch} | 8 +- .../0107-squash-fix-srcdir-builddir.patch | 41 - ...V_EXCL-for-the-shared-Python-module.patch} | 8 +- ...envlauncher-build-installation-into.patch} | 8 +- ...nfigure.ac-set-_WIN32_WINNT-version.patch} | 10 +- ...ac-don-t-check-for-clock_-functions.patch} | 8 +- ...ld-_testconsole-which-is-required-fo.patch | 30 - ...djust-Py_WINVER-for-our-Win-7-target.patch | 30 - ...normpath-paths-coming-from-env-vars.patch} | 6 +- ...dd-support-for-Windows-7-Python-3.9.patch} | 16 +- ...> 0114-Commit-regenerated-importlib.patch} | 6 +- ...ld-and-add-some-mingw-specific-tests.patch | 589 ++++++++++++++ mingw-w64-python/0118-Update-smoketests.patch | 70 -- ...lean-up-the-build-enforce-some-tests.patch | 247 ------ .../0120-1-2-AC_RUN_IFELSE-replace.patch | 33 - .../0121-Add-return-0-to-the-test-code.patch | 25 - .../0122-2-2-AC_RUN_IFELSE-replace.patch | 53 -- ...ke-sure-MACHDEP-matches-sys.platform.patch | 83 -- .../0124-CI-add-a-cross-build-job.patch | 77 -- ...djust-Py_WINVER-for-our-Win-7-target.patch | 28 - mingw-w64-python/0127-CI-cleanup.patch | 24 - mingw-w64-python/0129-CI-clean-up.patch | 26 - ...efault-to-with-nt-threads-with-mingw.patch | 56 -- mingw-w64-python/0132-CI-clean-up.patch | 40 - mingw-w64-python/0133-smoketests-update.patch | 30 - ...-sysconfig-fix-platlib-purelib-paths.patch | 29 - mingw-w64-python/0136-smoketests-update.patch | 55 -- mingw-w64-python/PKGBUILD | 727 ++++++++---------- 144 files changed, 1925 insertions(+), 3072 deletions(-) rename mingw-w64-python/{0001-make-_sysconfigdata.py-relocatable.patch => 0001-sysconfig-make-_sysconfigdata.py-relocatable.patch} (83%) rename mingw-w64-python/{0003-MINGW-BASE-use-NT-thread-model.patch => 0003-build-add-with-nt-threads-and-make-it-default-on-min.patch} (71%) rename mingw-w64-python/{0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch => 0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch} (95%) rename mingw-w64-python/{0015-MINGW-configure-for-shared-build.patch => 0013-MINGW-configure-for-shared-build.patch} (86%) rename mingw-w64-python/{0016-MINGW-dynamic-loading-support.patch => 0014-MINGW-dynamic-loading-support.patch} (86%) rename mingw-w64-python/{0017-MINGW-ignore-main-program-for-frozen-scripts.patch => 0015-MINGW-ignore-main-program-for-frozen-scripts.patch} (83%) rename mingw-w64-python/{0018-MINGW-setup-_multiprocessing-module.patch => 0016-MINGW-setup-_multiprocessing-module.patch} (81%) rename mingw-w64-python/{0019-MINGW-setup-select-module.patch => 0017-MINGW-setup-select-module.patch} (90%) rename mingw-w64-python/{0020-MINGW-setup-_ctypes-module-with-system-libffi.patch => 0018-MINGW-setup-_ctypes-module-with-system-libffi.patch} (83%) rename mingw-w64-python/{0021-MINGW-defect-winsock2-and-setup-_socket-module.patch => 0019-MINGW-defect-winsock2-and-setup-_socket-module.patch} (93%) rename mingw-w64-python/{0022-MINGW-exclude-unix-only-modules.patch => 0020-MINGW-exclude-unix-only-modules.patch} (89%) rename mingw-w64-python/{0023-MINGW-setup-msvcrt-and-_winapi-modules.patch => 0021-MINGW-setup-msvcrt-and-_winapi-modules.patch} (91%) create mode 100644 mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch rename mingw-w64-python/{0027-MINGW-setup-_ssl-module.patch => 0023-MINGW-setup-_ssl-module.patch} (79%) rename mingw-w64-python/{0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch => 0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch} (88%) rename mingw-w64-python/{0029-MINGW-support-stdcall-without-underscore.patch => 0025-MINGW-support-stdcall-without-underscore.patch} (93%) rename mingw-w64-python/{0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch => 0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch} (79%) rename mingw-w64-python/{0033-MINGW-customize-site.patch => 0027-MINGW-customize-site.patch} (94%) rename mingw-w64-python/{0034-add-python-config-sh.patch => 0028-add-python-config-sh.patch} (97%) rename mingw-w64-python/{0035-cross-darwin-feature.patch => 0029-cross-darwin-feature.patch} (89%) rename mingw-w64-python/{0037-mingw-system-libffi.patch => 0030-mingw-system-libffi.patch} (80%) rename mingw-w64-python/{0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch => 0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch} (98%) rename mingw-w64-python/{0039-mingw-use-posix-getpath.patch => 0032-mingw-use-posix-getpath.patch} (98%) rename mingw-w64-python/{0040-mingw-add-ModuleFileName-dir-to-PATH.patch => 0033-mingw-add-ModuleFileName-dir-to-PATH.patch} (93%) rename mingw-w64-python/{0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch => 0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch} (83%) rename mingw-w64-python/{0042-msys-cygwin-semi-native-build-sysconfig.patch => 0035-msys-cygwin-semi-native-build-sysconfig.patch} (93%) delete mode 100644 mingw-w64-python/0036-py3k-mingw-ntthreads-vs-pthreads.patch rename mingw-w64-python/{0043-mingw-sysconfig-like-posix.patch => 0036-sysconfig-mingw-sysconfig-like-posix.patch} (55%) create mode 100644 mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch rename mingw-w64-python/{0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch => 0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch} (80%) rename mingw-w64-python/{0046-mingw-use-backslashes-in-compileall-py.patch => 0039-mingw-use-backslashes-in-compileall-py.patch} (84%) create mode 100644 mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch rename mingw-w64-python/{0048-allow-static-tcltk.patch => 0041-allow-static-tcltk.patch} (91%) rename mingw-w64-python/{0049-mingw-pdcurses_ISPAD.patch => 0042-mingw-pdcurses_ISPAD.patch} (87%) rename mingw-w64-python/{0050-grammar-fixes.patch => 0043-grammar-fixes.patch} (91%) rename mingw-w64-python/{0051-builddir-fixes.patch => 0044-builddir-fixes.patch} (95%) rename mingw-w64-python/{0052-msys-monkeypatch-os-system-via-sh-exe.patch => 0045-msys-monkeypatch-os-system-via-sh-exe.patch} (86%) rename mingw-w64-python/{0053-msys-replace-slashes-used-in-io-redirection.patch => 0046-msys-replace-slashes-used-in-io-redirection.patch} (86%) rename mingw-w64-python/{0055-remove_path_max.default.patch => 0047-remove_path_max.default.patch} (83%) rename mingw-w64-python/{0056-dont-link-with-gettext.patch => 0048-dont-link-with-gettext.patch} (91%) rename mingw-w64-python/{0057-ctypes-python-dll.patch => 0049-ctypes-python-dll.patch} (90%) rename mingw-w64-python/{0058-gdbm-module-includes.patch => 0050-gdbm-module-includes.patch} (86%) rename mingw-w64-python/{0059-use-gnu_printf-in-format.patch => 0051-use-gnu_printf-in-format.patch} (96%) rename mingw-w64-python/{0060-mingw-fix-ssl-dont-use-enum_certificates.patch => 0052-mingw-fix-ssl-dont-use-enum_certificates.patch} (90%) rename mingw-w64-python/{0063-fix-using-dllhandle-and-winver-mingw.patch => 0053-fix-using-dllhandle-and-winver-mingw.patch} (89%) rename mingw-w64-python/{0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch => 0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch} (89%) rename mingw-w64-python/{0066-MINGW-link-with-additional-library.patch => 0055-MINGW-link-with-additional-library.patch} (72%) rename mingw-w64-python/{0067-install-msilib.patch => 0056-install-msilib.patch} (86%) rename mingw-w64-python/{0069-fix-signal-module-build.patch => 0057-fix-signal-module-build.patch} (90%) rename mingw-w64-python/{0070-build-winconsoleio.patch => 0058-build-build-winconsoleio-and-_testconsole.patch} (58%) rename mingw-w64-python/{0071-expose-sem_unlink.patch => 0059-expose-sem_unlink.patch} (89%) rename mingw-w64-python/{0072-cygpty-isatty.patch => 0060-cygpty-isatty.patch} (97%) rename mingw-w64-python/{0073-disable-broken-gdbm-module.patch => 0061-disable-broken-gdbm-module.patch} (77%) rename mingw-w64-python/{0074-link-win-resource-files-and-build-pythonw.patch => 0062-build-link-win-resource-files-and-build-pythonw.patch} (72%) rename mingw-w64-python/{0075-3.7-mpdec-mingw.patch => 0063-3.7-mpdec-mingw.patch} (76%) rename mingw-w64-python/{0076-disable-readline.patch => 0064-disable-readline.patch} (80%) rename mingw-w64-python/{0077-fix-isselectable.patch => 0065-fix-isselectable.patch} (87%) rename mingw-w64-python/{0078-use-_wcsnicmp-instead-wcsncasecmp.patch => 0066-use-_wcsnicmp-instead-wcsncasecmp.patch} (84%) rename mingw-w64-python/{0079-_xxsubinterpretersmodule.patch => 0067-_xxsubinterpretersmodule.patch} (87%) delete mode 100644 mingw-w64-python/0068-dont-include-system-ncurses-path.patch rename mingw-w64-python/{0080-sqlite3-module-defines.patch => 0068-sqlite3-module-defines.patch} (78%) rename mingw-w64-python/{0081-configure-have-inet-pton.patch => 0069-configure.ac-fix-inet_pton-check.patch} (77%) rename mingw-w64-python/{0083-set-venv-activate-path-unix.patch => 0070-set-venv-activate-path-unix.patch} (85%) rename mingw-w64-python/{0084-venv-creation-fixes.patch => 0071-venv-creation-fixes.patch} (96%) rename mingw-w64-python/{0085-pass-gen-profile-ldflags.patch => 0072-pass-gen-profile-ldflags.patch} (77%) rename mingw-w64-python/{0087-pkg-config-windows-must-link-ext-with-python-lib.patch => 0073-pkg-config-windows-must-link-ext-with-python-lib.patch} (80%) rename mingw-w64-python/{0088-importlib-bootstrap-path-sep.patch => 0074-importlib-bootstrap-path-sep.patch} (88%) rename mingw-w64-python/{0089-pathlib-path-sep.patch => 0075-pathlib-path-sep.patch} (76%) rename mingw-w64-python/{0090-warnings-fixes.patch => 0076-warnings-fixes.patch} (96%) rename mingw-w64-python/{0091-fix-build-testinternalcapi.patch => 0077-fix-build-testinternalcapi.patch} (78%) rename mingw-w64-python/{0092-extend-MS_WINDOWS-flag.patch => 0078-extend-MS_WINDOWS-flag.patch} (80%) rename mingw-w64-python/{0093-clang-arm64.patch => 0079-clang-arm64.patch} (60%) rename mingw-w64-python/{0094-MINGW-stack-reserve.patch => 0080-configure.ac-set-MINGW-stack-reserve.patch} (75%) rename mingw-w64-python/{0097-Don-t-use-os.pathsep-to-find-EOF.patch => 0081-Don-t-use-os.pathsep-to-find-EOF.patch} (82%) rename mingw-w64-python/{0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch => 0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch} (87%) rename mingw-w64-python/{0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch => 0083-Change-the-get_platform-method-in-sysconfig.patch} (53%) rename mingw-w64-python/{0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch => 0084-distutils-compiler-customize-mingw-cygwin-compilers.patch} (93%) rename mingw-w64-python/{0013-MINGW-compiler-enable-new-dtags.patch => 0085-distutils-compiler-enable-new-dtags.patch} (91%) rename mingw-w64-python/{0024-MINGW-build-extensions-with-GCC.patch => 0086-distutils-MINGW-build-extensions-with-GCC.patch} (71%) rename mingw-w64-python/{0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch => 0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch} (95%) rename mingw-w64-python/{0026-MINGW-find-import-library.patch => 0088-distutils-find-import-library.patch} (86%) rename mingw-w64-python/{0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch => 0089-distutils-avoid-circular-dependency-from-time-module.patch} (87%) rename mingw-w64-python/{0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch => 0090-distutils-generalization-of-posix-build-in-distutils.patch} (95%) create mode 100644 mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch rename mingw-w64-python/{0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch => 0092-distutils-get_versions-fixes.patch} (53%) rename mingw-w64-python/{0054-mingw-install-layout-as-posix.patch => 0093-distutils-install-layout-as-posix.patch} (90%) rename mingw-w64-python/{0047-msys-convert_path-fix-and-root-hack.patch => 0094-distutils-msys-convert_path-fix-and-root-hack.patch} (63%) rename mingw-w64-python/{0061-mingw-build-optimized-ext.patch => 0095-distutils-mingw-build-optimized-ext.patch} (88%) delete mode 100644 mingw-w64-python/0096-Add-CI-to-Build-and-Test.patch rename mingw-w64-python/{0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch => 0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch} (83%) create mode 100644 mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch rename mingw-w64-python/{0086-distutils-add-windmc-to-cygwinccompiler.patch => 0098-distutils-add-windmc-to-cygwinccompiler.patch} (90%) rename mingw-w64-python/{0082-fix-msvc9-import.patch => 0099-distutils-fix-msvc9-import.patch} (90%) delete mode 100644 mingw-w64-python/0100-Add-a-test-to-build-C-Ext.patch rename mingw-w64-python/{0064-mingw-add-LIBPL-to-library-dirs.patch => 0100-distutils-mingw-add-LIBPL-to-library-dirs.patch} (87%) delete mode 100644 mingw-w64-python/0101-Add-some-platform-related-tests.patch create mode 100644 mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch rename mingw-w64-python/{0108-build-Cleanup-ncursesw-include-lookup-code.patch => 0102-build-Fix-ncursesw-include-lookup.patch} (62%) delete mode 100644 mingw-w64-python/0102-squash-CI-use-O2.patch delete mode 100644 mingw-w64-python/0103-squash-Fixup-.rc-handling.patch rename mingw-w64-python/{0109-tests-fix-test_bytes.patch => 0103-tests-fix-test_bytes.patch} (87%) delete mode 100644 mingw-w64-python/0104-squash-Set-MS_DLL_ID.patch rename mingw-w64-python/{0110-time-fix-strftime-not-raising-for-invalid-year-value.patch => 0104-time-fix-strftime-not-raising-for-invalid-year-value.patch} (86%) rename mingw-w64-python/{0113-ctypes-find_library-c-should-return-None-with-ucrt.patch => 0105-ctypes-find_library-c-should-return-None-with-ucrt.patch} (89%) delete mode 100644 mingw-w64-python/0105-squash-CI-Clean-up.patch rename mingw-w64-python/{0114-build-Disable-checks-for-dlopen-dlfcn.patch => 0106-build-Disable-checks-for-dlopen-dlfcn.patch} (92%) delete mode 100644 mingw-w64-python/0106-squash-CI-use-srcdir-builddir.patch rename mingw-w64-python/{0115-Fix-install-location-of-the-import-library.patch => 0107-Fix-install-location-of-the-import-library.patch} (81%) delete mode 100644 mingw-w64-python/0107-squash-fix-srcdir-builddir.patch rename mingw-w64-python/{0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch => 0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch} (80%) rename mingw-w64-python/{0117-build-Integrate-venvlauncher-build-installation-into.patch => 0109-build-Integrate-venvlauncher-build-installation-into.patch} (95%) rename mingw-w64-python/{0126-Set-_WIN32_WINNT-version-in-configure.ac.patch => 0110-configure.ac-set-_WIN32_WINNT-version.patch} (71%) rename mingw-w64-python/{0131-configure.ac-don-t-check-for-clock_-functions.patch => 0111-configure.ac-don-t-check-for-clock_-functions.patch} (81%) delete mode 100644 mingw-w64-python/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch delete mode 100644 mingw-w64-python/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch rename mingw-w64-python/{0134-expanduser-normpath-paths-coming-from-env-vars.patch => 0112-expanduser-normpath-paths-coming-from-env-vars.patch} (87%) rename mingw-w64-python/{0095-Add-support-for-Windows-7-Python-3.9.patch => 0113-Add-support-for-Windows-7-Python-3.9.patch} (94%) rename mingw-w64-python/{0128-Commit-regenerated-importlib.patch => 0114-Commit-regenerated-importlib.patch} (99%) create mode 100644 mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch delete mode 100644 mingw-w64-python/0118-Update-smoketests.patch delete mode 100644 mingw-w64-python/0119-CI-clean-up-the-build-enforce-some-tests.patch delete mode 100644 mingw-w64-python/0120-1-2-AC_RUN_IFELSE-replace.patch delete mode 100644 mingw-w64-python/0121-Add-return-0-to-the-test-code.patch delete mode 100644 mingw-w64-python/0122-2-2-AC_RUN_IFELSE-replace.patch delete mode 100644 mingw-w64-python/0123-Make-sure-MACHDEP-matches-sys.platform.patch delete mode 100644 mingw-w64-python/0124-CI-add-a-cross-build-job.patch delete mode 100644 mingw-w64-python/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch delete mode 100644 mingw-w64-python/0127-CI-cleanup.patch delete mode 100644 mingw-w64-python/0129-CI-clean-up.patch delete mode 100644 mingw-w64-python/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch delete mode 100644 mingw-w64-python/0132-CI-clean-up.patch delete mode 100644 mingw-w64-python/0133-smoketests-update.patch delete mode 100644 mingw-w64-python/0135-sysconfig-fix-platlib-purelib-paths.patch delete mode 100644 mingw-w64-python/0136-smoketests-update.patch diff --git a/mingw-w64-python/0001-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch similarity index 83% rename from mingw-w64-python/0001-make-_sysconfigdata.py-relocatable.patch rename to mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index 119d5ccdd5..19ba00d56d 100644 --- a/mingw-w64-python/0001-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -1,7 +1,7 @@ -From 601fde65f126300e8fd67ec491cbbbf4ecda0571 Mon Sep 17 00:00:00 2001 +From 6ca397e7d4776d652e039ed57779ed4d0d4e7898 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 -Subject: [PATCH 001/N] make _sysconfigdata.py relocatable +Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit Co-authored-by: Алексей Co-authored-by: lovetox <8661218+lovetox@users.noreply.github.com> --- - Lib/sysconfig.py | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + Lib/sysconfig.py | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index e3f79bf..505d538 100644 +index e3f79bf..45eab2a 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -2,6 +2,7 @@ @@ -24,7 +24,7 @@ index e3f79bf..505d538 100644 from os.path import pardir, realpath __all__ = [ -@@ -413,11 +414,29 @@ def _generate_posix_vars(): +@@ -413,11 +414,30 @@ def _generate_posix_vars(): os.makedirs(pybuilddir, exist_ok=True) destfile = os.path.join(pybuilddir, name + '.py') @@ -35,6 +35,7 @@ index e3f79bf..505d538 100644 + 'INCLDIRSTOMAKE', 'INCLUDEDIR', 'INCLUDEPY', + 'LIBDEST', 'LIBDIR', 'LIBPC', 'LIBPL', 'MACHDESTLIB', + 'MANDIR', 'SCRIPTDIR', 'datarootdir', 'exec_prefix', ++ 'TZPATH', + ] + + prefix = build_time_vars['BINDIR'][:-4] @@ -55,5 +56,5 @@ index e3f79bf..505d538 100644 # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='utf8') as f: -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index c268c922cf..ad65a06daa 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From 65c19d285901d1791ae1bc3628550c9c4db948c1 Mon Sep 17 00:00:00 2001 +From 2a25da9a573828b206180522b02633a1a128a2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 @@ -12,7 +12,7 @@ Subject: [PATCH 002/N] restore setup config create mode 100644 Modules/Setup.config.in diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2b68571..f738b3b 100644 +index 6ce7a61..e8e8e71 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -714,10 +714,12 @@ oldsharedmods: $(SHAREDMODS) @@ -78,5 +78,5 @@ index 8fe5fa5..6ae56e1 100644 mv config.c Modules -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0003-MINGW-BASE-use-NT-thread-model.patch b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch similarity index 71% rename from mingw-w64-python/0003-MINGW-BASE-use-NT-thread-model.patch rename to mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch index 6f354d3538..5071799b76 100644 --- a/mingw-w64-python/0003-MINGW-BASE-use-NT-thread-model.patch +++ b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -1,8 +1,9 @@ -From 51eb50d174eed9942b5edb3f227e1866d9eee092 Mon Sep 17 00:00:00 2001 +From 80666900d875a95b06f1baf7f9c57a38e4831764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 -Subject: [PATCH 003/N] MINGW BASE use NT thread model +Subject: [PATCH 003/N] build: add --with-nt-threads and make it default on + mingw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -10,11 +11,58 @@ Content-Transfer-Encoding: 8bit Co-authored-by: Алексей Co-authored-by: Christoph Reiter --- - Modules/_multiprocessing/multiprocessing.h | 3 + - configure.ac | 94 +++++++++++++++++++++- - pyconfig.h.in | 3 + - 3 files changed, 98 insertions(+), 2 deletions(-) + Include/internal/pycore_condvar.h | 10 ++ + Include/pythread.h | 6 ++ + Modules/_multiprocessing/multiprocessing.h | 3 + + configure.ac | 101 ++++++++++++++++++++- + pyconfig.h.in | 3 + + 5 files changed, 121 insertions(+), 2 deletions(-) +diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h +index 8b89d70..dd98245 100644 +--- a/Include/internal/pycore_condvar.h ++++ b/Include/internal/pycore_condvar.h +@@ -5,6 +5,12 @@ + # error "this header requires Py_BUILD_CORE define" + #endif + ++#ifdef __MINGW32__ ++# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS) ++# undef _POSIX_THREADS ++# endif ++#endif ++ + #ifndef _POSIX_THREADS + /* This means pthreads are not implemented in libc headers, hence the macro + not present in unistd.h. But they still can be implemented as an external +@@ -37,6 +43,10 @@ + /* include windows if it hasn't been done before */ + #define WIN32_LEAN_AND_MEAN + #include ++/* winpthreads are involved via windows header, so need undef _POSIX_THREADS after header include */ ++#if defined(_POSIX_THREADS) ++#undef _POSIX_THREADS ++#endif + + /* options */ + /* non-emulated condition variables are provided for those that want +diff --git a/Include/pythread.h b/Include/pythread.h +index bb9d864..f1e52c6 100644 +--- a/Include/pythread.h ++++ b/Include/pythread.h +@@ -8,6 +8,12 @@ typedef void *PyThread_type_lock; + extern "C" { + #endif + ++#ifdef __MINGW32__ ++# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS) ++# undef _POSIX_THREADS ++# endif ++#endif ++ + /* Return status codes for Python lock acquisition. Chosen for maximum + * backwards compatibility, ie failure -> 0, success -> 1. */ + typedef enum PyLockStatus { diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h index fe78135..344b76e 100644 --- a/Modules/_multiprocessing/multiprocessing.h @@ -30,10 +78,10 @@ index fe78135..344b76e 100644 # include /* O_CREAT and O_EXCL */ # if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED) diff --git a/configure.ac b/configure.ac -index 6ae56e1..005fc8f 100644 +index 6ae56e1..d5766cf 100644 --- a/configure.ac +++ b/configure.ac -@@ -2040,6 +2040,46 @@ then +@@ -2040,6 +2040,53 @@ then BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -50,24 +98,31 @@ index 6ae56e1..005fc8f 100644 +dnl are responsible to update configure script to avoid thread models +dnl to be mixed. + -+AC_MSG_CHECKING([for NT threads]) ++AC_MSG_CHECKING([for --with-nt-threads]) +AC_ARG_WITH(nt-threads, -+ AS_HELP_STRING([--with-nt-threads], [build with windows threads]), ++ AS_HELP_STRING([--with-nt-threads], [build with windows threads (default is system-dependent)]), +[ + case $withval in + no) with_nt_threads=no;; + yes) with_nt_threads=yes;; + *) with_nt_threads=yes;; -+ esac], [ -+ with_nt_threads=no]) ++ esac ++], [ ++ case $host in ++ *-*-mingw*) with_nt_threads=yes;; ++ *) with_nt_threads=no;; ++ esac ++]) ++AC_MSG_RESULT([$with_nt_threads]) ++ +if test $with_nt_threads = yes ; then ++AC_MSG_CHECKING([whether linking with nt-threads work]) +AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[]],[[_beginthread(0, 0, 0);]]) + ], -+ [with_nt_threads=yes], -+ [with_nt_threads=no]) ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_ERROR([failed to link with nt-threads])]) +fi -+AC_MSG_RESULT([$with_nt_threads]) + +if test $with_nt_threads = yes ; then + dnl temporary default flag to avoid additional pthread checks @@ -80,7 +135,7 @@ index 6ae56e1..005fc8f 100644 # On some compilers, pthreads are available without further options # (e.g. MacOS X). On some of these systems, the compiler will not # complain if unaccepted options are passed (e.g. gcc on Mac OS X). -@@ -2158,6 +2198,8 @@ CC="$ac_save_cc"]) +@@ -2158,6 +2205,8 @@ CC="$ac_save_cc"]) AC_MSG_RESULT($ac_cv_pthread) fi @@ -89,7 +144,7 @@ index 6ae56e1..005fc8f 100644 # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. ac_cv_cxx_thread=no -@@ -2178,6 +2220,10 @@ elif test "$ac_cv_pthread" = "yes" +@@ -2178,6 +2227,10 @@ elif test "$ac_cv_pthread" = "yes" then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -100,7 +155,7 @@ index 6ae56e1..005fc8f 100644 fi if test $ac_cv_cxx_thread = yes -@@ -2210,8 +2256,8 @@ dnl AC_MSG_RESULT($cpp_type) +@@ -2210,8 +2263,8 @@ dnl AC_MSG_RESULT($cpp_type) AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ @@ -111,7 +166,7 @@ index 6ae56e1..005fc8f 100644 utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ -@@ -2225,6 +2271,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) +@@ -2225,6 +2278,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -126,7 +181,7 @@ index 6ae56e1..005fc8f 100644 # bluetooth/bluetooth.h has been known to not compile with -std=c99. # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 SAVE_CFLAGS=$CFLAGS -@@ -2422,6 +2476,10 @@ fi +@@ -2422,6 +2483,10 @@ fi AC_MSG_CHECKING(for pthread_t) have_pthread_t=no @@ -137,7 +192,7 @@ index 6ae56e1..005fc8f 100644 AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[#include ]], [[pthread_t x; x = *(pthread_t*)0;]]) ],[have_pthread_t=yes],[]) -@@ -2452,6 +2510,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then +@@ -2452,6 +2517,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then else AC_MSG_RESULT(no) fi @@ -145,7 +200,7 @@ index 6ae56e1..005fc8f 100644 CC="$ac_save_cc" AC_SUBST(OTHER_LIBTOOL_OPT) -@@ -2897,10 +2956,15 @@ void *x = uuid_enc_be +@@ -2897,10 +2963,15 @@ void *x = uuid_enc_be [AC_MSG_RESULT(no)] ) @@ -161,7 +216,7 @@ index 6ae56e1..005fc8f 100644 # check if we need libintl for locale functions AC_CHECK_LIB(intl, textdomain, -@@ -3232,6 +3296,11 @@ then +@@ -3232,6 +3303,11 @@ then CXX="$CXX -pthread" fi posix_threads=yes @@ -173,7 +228,7 @@ index 6ae56e1..005fc8f 100644 else if test ! -z "$withval" -a -d "$withval" then LDFLAGS="$LDFLAGS -L$withval" -@@ -3692,6 +3761,15 @@ else +@@ -3692,6 +3768,15 @@ else fi # checks for library functions @@ -189,7 +244,7 @@ index 6ae56e1..005fc8f 100644 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \ faccessat fchmod fchmodat fchown fchownat \ -@@ -4613,6 +4691,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) +@@ -4613,6 +4698,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) # the kernel module that provides POSIX semaphores # isn't loaded by default, so an attempt to call # sem_open results in a 'Signal 12' error. @@ -200,7 +255,7 @@ index 6ae56e1..005fc8f 100644 AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -4646,6 +4728,14 @@ fi +@@ -4646,6 +4735,14 @@ fi # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) @@ -230,5 +285,5 @@ index 6358e56..5f63cae 100644 #undef PACKAGE_BUGREPORT -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index bf0b6159c7..8ddf9cb8b8 100644 --- a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,4 +1,4 @@ -From 42ac5c820eafdec381202e36f73ce50b588ce8a7 Mon Sep 17 00:00:00 2001 +From 96c05432383cc3468538aadd7f1a440ffda4165d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:13 +0530 @@ -40,5 +40,5 @@ index 4bd4eb4..475c2a8 100644 Symbols and macros to supply platform-independent interfaces to basic C language & library operations whose spellings vary across platforms. -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index 1d90fd3be1..bfc88a4425 100644 --- a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -1,4 +1,4 @@ -From fa68425708485de2cea225d6c3ff58bff6965ab5 Mon Sep 17 00:00:00 2001 +From c2c04f16d3f6761a9ee768507c0ca8330c976ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:14 +0530 @@ -9,50 +9,32 @@ Content-Transfer-Encoding: 8bit Co-authored-by: Алексей --- - Python/getplatform.c | 6 ++++++ - configure.ac | 22 ++++++++++++++++++++++ - 2 files changed, 28 insertions(+) + configure.ac | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) -diff --git a/Python/getplatform.c b/Python/getplatform.c -index 81a0f7a..636b0a8 100644 ---- a/Python/getplatform.c -+++ b/Python/getplatform.c -@@ -1,6 +1,12 @@ - - #include "Python.h" - -+#ifdef __MINGW32__ -+# undef PLATFORM -+/* see PC/pyconfig.h */ -+# define PLATFORM "win32" -+#endif -+ - #ifndef PLATFORM - #define PLATFORM "unknown" - #endif diff --git a/configure.ac b/configure.ac -index 005fc8f..ecdf22d 100644 +index d5766cf..a9936de 100644 --- a/configure.ac +++ b/configure.ac -@@ -383,6 +383,17 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name]) - # Set name for machine-dependent library files - AC_ARG_VAR([MACHDEP], [name for machine-dependent library files]) - AC_MSG_CHECKING(MACHDEP) -+case $host in -+ *-*-mingw*) -+ # On those hosts MACHDEP is 'win', as platform specific files -+ # go in plat-$(MACHDEP), but runtime platform is 'win32' -+ test -z "$MACHDEP" && MACHDEP=win -+ -+ dnl Configuration will be based only on "host triplet" as build -+ dnl must not depend from posix compatible environement. -+ ac_sys_system=ignore -+ ;; -+esac - if test -z "$MACHDEP" - then - # avoid using uname for cross builds -@@ -452,12 +463,23 @@ if test "$cross_compiling" = yes; then +@@ -400,6 +400,9 @@ then + *-*-cygwin*) + ac_sys_system=Cygwin + ;; ++ *-*-mingw*) ++ ac_sys_system=MINGW ++ ;; + *-*-vxworks*) + ac_sys_system=VxWorks + ;; +@@ -429,6 +432,7 @@ then + linux*) MACHDEP="linux";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; ++ mingw*) MACHDEP="win32";; + '') MACHDEP="unknown";; + esac + fi +@@ -452,12 +456,23 @@ if test "$cross_compiling" = yes; then *-*-vxworks*) _host_cpu=$host_cpu ;; @@ -77,5 +59,5 @@ index 005fc8f..ecdf22d 100644 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index 144c4f1248..67990c4288 100644 --- a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch @@ -1,4 +1,4 @@ -From 7c50215fdb389f4c094e15411732fe218b4fa261 Mon Sep 17 00:00:00 2001 +From 3cdb748058d33d3538a5db1c5b07251cebbd10c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:15 +0530 @@ -53,10 +53,10 @@ index 0000000..03fde9e + +ac_cv_have_size_t_format=no diff --git a/configure.ac b/configure.ac -index ecdf22d..6058002 100644 +index a9936de..a2cec23 100644 --- a/configure.ac +++ b/configure.ac -@@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then +@@ -913,6 +913,28 @@ if test x$MULTIARCH != x; then fi AC_SUBST(MULTIARCH_CPPFLAGS) @@ -86,5 +86,5 @@ index ecdf22d..6058002 100644 save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch index c743829006..23c2d9dba5 100644 --- a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,4 +1,4 @@ -From c4ec9b26b76ebaa442ed3ae3fa10442869e66038 Mon Sep 17 00:00:00 2001 +From 0d783f83aadf8f7dd64bf81684942be2cde01df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:16 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index 6058002..4c964ae 100644 +index a2cec23..61a7608 100644 --- a/configure.ac +++ b/configure.ac @@ -2487,8 +2487,20 @@ AC_CHECK_SIZEOF(off_t, [], [ @@ -39,5 +39,5 @@ index 6058002..4c964ae 100644 [Defined to enable large file support when an off_t is bigger than a long and long long is at least as big as an off_t. You may need -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 8a3d7b5e5c..357dd5f653 100644 --- a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From 8dbbd779f9d2b7d01bc143deb70f3e522978f0b8 Mon Sep 17 00:00:00 2001 +From af4cca07445296c92dedffde8191e96e3c468adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:18 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac -index 4c964ae..f335c48 100644 +index 61a7608..1f3c8af 100644 --- a/configure.ac +++ b/configure.ac @@ -5642,8 +5642,21 @@ do @@ -39,5 +39,5 @@ index 4c964ae..f335c48 100644 for dir in $SRCDIRS; do if test ! -d $dir; then -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index c7a18c9280..2d10c54bde 100644 --- a/mingw-w64-python/0009-MINGW-init-system-calls.patch +++ b/mingw-w64-python/0009-MINGW-init-system-calls.patch @@ -1,4 +1,4 @@ -From c6e239410fcc24e73eb239b391b5670f7ec41c2f Mon Sep 17 00:00:00 2001 +From a2e178675d5376e8985c489a6cb3bb463909fb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:19 +0530 @@ -101,10 +101,10 @@ index c984e2e..3f3e1f3 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index f335c48..19c3ec2 100644 +index 1f3c8af..ba8736b 100644 --- a/configure.ac +++ b/configure.ac -@@ -601,6 +601,14 @@ then +@@ -594,6 +594,14 @@ then AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc) fi @@ -120,5 +120,5 @@ index f335c48..19c3ec2 100644 # it may influence the way we can build extensions, so distutils # needs to check it -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch index 63e63c3c0a..c91d837697 100644 --- a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch @@ -1,4 +1,4 @@ -From d00c155c97977adb8109f0764efb1100d6079800 Mon Sep 17 00:00:00 2001 +From 08880ce168fbb08e6476a246fd80e141ebf2eed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:20 +0530 @@ -57,7 +57,7 @@ index fd1ccb7..b6f1a8f 100644 static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static PyObject *PyHKEY_FromHKEY(HKEY h); diff --git a/configure.ac b/configure.ac -index 19c3ec2..e307fe3 100644 +index ba8736b..59f3edc 100644 --- a/configure.ac +++ b/configure.ac @@ -3326,6 +3326,13 @@ else @@ -75,5 +75,5 @@ index 19c3ec2..e307fe3 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index 58ff71c09b..06e38e5c3f 100644 --- a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,4 +1,4 @@ -From 40d6aaa0260b733a5bb004fd90287148e09a249c Mon Sep 17 00:00:00 2001 +From 892c8b91944241a71222a04d9276fdd409479408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 @@ -43,7 +43,7 @@ index 612cabd..d071a74 100644 @USE_WIN32_MODULE@winreg ../PC/winreg.c diff --git a/configure.ac b/configure.ac -index e307fe3..52b3120 100644 +index 59f3edc..806ebe0 100644 --- a/configure.ac +++ b/configure.ac @@ -3333,6 +3333,13 @@ case $host in @@ -61,5 +61,5 @@ index e307fe3..52b3120 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch similarity index 95% rename from mingw-w64-python/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch rename to mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index b5e8cb1bca..dcbaa45b02 100644 --- a/mingw-w64-python/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -1,8 +1,8 @@ -From 5cf0ca1ebaec17df425a2b2829f6520e355f81cc Mon Sep 17 00:00:00 2001 +From b04a5d9e049ad86d70f3977cb2604b2e6b7e0bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:23 +0530 -Subject: [PATCH 014/N] issue6672 v2 Add Mingw recognition to pyport.h to al +Subject: [PATCH 012/N] issue6672 v2 Add Mingw recognition to pyport.h to al MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -64,7 +64,7 @@ index 475c2a8..a05fa3a 100644 /* module init functions outside the core must be exported */ # if defined(__cplusplus) diff --git a/setup.py b/setup.py -index 04eb6b2..b483dd3 100644 +index 54d4b94..d7a4e3f 100644 --- a/setup.py +++ b/setup.py @@ -444,6 +444,9 @@ class PyBuildExt(build_ext): @@ -78,5 +78,5 @@ index 04eb6b2..b483dd3 100644 self.detect_modules() -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0015-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch similarity index 86% rename from mingw-w64-python/0015-MINGW-configure-for-shared-build.patch rename to mingw-w64-python/0013-MINGW-configure-for-shared-build.patch index de3942af82..43a074da2c 100644 --- a/mingw-w64-python/0015-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch @@ -1,8 +1,8 @@ -From 914f08e27ac82a95ce0ddedfbb15d53415406050 Mon Sep 17 00:00:00 2001 +From ed8995bda0e5acd112b43ee5662df3640f6154f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:24 +0530 -Subject: [PATCH 015/N] MINGW configure for shared build +Subject: [PATCH 013/N] MINGW configure for shared build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 52b3120..592b61a 100644 +index 806ebe0..6ebf250 100644 --- a/configure.ac +++ b/configure.ac -@@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then +@@ -1233,6 +1233,13 @@ if test $enable_shared = "yes"; then ;; esac @@ -30,7 +30,7 @@ index 52b3120..592b61a 100644 else # shared is disabled PY_ENABLE_SHARED=0 case $ac_sys_system in -@@ -1248,6 +1255,10 @@ else # shared is disabled +@@ -1241,6 +1248,10 @@ else # shared is disabled LDLIBRARY='libpython$(LDVERSION).dll.a' ;; esac @@ -65,5 +65,5 @@ index 52b3120..592b61a 100644 esac -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0016-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch similarity index 86% rename from mingw-w64-python/0016-MINGW-dynamic-loading-support.patch rename to mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index c87ab362f0..3c02197510 100644 --- a/mingw-w64-python/0016-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch @@ -1,8 +1,8 @@ -From ae8ad2a897af02bb36b723276f7382c5dd240447 Mon Sep 17 00:00:00 2001 +From 4eb264922b5a1abfa9400662d88c10a3b5f447bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:25 +0530 -Subject: [PATCH 016/N] MINGW dynamic loading support +Subject: [PATCH 014/N] MINGW dynamic loading support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -11,11 +11,11 @@ Co-authored-by: Алексей --- Makefile.pre.in | 6 ++++++ Python/dynload_win.c | 9 +++++++-- - configure.ac | 15 +++++++++++++++ - 3 files changed, 28 insertions(+), 2 deletions(-) + configure.ac | 16 ++++++++++++++++ + 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f738b3b..9f2475d 100644 +index e8e8e71..332f9a5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -823,6 +823,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile @@ -59,7 +59,7 @@ index 81787e5..9d7690e 100644 /* restore old error mode settings */ diff --git a/configure.ac b/configure.ac -index 592b61a..dfe55ad 100644 +index 6ebf250..a8c64a7 100644 --- a/configure.ac +++ b/configure.ac @@ -2718,6 +2718,9 @@ if test -z "$SHLIB_SUFFIX"; then @@ -72,7 +72,7 @@ index 592b61a..dfe55ad 100644 fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -3831,6 +3834,12 @@ then +@@ -3831,6 +3834,13 @@ then fi ;; esac @@ -80,12 +80,13 @@ index 592b61a..dfe55ad 100644 + *-*-mingw*) + DYNLOADFILE="dynload_win.o" + extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o" ++ CFLAGS_NODIST="$CFLAGS_NODIST -DMS_DLL_ID='\"$VERSION\"'" + ;; + esac fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -5667,6 +5676,12 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5667,6 +5677,12 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac @@ -99,5 +100,5 @@ index 592b61a..dfe55ad 100644 case $ac_sys_system in AIX*) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0017-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch similarity index 83% rename from mingw-w64-python/0017-MINGW-ignore-main-program-for-frozen-scripts.patch rename to mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch index cc205a5a78..4477d6a9ed 100644 --- a/mingw-w64-python/0017-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -1,8 +1,8 @@ -From 5230e91dc7c783925a609e8fec18955546a0cbe7 Mon Sep 17 00:00:00 2001 +From bd06581551552ea5206d6af8c757181864b11066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 -Subject: [PATCH 017/N] MINGW ignore main program for frozen scripts +Subject: [PATCH 015/N] MINGW ignore main program for frozen scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,7 +14,7 @@ Co-authored-by: Алексей 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9f2475d..223a266 100644 +index 332f9a5..8c8363a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -352,7 +352,7 @@ PYTHON_OBJS= \ @@ -27,10 +27,10 @@ index 9f2475d..223a266 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index dfe55ad..ccc558e 100644 +index a8c64a7..7fcdd47 100644 --- a/configure.ac +++ b/configure.ac -@@ -5707,6 +5707,16 @@ case $host in +@@ -5708,6 +5708,16 @@ case $host in ;; esac @@ -48,5 +48,5 @@ index dfe55ad..ccc558e 100644 SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs" case $host in -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0018-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch similarity index 81% rename from mingw-w64-python/0018-MINGW-setup-_multiprocessing-module.patch rename to mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 6020e8f266..642c9336fb 100644 --- a/mingw-w64-python/0018-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch @@ -1,8 +1,8 @@ -From ad9ea63b35c8eb32a43f69530ebc798b5ac12553 Mon Sep 17 00:00:00 2001 +From 0dca777395cc304349d9d90e631407374e2c6de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 -Subject: [PATCH 018/N] MINGW setup _multiprocessing module +Subject: [PATCH 016/N] MINGW setup _multiprocessing module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py -index b483dd3..1f96ad4 100644 +index d7a4e3f..a15718e 100644 --- a/setup.py +++ b/setup.py -@@ -1761,7 +1761,12 @@ class PyBuildExt(build_ext): +@@ -1766,7 +1766,12 @@ class PyBuildExt(build_ext): libraries=libs, include_dirs=["Modules/_multiprocessing"])) @@ -30,5 +30,5 @@ index b483dd3..1f96ad4 100644 def detect_uuid(self): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0019-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch similarity index 90% rename from mingw-w64-python/0019-MINGW-setup-select-module.patch rename to mingw-w64-python/0017-MINGW-setup-select-module.patch index 1883143880..9e4b3792b4 100644 --- a/mingw-w64-python/0019-MINGW-setup-select-module.patch +++ b/mingw-w64-python/0017-MINGW-setup-select-module.patch @@ -1,8 +1,8 @@ -From d8df9cbea83b1d7c1cd27cd1ab52feb6b6a882f7 Mon Sep 17 00:00:00 2001 +From 1dcb2cc12d447b3be226f61699d2570c921b67bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:29 +0530 -Subject: [PATCH 019/N] MINGW setup select module +Subject: [PATCH 017/N] MINGW setup select module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -39,10 +39,10 @@ index fb71e91..ad3990c 100644 /* add object and its file descriptor to the list */ diff --git a/setup.py b/setup.py -index 1f96ad4..a6145c4 100644 +index a15718e..7914821 100644 --- a/setup.py +++ b/setup.py -@@ -903,7 +903,11 @@ class PyBuildExt(build_ext): +@@ -906,7 +906,11 @@ class PyBuildExt(build_ext): self.missing.append('spwd') # select(2); not on ancient System V @@ -56,5 +56,5 @@ index 1f96ad4..a6145c4 100644 # Fred Drake's interface to the Python parser self.add(Extension('parser', ['parsermodule.c'])) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch similarity index 83% rename from mingw-w64-python/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch rename to mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch index 3006e0ebd8..61bf9d079f 100644 --- a/mingw-w64-python/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -1,8 +1,8 @@ -From 63b12b21aae2268da35cd557e526b241a65198c2 Mon Sep 17 00:00:00 2001 +From f863b526f355dbc2dd1539be76a0f95f7abec559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 -Subject: [PATCH 020/N] MINGW setup _ctypes module with system libffi +Subject: [PATCH 018/N] MINGW setup _ctypes module with system libffi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a6145c4..e36ef5d 100644 +index 7914821..60f6243 100644 --- a/setup.py +++ b/setup.py -@@ -2149,9 +2149,12 @@ class PyBuildExt(build_ext): +@@ -2154,9 +2154,12 @@ class PyBuildExt(build_ext): self.add(ext) if TEST_EXTENSIONS: # function my_sqrt() needs libm for sqrt() @@ -31,7 +31,7 @@ index a6145c4..e36ef5d 100644 ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR") ffi_lib = None -@@ -2196,6 +2199,8 @@ class PyBuildExt(build_ext): +@@ -2201,6 +2204,8 @@ class PyBuildExt(build_ext): ext.include_dirs.append(ffi_inc) ext.libraries.append(ffi_lib) @@ -41,5 +41,5 @@ index a6145c4..e36ef5d 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch similarity index 93% rename from mingw-w64-python/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch rename to mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch index f7240eeba2..ee2addd574 100644 --- a/mingw-w64-python/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -1,8 +1,8 @@ -From 9b48dc123e5baf45c7e2180d46b13ae3aaeead8b Mon Sep 17 00:00:00 2001 +From 0a6c242ff914437f5feb80ee638b592667a519b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 -Subject: [PATCH 021/N] MINGW defect winsock2 and setup _socket module +Subject: [PATCH 019/N] MINGW defect winsock2 and setup _socket module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -61,10 +61,10 @@ index 8953185..d15bb4f 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index ccc558e..fc287de 100644 +index 7fcdd47..5459145 100644 --- a/configure.ac +++ b/configure.ac -@@ -4442,21 +4442,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +@@ -4443,21 +4443,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ],[]) AC_MSG_RESULT($was_it_defined) @@ -105,7 +105,7 @@ index ccc558e..fc287de 100644 [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) -@@ -5597,7 +5612,10 @@ fi +@@ -5598,7 +5613,10 @@ fi AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, @@ -150,10 +150,10 @@ index 5f63cae..b69a7c7 100644 /* Define to `int' if doesn't define. */ diff --git a/setup.py b/setup.py -index e36ef5d..b29d23b 100644 +index 60f6243..c8242ac 100644 --- a/setup.py +++ b/setup.py -@@ -1140,6 +1140,8 @@ class PyBuildExt(build_ext): +@@ -1143,6 +1143,8 @@ class PyBuildExt(build_ext): if MACOS: # Issue #35569: Expose RFC 3542 socket options. kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542'] @@ -163,5 +163,5 @@ index e36ef5d..b29d23b 100644 self.add(Extension('_socket', ['socketmodule.c'], **kwargs)) elif self.compiler.find_library_file(self.lib_dirs, 'net'): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0022-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch similarity index 89% rename from mingw-w64-python/0022-MINGW-exclude-unix-only-modules.patch rename to mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch index f69bb3c4b8..233bfbf862 100644 --- a/mingw-w64-python/0022-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch @@ -1,8 +1,8 @@ -From 44e8fbcb587f72cbfb477128f50524cb3c1ad021 Mon Sep 17 00:00:00 2001 +From 43127485a0b9ef0e6eb88436cbd3691114203324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:31 +0530 -Subject: [PATCH 022/N] MINGW exclude unix only modules +Subject: [PATCH 020/N] MINGW exclude unix only modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py -index b29d23b..5280ea0 100644 +index c8242ac..f317bf3 100644 --- a/setup.py +++ b/setup.py -@@ -886,13 +886,21 @@ class PyBuildExt(build_ext): +@@ -889,13 +889,21 @@ class PyBuildExt(build_ext): if (self.config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)): # May be necessary on AIX for flock function libs = ['bsd'] @@ -42,7 +42,7 @@ index b29d23b..5280ea0 100644 # spwd, shadow passwords if (self.config_h_vars.get('HAVE_GETSPNAM', False) or self.config_h_vars.get('HAVE_GETSPENT', False)): -@@ -917,7 +925,10 @@ class PyBuildExt(build_ext): +@@ -920,7 +928,10 @@ class PyBuildExt(build_ext): # Lance Ellinghaus's syslog module # syslog daemon interface @@ -54,7 +54,7 @@ index b29d23b..5280ea0 100644 # Python interface to subinterpreter C-API. self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c'])) -@@ -943,7 +954,10 @@ class PyBuildExt(build_ext): +@@ -946,7 +957,10 @@ class PyBuildExt(build_ext): self.add(Extension('_csv', ['_csv.c'])) # POSIX subprocess module helper. @@ -66,7 +66,7 @@ index b29d23b..5280ea0 100644 def detect_test_extensions(self): # Python C API test module -@@ -1125,13 +1139,16 @@ class PyBuildExt(build_ext): +@@ -1128,13 +1142,16 @@ class PyBuildExt(build_ext): # the encryption. return @@ -90,5 +90,5 @@ index b29d23b..5280ea0 100644 def detect_socket(self): # socket(2) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch similarity index 91% rename from mingw-w64-python/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch rename to mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch index 01567a20ea..edb701458a 100644 --- a/mingw-w64-python/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -1,8 +1,8 @@ -From 78ba60f537dc443ef5bc912e650e688619b9e798 Mon Sep 17 00:00:00 2001 +From 71342683a28f2826c9738951706c167226c2f093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:33 +0530 -Subject: [PATCH 023/N] MINGW setup msvcrt and _winapi modules +Subject: [PATCH 021/N] MINGW setup msvcrt and _winapi modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -16,7 +16,7 @@ Co-authored-by: Алексей 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index e1672c4..ba318a1 100644 +index 1e0e4ec..1058184 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -39,7 +39,9 @@ @@ -57,10 +57,10 @@ index 7febaa0..70d5b3d 100644 #endif diff --git a/setup.py b/setup.py -index 5280ea0..736b0f0 100644 +index f317bf3..5466e9b 100644 --- a/setup.py +++ b/setup.py -@@ -1599,6 +1599,27 @@ class PyBuildExt(build_ext): +@@ -1604,6 +1604,27 @@ class PyBuildExt(build_ext): '-framework', 'SystemConfiguration', '-framework', 'CoreFoundation'])) @@ -89,5 +89,5 @@ index 5280ea0..736b0f0 100644 # Andrew Kuchling's zlib module. Note that some versions of zlib # 1.1.3 have security problems. See CERT Advisory CA-2002-07: -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch new file mode 100644 index 0000000000..a7e38fd448 --- /dev/null +++ b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -0,0 +1,25 @@ +From 81df7b055662ed80b952de911ec0c25df3e40e1f Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 20:52:42 +0200 +Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC + +--- + Lib/sysconfig.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 45eab2a..42de9b3 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -657,6 +657,8 @@ def get_platform(): + + """ + if os.name == 'nt': ++ if 'GCC' in sys.version: ++ return 'mingw' + if 'amd64' in sys.version.lower(): + return 'win-amd64' + if '(arm)' in sys.version.lower(): +-- +2.33.0 + diff --git a/mingw-w64-python/0027-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch similarity index 79% rename from mingw-w64-python/0027-MINGW-setup-_ssl-module.patch rename to mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index b2a0402511..99a426b7b0 100644 --- a/mingw-w64-python/0027-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch @@ -1,8 +1,8 @@ -From be2b7c5a9e045188cece8694358871525686d77c Mon Sep 17 00:00:00 2001 +From 3d38194a6e0ff4c07988064d51fa10ecbf7b450d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:37 +0530 -Subject: [PATCH 027/N] MINGW setup _ssl module +Subject: [PATCH 023/N] MINGW setup _ssl module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index 736b0f0..143a1c9 100644 +index 5466e9b..51d3f59 100644 --- a/setup.py +++ b/setup.py -@@ -2381,6 +2381,8 @@ class PyBuildExt(build_ext): +@@ -2386,6 +2386,8 @@ class PyBuildExt(build_ext): openssl_includes = split_var('OPENSSL_INCLUDES', '-I') openssl_libdirs = split_var('OPENSSL_LDFLAGS', '-L') openssl_libs = split_var('OPENSSL_LIBS', '-l') @@ -26,5 +26,5 @@ index 736b0f0..143a1c9 100644 # libssl and libcrypto not found self.missing.extend(['_ssl', '_hashlib']) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch similarity index 88% rename from mingw-w64-python/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch rename to mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 95509fdd38..f3e36a97e5 100644 --- a/mingw-w64-python/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -1,8 +1,8 @@ -From b29739b0545771c80eadc505b6f661b0678ed0cf Mon Sep 17 00:00:00 2001 +From 9cd7f11ee87717152eb4deebdf74217495440b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:38 +0530 -Subject: [PATCH 028/N] MINGW generalization of posix build in sysconfig.py +Subject: [PATCH 024/N] MINGW generalization of posix build in sysconfig.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index aa49d80..d4298f7 100644 +index 42de9b3..65cb345 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -100,6 +100,9 @@ _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) @@ -44,7 +44,7 @@ index aa49d80..d4298f7 100644 base = os.environ.get("APPDATA") or "~" return joinuser(base, "Python") -@@ -504,7 +507,7 @@ def parse_config_h(fp, vars=None): +@@ -505,7 +508,7 @@ def parse_config_h(fp, vars=None): def get_config_h_filename(): """Return the path of pyconfig.h.""" if _PYTHON_BUILD: @@ -53,7 +53,7 @@ index aa49d80..d4298f7 100644 inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC") else: inc_dir = _sys_home or _PROJECT_BASE -@@ -576,10 +579,10 @@ def get_config_vars(*args): +@@ -577,10 +580,10 @@ def get_config_vars(*args): # sys.abiflags may not be defined on all platforms. _CONFIG_VARS['abiflags'] = '' @@ -66,7 +66,7 @@ index aa49d80..d4298f7 100644 _init_posix(_CONFIG_VARS) # For backward compatibility, see issue19555 SO = _CONFIG_VARS.get('EXT_SUFFIX') -@@ -592,7 +595,7 @@ def get_config_vars(*args): +@@ -593,7 +596,7 @@ def get_config_vars(*args): # Always convert srcdir to an absolute path srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) @@ -76,5 +76,5 @@ index aa49d80..d4298f7 100644 # If srcdir is a relative path (typically '.' or '..') # then it should be interpreted relative to the directory -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0029-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch similarity index 93% rename from mingw-w64-python/0029-MINGW-support-stdcall-without-underscore.patch rename to mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch index 8275227ab4..25bb46c8b1 100644 --- a/mingw-w64-python/0029-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch @@ -1,8 +1,8 @@ -From 8353a7f30f7dc0a33111f43ad2ce7acfa6de0a32 Mon Sep 17 00:00:00 2001 +From 15b977a7de9a992afdb0af75ae3c3d84a524d7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:39 +0530 -Subject: [PATCH 029/N] MINGW support stdcall without underscore +Subject: [PATCH 025/N] MINGW support stdcall without underscore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -50,5 +50,5 @@ index ceae67e..b9cf96b 100644 return NULL; #endif -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch similarity index 79% rename from mingw-w64-python/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch rename to mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch index c8af1f19f2..197d71277c 100644 --- a/mingw-w64-python/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,8 +1,8 @@ -From 8ce7dcc50395d138e1ec6b303c46a89ae7b98c24 Mon Sep 17 00:00:00 2001 +From b14a7592f54a2230d5b087e15a4547d23eeed6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:40 +0530 -Subject: [PATCH 030/N] use replace instead rename to avoid failure on windo +Subject: [PATCH 026/N] use replace instead rename to avoid failure on windo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 143a1c9..23e7689 100644 +index 51d3f59..ea08edf 100644 --- a/setup.py +++ b/setup.py -@@ -2602,7 +2602,7 @@ class PyBuildScripts(build_scripts): +@@ -2607,7 +2607,7 @@ class PyBuildScripts(build_scripts): else: newfilename = filename + minoronly log.info('renaming %s to %s', filename, newfilename) @@ -27,5 +27,5 @@ index 143a1c9..23e7689 100644 if filename in updated_files: newupdated_files.append(newfilename) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0033-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch similarity index 94% rename from mingw-w64-python/0033-MINGW-customize-site.patch rename to mingw-w64-python/0027-MINGW-customize-site.patch index bf0282aaab..215c3947da 100644 --- a/mingw-w64-python/0033-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,8 +1,8 @@ -From 8baa74769c98ae5a10f2766806f282d8a5980cf3 Mon Sep 17 00:00:00 2001 +From 7edbdbe649d050d6753289b61ad5d2883b5338cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:42 +0530 -Subject: [PATCH 033/N] MINGW customize site +Subject: [PATCH 027/N] MINGW customize site MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -55,5 +55,5 @@ index 9e617af..b344f03 100644 path = os.path.join(prefix, libdir, "python%d.%d" % sys.version_info[:2], -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0034-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch similarity index 97% rename from mingw-w64-python/0034-add-python-config-sh.patch rename to mingw-w64-python/0028-add-python-config-sh.patch index 3f8d14a3ed..ddea647c42 100644 --- a/mingw-w64-python/0034-add-python-config-sh.patch +++ b/mingw-w64-python/0028-add-python-config-sh.patch @@ -1,8 +1,8 @@ -From b650a9cb9202cbb9acedc6cc043c622bf815ab1d Mon Sep 17 00:00:00 2001 +From 6c65a9a8245268b2260c99db33e27205d9a67837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:43 +0530 -Subject: [PATCH 034/N] add python config sh +Subject: [PATCH 028/N] add python config sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -158,5 +158,5 @@ index 2602fe2..e0e048a 100644 esac done -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0035-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch similarity index 89% rename from mingw-w64-python/0035-cross-darwin-feature.patch rename to mingw-w64-python/0029-cross-darwin-feature.patch index b3efb781a1..39fa9c9e11 100644 --- a/mingw-w64-python/0035-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,8 +1,8 @@ -From a75a88113ad8b46cb82be6a75de750d2407bf2fa Mon Sep 17 00:00:00 2001 +From 28b76e2a3d4a629a2e5280c760fce8d661909ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:44 +0530 -Subject: [PATCH 035/N] cross darwin feature +Subject: [PATCH 029/N] cross darwin feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index fc287de..453b80f 100644 +index 5459145..bd4ff50 100644 --- a/configure.ac +++ b/configure.ac -@@ -398,6 +398,7 @@ if test -z "$MACHDEP" +@@ -387,6 +387,7 @@ if test -z "$MACHDEP" then # avoid using uname for cross builds if test "$cross_compiling" = yes; then @@ -24,9 +24,9 @@ index fc287de..453b80f 100644 # ac_sys_system and ac_sys_release are used for setting # a lot of different things including 'define_xopen_source' # in the case statement below. -@@ -411,6 +412,27 @@ then - *-*-cygwin*) - ac_sys_system=Cygwin +@@ -403,6 +404,27 @@ then + *-*-mingw*) + ac_sys_system=MINGW ;; + *-*-darwin*) + ac_sys_system=Darwin @@ -52,7 +52,7 @@ index fc287de..453b80f 100644 *-*-vxworks*) ac_sys_system=VxWorks ;; -@@ -419,7 +441,6 @@ then +@@ -411,7 +433,6 @@ then MACHDEP="unknown" AC_MSG_ERROR([cross build not supported for $host]) esac @@ -60,7 +60,7 @@ index fc287de..453b80f 100644 else ac_sys_system=`uname -s` if test "$ac_sys_system" = "AIX" \ -@@ -466,6 +487,9 @@ if test "$cross_compiling" = yes; then +@@ -459,6 +480,9 @@ if test "$cross_compiling" = yes; then *-*-mingw*) _host_cpu= ;; @@ -70,7 +70,7 @@ index fc287de..453b80f 100644 *) # for now, limit cross builds to known configurations MACHDEP="unknown" -@@ -1662,6 +1686,26 @@ AC_SUBST(BASECFLAGS) +@@ -1655,6 +1679,26 @@ AC_SUBST(BASECFLAGS) AC_SUBST(CFLAGS_NODIST) AC_SUBST(LDFLAGS_NODIST) @@ -97,7 +97,7 @@ index fc287de..453b80f 100644 # The -arch flags for universal builds on macOS UNIVERSAL_ARCH_FLAGS= AC_SUBST(UNIVERSAL_ARCH_FLAGS) -@@ -2040,7 +2084,7 @@ yes) +@@ -2033,7 +2077,7 @@ yes) ;; esac else @@ -134,5 +134,5 @@ index fc287de..453b80f 100644 MACOSX_DEFAULT_ARCH="x86_64" ;; -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0037-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch similarity index 80% rename from mingw-w64-python/0037-mingw-system-libffi.patch rename to mingw-w64-python/0030-mingw-system-libffi.patch index 2a2c2330f6..cc6e975d94 100644 --- a/mingw-w64-python/0037-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,8 +1,8 @@ -From db3e4998d4ab6a11e3e263a848ebd332f25d77c6 Mon Sep 17 00:00:00 2001 +From 97a76defea005fff27a7f019c7ecde3f43a8ee64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:45 +0530 -Subject: [PATCH 037/N] mingw system libffi +Subject: [PATCH 030/N] mingw system libffi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index 23e7689..72f1281 100644 +index ea08edf..c52fd3b 100644 --- a/setup.py +++ b/setup.py -@@ -2241,6 +2241,8 @@ class PyBuildExt(build_ext): +@@ -2246,6 +2246,8 @@ class PyBuildExt(build_ext): ext.libraries.append(ffi_lib) if MS_WINDOWS: ext.libraries.extend(['ole32', 'oleaut32', 'uuid']) @@ -26,5 +26,5 @@ index 23e7689..72f1281 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch similarity index 98% rename from mingw-w64-python/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch rename to mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index cfe1e8cc17..3c42615740 100644 --- a/mingw-w64-python/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,7 +1,7 @@ -From 8264c28205f988c0e7147f4f82c68511bb5ec611 Mon Sep 17 00:00:00 2001 +From eef4cbef8040e29440e645138de2184bcc82c3d0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 -Subject: [PATCH 038/N] msys mingw prefer unix sep if MSYSTEM +Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -380,7 +380,7 @@ index 9a30221..267ee4d 100644 diff --git a/Python/traceback.c b/Python/traceback.c -index a9a9dd9..e8d2786 100644 +index 83f3074..c0e463a 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -314,7 +314,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * @@ -393,5 +393,5 @@ index a9a9dd9..e8d2786 100644 tail = filepath; else -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0039-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch similarity index 98% rename from mingw-w64-python/0039-mingw-use-posix-getpath.patch rename to mingw-w64-python/0032-mingw-use-posix-getpath.patch index 608e6aa648..ad1f652c1b 100644 --- a/mingw-w64-python/0039-mingw-use-posix-getpath.patch +++ b/mingw-w64-python/0032-mingw-use-posix-getpath.patch @@ -1,8 +1,8 @@ -From afe9fc7a1ffad8f5054050ecdc79203359c55d60 Mon Sep 17 00:00:00 2001 +From 81023c047fed86a16c63b8a185abbb34c54b023b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:47 +0530 -Subject: [PATCH 039/N] mingw use posix getpath +Subject: [PATCH 032/N] mingw use posix getpath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -463,10 +463,10 @@ index 9d7690e..bd34310 100644 _Py_COMP_DIAG_PUSH _Py_COMP_DIAG_IGNORE_DEPR_DECLS diff --git a/Python/fileutils.c b/Python/fileutils.c -index 45ea204..d5f8b79 100644 +index 11c659d..4b299b2 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c -@@ -1924,13 +1924,31 @@ _Py_wrealpath(const wchar_t *path, +@@ -1925,13 +1925,31 @@ _Py_wrealpath(const wchar_t *path, #endif @@ -501,5 +501,5 @@ index 45ea204..d5f8b79 100644 /* Get an absolute path. -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0040-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch similarity index 93% rename from mingw-w64-python/0040-mingw-add-ModuleFileName-dir-to-PATH.patch rename to mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch index c04ca93b16..11f9d2210b 100644 --- a/mingw-w64-python/0040-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -1,7 +1,7 @@ -From a8c10ce1867cef6470abf110d26cfc47ed4c5e5a Mon Sep 17 00:00:00 2001 +From 1a866712f70f3f146587b0d25ad7f66b185a0afc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:48 +0530 -Subject: [PATCH 040/N] mingw add ModuleFileName dir to PATH +Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -54,5 +54,5 @@ index 3010182..c52e0df 100644 && calculate->warnings) { -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch similarity index 83% rename from mingw-w64-python/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch rename to mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index a16cf46bfc..dc2cb6c5c9 100644 --- a/mingw-w64-python/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -1,8 +1,8 @@ -From 6bd3b909a390939df82bdecf650f75509b752bd2 Mon Sep 17 00:00:00 2001 +From e9e44cbc990a6d1be36bc7739de1b365bd5f3deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:49 +0530 -Subject: [PATCH 041/N] mingw add BUILDIN_WIN32_MODULEs time msvcrt +Subject: [PATCH 034/N] mingw add BUILDIN_WIN32_MODULEs time msvcrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -23,5 +23,5 @@ index d071a74..825ce5d 100644 +@USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0042-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch similarity index 93% rename from mingw-w64-python/0042-msys-cygwin-semi-native-build-sysconfig.patch rename to mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch index 010c212942..77e4352d87 100644 --- a/mingw-w64-python/0042-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,8 +1,8 @@ -From ae4be49d5a7fbdcbc2c82aa1359e7ead2c393854 Mon Sep 17 00:00:00 2001 +From 87605ef6c8e472a8b1e38d0fbeaf4f75b87a9964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:50 +0530 -Subject: [PATCH 042/N] msys cygwin semi native build sysconfig +Subject: [PATCH 035/N] msys cygwin semi native build sysconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,7 +15,7 @@ Co-authored-by: Алексей 3 files changed, 74 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index d4298f7..5d336d8 100644 +index 65cb345..f69d0db 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -337,6 +337,14 @@ def _parse_makefile(filename, vars=None): @@ -34,7 +34,7 @@ index d4298f7..5d336d8 100644 vars.update(done) return vars diff --git a/Makefile.pre.in b/Makefile.pre.in -index 223a266..5271dd8 100644 +index 8c8363a..e0b8155 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -137,6 +137,13 @@ exec_prefix= @exec_prefix@ @@ -52,10 +52,10 @@ index 223a266..5271dd8 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index 453b80f..4586602 100644 +index bd4ff50..a9640e9 100644 --- a/configure.ac +++ b/configure.ac -@@ -625,6 +625,65 @@ then +@@ -618,6 +618,65 @@ then AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc) fi @@ -122,5 +122,5 @@ index 453b80f..4586602 100644 AC_SUBST(INITSYS) case $host in -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0036-py3k-mingw-ntthreads-vs-pthreads.patch b/mingw-w64-python/0036-py3k-mingw-ntthreads-vs-pthreads.patch deleted file mode 100644 index ec8870b6b8..0000000000 --- a/mingw-w64-python/0036-py3k-mingw-ntthreads-vs-pthreads.patch +++ /dev/null @@ -1,64 +0,0 @@ -From cef46d4d01202b0297badf3d715928e3b7406357 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= - -Date: Thu, 17 Jun 2021 18:51:45 +0530 -Subject: [PATCH 036/N] py3k mingw ntthreads vs pthreads -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-authored-by: Алексей -Co-authored-by: Christoph Reiter ---- - Include/internal/pycore_condvar.h | 10 ++++++++++ - Include/pythread.h | 6 ++++++ - 2 files changed, 16 insertions(+) - -diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h -index 8b89d70..dd98245 100644 ---- a/Include/internal/pycore_condvar.h -+++ b/Include/internal/pycore_condvar.h -@@ -5,6 +5,12 @@ - # error "this header requires Py_BUILD_CORE define" - #endif - -+#ifdef __MINGW32__ -+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS) -+# undef _POSIX_THREADS -+# endif -+#endif -+ - #ifndef _POSIX_THREADS - /* This means pthreads are not implemented in libc headers, hence the macro - not present in unistd.h. But they still can be implemented as an external -@@ -37,6 +43,10 @@ - /* include windows if it hasn't been done before */ - #define WIN32_LEAN_AND_MEAN - #include -+/* winpthreads are involved via windows header, so need undef _POSIX_THREADS after header include */ -+#if defined(_POSIX_THREADS) -+#undef _POSIX_THREADS -+#endif - - /* options */ - /* non-emulated condition variables are provided for those that want -diff --git a/Include/pythread.h b/Include/pythread.h -index bb9d864..f1e52c6 100644 ---- a/Include/pythread.h -+++ b/Include/pythread.h -@@ -8,6 +8,12 @@ typedef void *PyThread_type_lock; - extern "C" { - #endif - -+#ifdef __MINGW32__ -+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS) -+# undef _POSIX_THREADS -+# endif -+#endif -+ - /* Return status codes for Python lock acquisition. Chosen for maximum - * backwards compatibility, ie failure -> 0, success -> 1. */ - typedef enum PyLockStatus { --- -2.32.0 - diff --git a/mingw-w64-python/0043-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch similarity index 55% rename from mingw-w64-python/0043-mingw-sysconfig-like-posix.patch rename to mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch index 71703067e9..0578e296e8 100644 --- a/mingw-w64-python/0043-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch @@ -1,36 +1,14 @@ -From 893ba3a5e55dc3e07bac6407075e3461a24f979f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= - -Date: Thu, 17 Jun 2021 18:51:50 +0530 -Subject: [PATCH 043/N] mingw sysconfig like posix -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From ab96d425d200796577c4d9eef79cc1e0e62a39dc Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 20:53:59 +0200 +Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix -Co-authored-by: Алексей --- - Lib/distutils/command/build_ext.py | 3 ++- - Lib/sysconfig.py | 28 ++++++++++++++-------------- - 2 files changed, 16 insertions(+), 15 deletions(-) + Lib/sysconfig.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) -diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 1c9d471..1dbdfe0 100644 ---- a/Lib/distutils/command/build_ext.py -+++ b/Lib/distutils/command/build_ext.py -@@ -221,9 +221,10 @@ class build_ext(Command): - if sys.platform[:6] == 'cygwin': - if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): - # building third party extensions -+ config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) - self.library_dirs.append(os.path.join(sys.prefix, "lib", - "python" + get_python_version(), -- "config")) -+ config_dir_name)) - else: - # building python standard extensions - self.library_dirs.append('.') diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 5d336d8..c0695e2 100644 +index f69d0db..64f7719 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -48,23 +48,23 @@ _INSTALL_SCHEMES = { @@ -46,8 +24,8 @@ index 5d336d8..c0695e2 100644 - 'scripts': '{base}/Scripts', + 'stdlib': '{installed_base}/lib/python{py_version_short}', + 'platstdlib': '{base}/lib/python{py_version_short}', -+ 'purelib': '{base}/lib/python{py_version_short}', -+ 'platlib': '{base}/lib/python{py_version_short}', ++ 'purelib': '{base}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{base}/lib/python{py_version_short}/site-packages', + 'include': '{installed_base}/include/python{py_version_short}', + 'platinclude': '{installed_base}/include/python{py_version_short}', + 'scripts': '{base}/bin', @@ -70,7 +48,7 @@ index 5d336d8..c0695e2 100644 'data': '{userbase}', }, 'posix_user': { -@@ -470,7 +470,7 @@ def _init_non_posix(vars): +@@ -471,7 +471,7 @@ def _init_non_posix(vars): vars['INCLUDEPY'] = get_path('include') vars['EXT_SUFFIX'] = _imp.extension_suffixes()[0] vars['EXE'] = '.exe' @@ -80,5 +58,5 @@ index 5d336d8..c0695e2 100644 # -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch new file mode 100644 index 0000000000..61efc9189c --- /dev/null +++ b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch @@ -0,0 +1,39 @@ +From fa3d5a352904467d12247164a7673033c5e95d2a Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 21:13:57 +0200 +Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils + via subprocess + +--- + Modules/Setup.config.in | 1 + + setup.py | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in +index 825ce5d..b4e7ff7 100644 +--- a/Modules/Setup.config.in ++++ b/Modules/Setup.config.in +@@ -12,4 +12,5 @@ + # build-in modules for windows platform: + @USE_WIN32_MODULE@winreg ../PC/winreg.c + @USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c ++@USE_WIN32_MODULE@_winapi _winapi.c + +diff --git a/setup.py b/setup.py +index c52fd3b..6a352af 100644 +--- a/setup.py ++++ b/setup.py +@@ -1612,7 +1612,9 @@ class PyBuildExt(build_ext): + self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p) + for p in ['msvcrtmodule.c']])) + +- self.add(Extension('_winapi', ['_winapi.c'])) ++ # Added to Setup.config.in as now needed earlier since I ++ # use subprocess (which uses Popen) in cygwinccompiler.py ++ # self.add(Extension('_winapi', ['_winapi.c'])) + + self.add(Extension('_msi', [os.path.join(pc_srcdir, p) + for p in ['_msi.c']], +-- +2.33.0 + diff --git a/mingw-w64-python/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch similarity index 80% rename from mingw-w64-python/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch rename to mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch index e65d5bb1aa..db7535fa3f 100644 --- a/mingw-w64-python/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,8 +1,8 @@ -From c919ed9405978c2261712b8e8e860b12f7001057 Mon Sep 17 00:00:00 2001 +From 64886b38c5ad2d78730ed147ba398693731a8e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:52 +0530 -Subject: [PATCH 045/N] cross dont add multiarch paths if cross compiling +Subject: [PATCH 038/N] cross dont add multiarch paths if cross compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 36af6e9..55c7382 100644 +index 6a352af..497abbf 100644 --- a/setup.py +++ b/setup.py -@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): +@@ -737,10 +737,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -29,5 +29,5 @@ index 36af6e9..55c7382 100644 def init_inc_lib_dirs(self): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0046-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch similarity index 84% rename from mingw-w64-python/0046-mingw-use-backslashes-in-compileall-py.patch rename to mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch index f7a383a0b5..cd6c55ba14 100644 --- a/mingw-w64-python/0046-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch @@ -1,8 +1,8 @@ -From 0525d209616594f74c395e8db04aa745f6b190e2 Mon Sep 17 00:00:00 2001 +From 47c94ca56a6ebe7423ed267a69d1b9931893da3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:53 +0530 -Subject: [PATCH 046/N] mingw use backslashes in compileall py +Subject: [PATCH 039/N] mingw use backslashes in compileall py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/Lib/compileall.py b/Lib/compileall.py -index fe7f450..4102839 100644 +index 39f4bb3..3490c09 100644 --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -38,6 +38,8 @@ def _walk_dir(dir, maxlevels, quiet=0): @@ -26,5 +26,5 @@ index fe7f450..4102839 100644 yield fullname elif (maxlevels > 0 and name != os.curdir and name != os.pardir and -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch new file mode 100644 index 0000000000..a6ddfec361 --- /dev/null +++ b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch @@ -0,0 +1,42 @@ +From 22fc2593de88d46a11786898d401e4801faeb125 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 21:18:36 +0200 +Subject: [PATCH 040/N] msys convert_path fix and root hack + +--- + Makefile.pre.in | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index e0b8155..cf16e93 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1707,6 +1707,12 @@ libainstall: @DEF_MAKE_RULE@ python-config + else true; \ + fi + ++ifeq ($(shell uname -o),Msys) ++DESTDIRFINAL=$(DESTDIR) ++else ++DESTDIRFINAL=$(DESTDIR)/ ++endif ++ + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: sharedmods +@@ -1714,9 +1720,9 @@ sharedinstall: sharedmods + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +- --root=$(DESTDIR)/ +- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py +- -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ ++ --root=$(DESTDIRFINAL) ++ -rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py ++ -rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__ + + # Here are a couple of targets for MacOSX again, to install a full + # framework-based Python. frameworkinstall installs everything, the +-- +2.33.0 + diff --git a/mingw-w64-python/0048-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch similarity index 91% rename from mingw-w64-python/0048-allow-static-tcltk.patch rename to mingw-w64-python/0041-allow-static-tcltk.patch index 328021e72e..df8ed5db72 100644 --- a/mingw-w64-python/0048-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,8 +1,8 @@ -From 6777f17ccae090e6687d6317b4dafcb0c8899f8f Mon Sep 17 00:00:00 2001 +From 096b2ca2e049158126943fbd39eb969d2e040262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:54 +0530 -Subject: [PATCH 048/N] allow static tcltk +Subject: [PATCH 041/N] allow static tcltk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py -index 55c7382..d8fc413 100644 +index 497abbf..31b08de 100644 --- a/setup.py +++ b/setup.py -@@ -783,7 +783,7 @@ class PyBuildExt(build_ext): +@@ -786,7 +786,7 @@ class PyBuildExt(build_ext): if HOST_PLATFORM == 'hp-ux11': self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] @@ -25,7 +25,7 @@ index 55c7382..d8fc413 100644 # This should work on any unixy platform ;-) # If the user has bothered specifying additional -I and -L flags # in OPT and LDFLAGS we might as well use them here. -@@ -793,6 +793,8 @@ class PyBuildExt(build_ext): +@@ -796,6 +796,8 @@ class PyBuildExt(build_ext): # directories with whitespace in the name to store libraries. cflags, ldflags = sysconfig.get_config_vars( 'CFLAGS', 'LDFLAGS') @@ -34,7 +34,7 @@ index 55c7382..d8fc413 100644 for item in cflags.split(): if item.startswith('-I'): self.inc_dirs.append(item[2:]) -@@ -2042,14 +2044,19 @@ class PyBuildExt(build_ext): +@@ -2047,14 +2049,19 @@ class PyBuildExt(build_ext): # The versions with dots are used on Unix, and the versions without # dots on Windows, for detection by cygwin. tcllib = tklib = tcl_includes = tk_includes = None @@ -62,7 +62,7 @@ index 55c7382..d8fc413 100644 break # Now check for the header files -@@ -2120,10 +2127,18 @@ class PyBuildExt(build_ext): +@@ -2125,10 +2132,18 @@ class PyBuildExt(build_ext): # Add the Tcl/Tk libraries libs.append('tk'+ version) libs.append('tcl'+ version) @@ -83,5 +83,5 @@ index 55c7382..d8fc413 100644 # XXX handle these, but how to detect? # *** Uncomment and edit for PIL (TkImaging) extension only: -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0049-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch similarity index 87% rename from mingw-w64-python/0049-mingw-pdcurses_ISPAD.patch rename to mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index 1417c8f469..a661d7c687 100644 --- a/mingw-w64-python/0049-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,8 +1,8 @@ -From 88deca4afdb3762987227d4aa3cd50cfc8658ea7 Mon Sep 17 00:00:00 2001 +From 2b8402c1cab75d631728eb1aecf02eb0f0f66265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:55 +0530 -Subject: [PATCH 049/N] mingw pdcurses_ISPAD +Subject: [PATCH 042/N] mingw pdcurses_ISPAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644 /* configure was checking , but we will use , which has some or all these features. */ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0050-grammar-fixes.patch b/mingw-w64-python/0043-grammar-fixes.patch similarity index 91% rename from mingw-w64-python/0050-grammar-fixes.patch rename to mingw-w64-python/0043-grammar-fixes.patch index cc3d5f8eb0..1849347242 100644 --- a/mingw-w64-python/0050-grammar-fixes.patch +++ b/mingw-w64-python/0043-grammar-fixes.patch @@ -1,8 +1,8 @@ -From ece4431ade66c4abb835a489cacc002545ccb13a Mon Sep 17 00:00:00 2001 +From 36b85a28791eb087338e12f796e8d473d22f3ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:56 +0530 -Subject: [PATCH 050/N] grammar fixes +Subject: [PATCH 043/N] grammar fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -41,5 +41,5 @@ index b7aa528..4a1ee9a 100644 {2, 1}, {3, 2}, -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0051-builddir-fixes.patch b/mingw-w64-python/0044-builddir-fixes.patch similarity index 95% rename from mingw-w64-python/0051-builddir-fixes.patch rename to mingw-w64-python/0044-builddir-fixes.patch index b23275dc87..e3318b172f 100644 --- a/mingw-w64-python/0051-builddir-fixes.patch +++ b/mingw-w64-python/0044-builddir-fixes.patch @@ -1,8 +1,8 @@ -From 6e9ed94084c501600e2ba6fdaac4b49b252e654d Mon Sep 17 00:00:00 2001 +From e835e97afda8c4c672defae902194866fc3df0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 -Subject: [PATCH 051/N] builddir fixes +Subject: [PATCH 044/N] builddir fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,7 +15,7 @@ Co-authored-by: Christoph Reiter 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 72be72d..7badeec 100644 +index cf16e93..7b3fdf6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -741,20 +741,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) @@ -66,5 +66,5 @@ index 2e4ccbb..a8d5c31 100644 from frozen.obj. In the Makefile, frozen.o is not linked into this executable, so we define the variable here. */ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0052-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch similarity index 86% rename from mingw-w64-python/0052-msys-monkeypatch-os-system-via-sh-exe.patch rename to mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch index 185b774730..783c5082bd 100644 --- a/mingw-w64-python/0052-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,8 +1,8 @@ -From 2cafb98ac994c8befe0d053e6e1524af8ec6e180 Mon Sep 17 00:00:00 2001 +From 74ee0fa7cbd23e29f60d03606ee32b34bc0dbc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 -Subject: [PATCH 052/N] msys monkeypatch os system via sh exe +Subject: [PATCH 045/N] msys monkeypatch os system via sh exe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 11 insertions(+) diff --git a/setup.py b/setup.py -index d8fc413..20fff27 100644 +index 31b08de..207a61c 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,17 @@ def get_platform(): @@ -35,5 +35,5 @@ index d8fc413..20fff27 100644 HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0053-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch similarity index 86% rename from mingw-w64-python/0053-msys-replace-slashes-used-in-io-redirection.patch rename to mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch index 2d9f4a5aee..c99d0ff5fb 100644 --- a/mingw-w64-python/0053-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch @@ -1,8 +1,8 @@ -From c403bd9ac50aeda60b91f6c990f4f34bedf93bd3 Mon Sep 17 00:00:00 2001 +From a85ea70acca8b8d49c5dea8451ec512ea979d88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:58 +0530 -Subject: [PATCH 053/N] msys replace slashes used in io redirection +Subject: [PATCH 046/N] msys replace slashes used in io redirection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py -index 20fff27..f5914d8 100644 +index 207a61c..d7a60e0 100644 --- a/setup.py +++ b/setup.py -@@ -643,7 +643,7 @@ class PyBuildExt(build_ext): +@@ -646,7 +646,7 @@ class PyBuildExt(build_ext): # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec cc = sysconfig.get_config_var('CC') @@ -26,7 +26,7 @@ index 20fff27..f5914d8 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( -@@ -668,7 +668,7 @@ class PyBuildExt(build_ext): +@@ -671,7 +671,7 @@ class PyBuildExt(build_ext): opt = '' if CROSS_COMPILING: opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') @@ -35,7 +35,7 @@ index 20fff27..f5914d8 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( -@@ -687,7 +687,7 @@ class PyBuildExt(build_ext): +@@ -690,7 +690,7 @@ class PyBuildExt(build_ext): def add_cross_compiling_paths(self): cc = sysconfig.get_config_var('CC') @@ -44,7 +44,7 @@ index 20fff27..f5914d8 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -@@ -1001,7 +1001,7 @@ class PyBuildExt(build_ext): +@@ -1004,7 +1004,7 @@ class PyBuildExt(build_ext): readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -53,7 +53,7 @@ index 20fff27..f5914d8 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # Determine if readline is already linked against curses or tinfo. -@@ -1998,12 +1998,12 @@ class PyBuildExt(build_ext): +@@ -2003,12 +2003,12 @@ class PyBuildExt(build_ext): cflags = sysconfig.get_config_vars('CFLAGS')[0] archs = re.findall(r'-arch\s+(\w+)', cflags) @@ -69,5 +69,5 @@ index 20fff27..f5914d8 100644 with open(tmpfile) as fp: detected_archs = [] -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0055-remove_path_max.default.patch b/mingw-w64-python/0047-remove_path_max.default.patch similarity index 83% rename from mingw-w64-python/0055-remove_path_max.default.patch rename to mingw-w64-python/0047-remove_path_max.default.patch index 864103a08d..e0cdf36e24 100644 --- a/mingw-w64-python/0055-remove_path_max.default.patch +++ b/mingw-w64-python/0047-remove_path_max.default.patch @@ -1,8 +1,8 @@ -From d7ddae846cd17e00caca8c969b55a057f3589fec Mon Sep 17 00:00:00 2001 +From 01d2127df3190c472307aff3aaa71ab65e2450e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 -Subject: [PATCH 055/N] remove_path_max.default +Subject: [PATCH 047/N] remove_path_max.default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index 3243944..99d4977 100644 #endif -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0056-dont-link-with-gettext.patch b/mingw-w64-python/0048-dont-link-with-gettext.patch similarity index 91% rename from mingw-w64-python/0056-dont-link-with-gettext.patch rename to mingw-w64-python/0048-dont-link-with-gettext.patch index 29901d402e..b70260cc2e 100644 --- a/mingw-w64-python/0056-dont-link-with-gettext.patch +++ b/mingw-w64-python/0048-dont-link-with-gettext.patch @@ -1,8 +1,8 @@ -From fbe0b754bebcb09130fe8303ca180ef2221a8372 Mon Sep 17 00:00:00 2001 +From 9b3cfc647bdeedc9caa6d89cdbcb4dfcdb3490f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:00 +0530 -Subject: [PATCH 056/N] dont link with gettext +Subject: [PATCH 048/N] dont link with gettext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -32,7 +32,7 @@ index 2e353bb..ea222af 100644 #include #include diff --git a/configure.ac b/configure.ac -index 4586602..1599c74 100644 +index a9640e9..0e1e9e4 100644 --- a/configure.ac +++ b/configure.ac @@ -3154,10 +3154,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) @@ -56,5 +56,5 @@ index 4586602..1599c74 100644 # checks for system dependent C++ extensions support case "$ac_sys_system" in -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0057-ctypes-python-dll.patch b/mingw-w64-python/0049-ctypes-python-dll.patch similarity index 90% rename from mingw-w64-python/0057-ctypes-python-dll.patch rename to mingw-w64-python/0049-ctypes-python-dll.patch index 20359a481e..158470a4d1 100644 --- a/mingw-w64-python/0057-ctypes-python-dll.patch +++ b/mingw-w64-python/0049-ctypes-python-dll.patch @@ -1,8 +1,8 @@ -From 3347f3abb6dac9690e21055bb8a823870d4c9edd Mon Sep 17 00:00:00 2001 +From 2a0f9b8311884449312bb934557f43a93a7ab426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:01 +0530 -Subject: [PATCH 057/N] ctypes python dll +Subject: [PATCH 049/N] ctypes python dll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -29,5 +29,5 @@ index 4afa4eb..2fe2eec 100644 elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0058-gdbm-module-includes.patch b/mingw-w64-python/0050-gdbm-module-includes.patch similarity index 86% rename from mingw-w64-python/0058-gdbm-module-includes.patch rename to mingw-w64-python/0050-gdbm-module-includes.patch index 95e45acf78..ce5f06ab6a 100644 --- a/mingw-w64-python/0058-gdbm-module-includes.patch +++ b/mingw-w64-python/0050-gdbm-module-includes.patch @@ -1,8 +1,8 @@ -From 886617c8d1d880ef0206debff313a068669e4e6f Mon Sep 17 00:00:00 2001 +From 34ca4e0b61ce539fee85e283e71d147d4035ae72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:02 +0530 -Subject: [PATCH 058/N] gdbm module includes +Subject: [PATCH 050/N] gdbm module includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -26,5 +26,5 @@ index dd4c6b1..d51015c 100644 extern const char * gdbm_strerror(gdbm_error); #endif -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0059-use-gnu_printf-in-format.patch b/mingw-w64-python/0051-use-gnu_printf-in-format.patch similarity index 96% rename from mingw-w64-python/0059-use-gnu_printf-in-format.patch rename to mingw-w64-python/0051-use-gnu_printf-in-format.patch index adab14b23a..d73adaa667 100644 --- a/mingw-w64-python/0059-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0051-use-gnu_printf-in-format.patch @@ -1,8 +1,8 @@ -From 3f773a3fb7c2ff965f5ec8dadb348a99ca5c2874 Mon Sep 17 00:00:00 2001 +From c25ea3b8769fa270074f16ead5f119260219d127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:03 +0530 -Subject: [PATCH 059/N] use gnu_printf in format +Subject: [PATCH 051/N] use gnu_printf in format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -81,5 +81,5 @@ index 670e5d2..d582963 100644 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...); -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0060-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch similarity index 90% rename from mingw-w64-python/0060-mingw-fix-ssl-dont-use-enum_certificates.patch rename to mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch index 92472c3da3..e4f7dc678d 100644 --- a/mingw-w64-python/0060-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,7 +1,7 @@ -From 1d256fa194a67c65adab63f98e3129f203b0f3fa Mon Sep 17 00:00:00 2001 +From f5d305af4ee0826f1dcafe85fc7493657e667cb0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 -Subject: [PATCH 060/N] mingw fix ssl dont use enum_certificates +Subject: [PATCH 052/N] mingw fix ssl dont use enum_certificates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -35,5 +35,5 @@ index 30f4e59..dda3ae1 100644 self._load_windows_store_certs(storename, purpose) self.set_default_verify_paths() -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0063-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch similarity index 89% rename from mingw-w64-python/0063-fix-using-dllhandle-and-winver-mingw.patch rename to mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch index 71966ad3c2..9f83ec4541 100644 --- a/mingw-w64-python/0063-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch @@ -1,8 +1,8 @@ -From 86c9d4a3a9b44f10b1c4c638243ed1f0b783901a Mon Sep 17 00:00:00 2001 +From 70aae126fda0fca2f004edd82894c13f0b279b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 -Subject: [PATCH 063/N] fix using dllhandle and winver mingw +Subject: [PATCH 053/N] fix using dllhandle and winver mingw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -35,5 +35,5 @@ index 3e4115f..839ed1c 100644 PyLong_FromVoidPtr(PyWin_DLLhModule)); SET_SYS_FROM_STRING("winver", -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch similarity index 89% rename from mingw-w64-python/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch rename to mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index b9981c9427..27b7559470 100644 --- a/mingw-w64-python/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,8 +1,8 @@ -From 1c81c81b5e7f5ba55927e8ae64e148731ed9b04f Mon Sep 17 00:00:00 2001 +From 887b0e7895143809d0c8170caa3a4dd2306efefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:07 +0530 -Subject: [PATCH 065/N] Add AMD64 to sys config so msvccompiler +Subject: [PATCH 054/N] Add AMD64 to sys config so msvccompiler get_build_version works --- @@ -38,5 +38,5 @@ index 59c0dbf..adccaa7 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0066-MINGW-link-with-additional-library.patch b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch similarity index 72% rename from mingw-w64-python/0066-MINGW-link-with-additional-library.patch rename to mingw-w64-python/0055-MINGW-link-with-additional-library.patch index 490e2703cb..b96843f83e 100644 --- a/mingw-w64-python/0066-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch @@ -1,18 +1,18 @@ -From 5e0de2a63f9534dabbdfbe422cb7952afa4b7ce2 Mon Sep 17 00:00:00 2001 +From 1d8904ee69999ae9e58bec2b177472e67493628a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:08 +0530 -Subject: [PATCH 066/N] MINGW link with additional library +Subject: [PATCH 055/N] MINGW link with additional library --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 1599c74..28b69be 100644 +index 0e1e9e4..4316338 100644 --- a/configure.ac +++ b/configure.ac -@@ -5860,6 +5860,15 @@ for dir in $SRCDIRS; do +@@ -5861,6 +5861,15 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT(done) @@ -29,5 +29,5 @@ index 1599c74..28b69be 100644 AC_MSG_CHECKING(for -O2) saved_cflags="$CFLAGS" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0067-install-msilib.patch b/mingw-w64-python/0056-install-msilib.patch similarity index 86% rename from mingw-w64-python/0067-install-msilib.patch rename to mingw-w64-python/0056-install-msilib.patch index d8df55c7ae..7f2fd35a8c 100644 --- a/mingw-w64-python/0067-install-msilib.patch +++ b/mingw-w64-python/0056-install-msilib.patch @@ -1,7 +1,7 @@ -From 408a59388df34c484cc3bfc7d7465ca7ea9c6f05 Mon Sep 17 00:00:00 2001 +From 63cdce7b086866930e5d34b1ade187dc0f92309d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 -Subject: [PATCH 067/N] install msilib +Subject: [PATCH 056/N] install msilib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,7 +14,7 @@ Co-authored-by: Ray Donnelly 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7badeec..f6d0247 100644 +index 7b3fdf6..87e95ec 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1497,6 +1497,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ @@ -26,5 +26,5 @@ index 7badeec..f6d0247 100644 unittest unittest/test unittest/test/testmock \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0069-fix-signal-module-build.patch b/mingw-w64-python/0057-fix-signal-module-build.patch similarity index 90% rename from mingw-w64-python/0069-fix-signal-module-build.patch rename to mingw-w64-python/0057-fix-signal-module-build.patch index 5bd32b1ba2..3988173e45 100644 --- a/mingw-w64-python/0069-fix-signal-module-build.patch +++ b/mingw-w64-python/0057-fix-signal-module-build.patch @@ -1,7 +1,7 @@ -From a79c0b4716a86e95e7b41f9f64a51492ad2440a6 Mon Sep 17 00:00:00 2001 +From 9aea35d5abfebe9c7db885e7675f29d82a253b3b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 -Subject: [PATCH 069/N] fix signal module build +Subject: [PATCH 057/N] fix signal module build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index 2bafdd0..7ce4355 100644 time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c # -lm # time operations and variables _thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c # low-level threading interface -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0070-build-winconsoleio.patch b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch similarity index 58% rename from mingw-w64-python/0070-build-winconsoleio.patch rename to mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch index 54a404c3c8..406dcf169a 100644 --- a/mingw-w64-python/0070-build-winconsoleio.patch +++ b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch @@ -1,7 +1,7 @@ -From a6869a3b49e6a333b907061339eeef622a6d4e08 Mon Sep 17 00:00:00 2001 +From 3ebd25cabfc22fab766e53b0e7b8f60d04073f2f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 -Subject: [PATCH 070/N] build winconsoleio +Subject: [PATCH 058/N] build: build winconsoleio and _testconsole MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -9,7 +9,8 @@ Content-Transfer-Encoding: 8bit Co-authored-by: Алексей --- Modules/Setup | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + setup.py | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/Setup b/Modules/Setup index 7ce4355..6bb5e51 100644 @@ -24,6 +25,20 @@ index 7ce4355..6bb5e51 100644 # faulthandler module faulthandler faulthandler.c +diff --git a/setup.py b/setup.py +index d7a60e0..ede0e72 100644 +--- a/setup.py ++++ b/setup.py +@@ -998,6 +998,9 @@ class PyBuildExt(build_ext): + ['_xxtestfuzz/_xxtestfuzz.c', + '_xxtestfuzz/fuzzer.c'])) + ++ if MS_WINDOWS: ++ self.add(Extension('_testconsole', ['../PC/_testconsole.c'])) ++ + def detect_readline_curses(self): + # readline + do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline') -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0071-expose-sem_unlink.patch b/mingw-w64-python/0059-expose-sem_unlink.patch similarity index 89% rename from mingw-w64-python/0071-expose-sem_unlink.patch rename to mingw-w64-python/0059-expose-sem_unlink.patch index 579f5f02f2..7f18594613 100644 --- a/mingw-w64-python/0071-expose-sem_unlink.patch +++ b/mingw-w64-python/0059-expose-sem_unlink.patch @@ -1,7 +1,7 @@ -From 15f50a4e53545b16eaaf9b9fade68a828a6e0503 Mon Sep 17 00:00:00 2001 +From 9aca6a28934f67df24b2b640c1d8c40623f40afd Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 -Subject: [PATCH 071/N] expose sem_unlink +Subject: [PATCH 059/N] expose sem_unlink MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index 806e638..d7954d1 100644 #endif {NULL} -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0072-cygpty-isatty.patch b/mingw-w64-python/0060-cygpty-isatty.patch similarity index 97% rename from mingw-w64-python/0072-cygpty-isatty.patch rename to mingw-w64-python/0060-cygpty-isatty.patch index 21031bac83..e639c91f2e 100644 --- a/mingw-w64-python/0072-cygpty-isatty.patch +++ b/mingw-w64-python/0060-cygpty-isatty.patch @@ -1,7 +1,7 @@ -From 9fb465b60da98040bbc8ee649f17cfb6dbe3f293 Mon Sep 17 00:00:00 2001 +From 0255306a4066705227cd3d903290d9550593e295 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 -Subject: [PATCH 072/N] cygpty isatty +Subject: [PATCH 060/N] cygpty isatty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -71,7 +71,7 @@ index 0000000..82fd0af + +#endif /* _ISCYGPTY_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in -index f6d0247..126131c 100644 +index 87e95ec..e351cae 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -372,6 +372,7 @@ PYTHON_OBJS= \ @@ -175,7 +175,7 @@ index 1c6ecaf..afddc4f 100644 return PyBool_FromLong(res); diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c -index 614012d..d29d06d 100644 +index 21c70f9..58d7512 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1,6 +1,7 @@ @@ -186,7 +186,7 @@ index 614012d..d29d06d 100644 #include #include "ast.h" #undef Yield /* undefine macro conflicting with */ -@@ -1980,7 +1981,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) +@@ -1971,7 +1972,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) Py_DECREF(tmp); if (fd < 0 && PyErr_Occurred()) return NULL; @@ -195,7 +195,7 @@ index 614012d..d29d06d 100644 } if (tty) { tmp = _PyObject_CallMethodIdNoArgs(fout, &PyId_fileno); -@@ -1993,7 +1994,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) +@@ -1984,7 +1985,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) Py_DECREF(tmp); if (fd < 0 && PyErr_Occurred()) return NULL; @@ -205,7 +205,7 @@ index 614012d..d29d06d 100644 } diff --git a/Python/fileutils.c b/Python/fileutils.c -index d5f8b79..a47f12b 100644 +index 4b299b2..573a5c2 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1,4 +1,5 @@ @@ -457,5 +457,5 @@ index 60f091c..734084c 100644 if (!Py_InteractiveFlag) return 0; -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0073-disable-broken-gdbm-module.patch b/mingw-w64-python/0061-disable-broken-gdbm-module.patch similarity index 77% rename from mingw-w64-python/0073-disable-broken-gdbm-module.patch rename to mingw-w64-python/0061-disable-broken-gdbm-module.patch index 79a3c181d2..5b3d26f497 100644 --- a/mingw-w64-python/0073-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0061-disable-broken-gdbm-module.patch @@ -1,7 +1,7 @@ -From e486b493d937ef113c8cfc1904362196a31ba605 Mon Sep 17 00:00:00 2001 +From 391cfafdf3cd9cc56516cd6d3d8d37bf68ef870c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 -Subject: [PATCH 073/N] disable broken gdbm module +Subject: [PATCH 061/N] disable broken gdbm module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index f5914d8..a709723 100644 +index ede0e72..74b844c 100644 --- a/setup.py +++ b/setup.py -@@ -1399,7 +1399,7 @@ class PyBuildExt(build_ext): +@@ -1405,7 +1405,7 @@ class PyBuildExt(build_ext): if dbm_args: dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":") else: @@ -25,5 +25,5 @@ index f5914d8..a709723 100644 for cand in dbm_order: if cand == "ndbm": -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0074-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch similarity index 72% rename from mingw-w64-python/0074-link-win-resource-files-and-build-pythonw.patch rename to mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch index cf72ae35c9..afd02349ff 100644 --- a/mingw-w64-python/0074-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch @@ -1,19 +1,19 @@ -From d25e8cea94e811159605490e7b383521024c563b Mon Sep 17 00:00:00 2001 +From 17ac3e7063af45b116396303f85be4eb95f0e9d9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 -Subject: [PATCH 074/N] link win resource files and build pythonw +Subject: [PATCH 062/N] build: link win resource files and build pythonw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Алексей --- - Makefile.pre.in | 29 ++++++++++++++++++++++++----- - configure.ac | 10 ++++++++++ - 2 files changed, 34 insertions(+), 5 deletions(-) + Makefile.pre.in | 26 +++++++++++++++++++++----- + configure.ac | 26 ++++++++++++++++++++++++++ + 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 126131c..7c1a775 100644 +index e351cae..afeee0e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,6 +38,7 @@ CXX= @CXX@ @@ -49,21 +49,18 @@ index 126131c..7c1a775 100644 Programs/_testembed python-config # Check that the source is clean when building out of source. -@@ -596,9 +599,24 @@ coverage-report: regen-grammar regen-token regen-importlib +@@ -596,9 +599,21 @@ coverage-report: regen-grammar regen-token regen-importlib clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir) -+pythonnt_rc.h: -+ @echo '#define PYTHON_DLL_NAME "$(DLLLIBRARY)"' >> $@ -+ -+python_exe.o: pythonnt_rc.h $(srcdir)/PC/python_exe.rc ++python_exe.o: $(srcdir)/PC/python_exe.rc + $(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_exe.rc $@ + -+pythonw_exe.o: pythonnt_rc.h $(srcdir)/PC/pythonw_exe.rc ++pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc + $(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pythonw_exe.rc $@ + -+python_nt.o: pythonnt_rc.h $(srcdir)/PC/python_nt.rc -+ $(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ ++python_nt.o: $(srcdir)/PC/python_nt.rc ++ $(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ + +$(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o @@ -76,7 +73,7 @@ index 126131c..7c1a775 100644 platform: $(BUILDPYTHON) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -708,10 +726,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -708,10 +723,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ # This rule builds the Cygwin Python DLL and import library if configured # for a shared core library; otherwise, this rule is a noop. @@ -89,7 +86,7 @@ index 126131c..7c1a775 100644 else true; \ fi -@@ -1325,6 +1343,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1325,6 +1340,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ done if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ @@ -98,10 +95,10 @@ index 126131c..7c1a775 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index 25aecf9..cea888c 100644 +index 4316338..be8ede9 100644 --- a/configure.ac +++ b/configure.ac -@@ -1350,6 +1350,9 @@ fi +@@ -1343,6 +1343,9 @@ fi AC_MSG_RESULT($LDLIBRARY) @@ -111,11 +108,27 @@ index 25aecf9..cea888c 100644 AC_SUBST(AR) AC_CHECK_TOOLS(AR, ar aal, ar) -@@ -5870,10 +5873,17 @@ AC_MSG_RESULT(done) +@@ -5865,10 +5868,33 @@ AC_MSG_RESULT(done) case $host in *-*-mingw*) LIBS="$LIBS -lversion -lshlwapi -lpathcch" -+ RCFLAGS="$RCFLAGS -O COFF" ++ AC_PROG_AWK ++ if test "$AWK" = "gawk"; then ++ awk_extra_flag="--non-decimal-data" ++ fi ++ AC_MSG_CHECKING([FIELD3]) ++ FIELD3=$($AWK $awk_extra_flag '\ ++ /^#define PY_RELEASE_LEVEL_/ {levels[$2]=$3} \ ++ /^#define PY_MICRO_VERSION[[:space:]]+/ {micro=$3} \ ++ /^#define PY_RELEASE_LEVEL[[:space:]]+/ {level=levels[$3]} \ ++ /^#define PY_RELEASE_SERIAL[[:space:]]+/ {serial=$3} \ ++ END {print micro * 1000 + level * 10 + serial}' \ ++ $srcdir/Include/patchlevel.h ++ ) ++ ++ AC_MSG_RESULT([${FIELD3}]) ++ RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF" ++ + case $host in + i686*) RCFLAGS="$RCFLAGS --target=pe-i386" ;; + x86_64*) RCFLAGS="$RCFLAGS --target=pe-x86-64" ;; @@ -130,5 +143,5 @@ index 25aecf9..cea888c 100644 # Availability of -O2: AC_MSG_CHECKING(for -O2) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0075-3.7-mpdec-mingw.patch b/mingw-w64-python/0063-3.7-mpdec-mingw.patch similarity index 76% rename from mingw-w64-python/0075-3.7-mpdec-mingw.patch rename to mingw-w64-python/0063-3.7-mpdec-mingw.patch index ede7f5473b..6053fd4538 100644 --- a/mingw-w64-python/0075-3.7-mpdec-mingw.patch +++ b/mingw-w64-python/0063-3.7-mpdec-mingw.patch @@ -1,18 +1,18 @@ -From 0669b928b1aeaedc039a0c7bc1e688b4190fdf8e Mon Sep 17 00:00:00 2001 +From a15d5dafd3604b7f6ddb3fa99dd26ec0757024a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:17 +0530 -Subject: [PATCH 075/N] 3.7 mpdec mingw +Subject: [PATCH 063/N] 3.7 mpdec mingw --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a709723..79111ab 100644 +index 74b844c..a4222fc 100644 --- a/setup.py +++ b/setup.py -@@ -2283,7 +2283,7 @@ class PyBuildExt(build_ext): +@@ -2291,7 +2291,7 @@ class PyBuildExt(build_ext): undef_macros = [] if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): include_dirs = [] @@ -22,5 +22,5 @@ index a709723..79111ab 100644 depends = ['_decimal/docstrings.h'] else: -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0076-disable-readline.patch b/mingw-w64-python/0064-disable-readline.patch similarity index 80% rename from mingw-w64-python/0076-disable-readline.patch rename to mingw-w64-python/0064-disable-readline.patch index 8790fec552..ee9b0494a8 100644 --- a/mingw-w64-python/0076-disable-readline.patch +++ b/mingw-w64-python/0064-disable-readline.patch @@ -1,7 +1,7 @@ -From 9e98fd461e9504b1275c883f7edb59258d2cf087 Mon Sep 17 00:00:00 2001 +From 7dc48f709c1ac3fd9d05b0f50ce4056bd3bf5268 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 -Subject: [PATCH 076/N] disable readline +Subject: [PATCH 064/N] disable readline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 79111ab..ea2aa96 100644 +index a4222fc..a4d206e 100644 --- a/setup.py +++ b/setup.py -@@ -997,7 +997,10 @@ class PyBuildExt(build_ext): +@@ -1003,7 +1003,10 @@ class PyBuildExt(build_ext): def detect_readline_curses(self): # readline @@ -28,5 +28,5 @@ index 79111ab..ea2aa96 100644 curses_library = "" # Cannot use os.popen here in py3k. -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0077-fix-isselectable.patch b/mingw-w64-python/0065-fix-isselectable.patch similarity index 87% rename from mingw-w64-python/0077-fix-isselectable.patch rename to mingw-w64-python/0065-fix-isselectable.patch index fe0657173b..9e4bb58673 100644 --- a/mingw-w64-python/0077-fix-isselectable.patch +++ b/mingw-w64-python/0065-fix-isselectable.patch @@ -1,7 +1,7 @@ -From 83d74ec0106b0a55fbb29324eb4961d1f5f92cef Mon Sep 17 00:00:00 2001 +From 27e5727fb44af8826b8725b2bc6de09e79e1b78f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 -Subject: [PATCH 077/N] fix isselectable +Subject: [PATCH 065/N] fix isselectable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index 6ec2994..a80f195 100644 #define _PyIsSelectable_fd(FD) (1) #else -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0078-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch similarity index 84% rename from mingw-w64-python/0078-use-_wcsnicmp-instead-wcsncasecmp.patch rename to mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch index bd889d2c6f..0e1a563ca3 100644 --- a/mingw-w64-python/0078-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,8 +1,8 @@ -From bc513cec0134febc13c4033ea8e9d839c3f3d6d1 Mon Sep 17 00:00:00 2001 +From c217628934d0d7a1b440eae998a7813702e320c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:19 +0530 -Subject: [PATCH 078/N] use _wcsnicmp instead wcsncasecmp +Subject: [PATCH 066/N] use _wcsnicmp instead wcsncasecmp --- Modules/getpath.c | 2 +- @@ -22,5 +22,5 @@ index c52e0df..2018495 100644 } -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0079-_xxsubinterpretersmodule.patch b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch similarity index 87% rename from mingw-w64-python/0079-_xxsubinterpretersmodule.patch rename to mingw-w64-python/0067-_xxsubinterpretersmodule.patch index be85e20e8e..9d9e160d71 100644 --- a/mingw-w64-python/0079-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch @@ -1,8 +1,8 @@ -From c20ac221468e3770baa22b7f853395e2e8a9df33 Mon Sep 17 00:00:00 2001 +From c392c6966b0f46197e48dfd89b9361358be823ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:20 +0530 -Subject: [PATCH 079/N] _xxsubinterpretersmodule +Subject: [PATCH 067/N] _xxsubinterpretersmodule --- Modules/_xxsubinterpretersmodule.c | 2 +- @@ -22,5 +22,5 @@ index 314059d..f26e662 100644 sizeof(channelid), /* tp_basicsize */ 0, /* tp_itemsize */ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0068-dont-include-system-ncurses-path.patch b/mingw-w64-python/0068-dont-include-system-ncurses-path.patch deleted file mode 100644 index 59bf520622..0000000000 --- a/mingw-w64-python/0068-dont-include-system-ncurses-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 430aee7255b2ebf1947c8670db95f017e41aecc6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= - -Date: Thu, 17 Jun 2021 18:52:09 +0530 -Subject: [PATCH 068/N] dont include system ncurses path - ---- - configure.ac | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 28b69be..25aecf9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5479,9 +5479,15 @@ fi - - # first curses header check - ac_save_cppflags="$CPPFLAGS" --if test "$cross_compiling" = no; then -- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" --fi -+case $host_os in -+ mingw*) -+ ;; -+ *) -+ if test "$cross_compiling" = no; then -+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+ fi -+ ;; -+esac - - AC_CHECK_HEADERS(curses.h ncurses.h) - --- -2.32.0 - diff --git a/mingw-w64-python/0080-sqlite3-module-defines.patch b/mingw-w64-python/0068-sqlite3-module-defines.patch similarity index 78% rename from mingw-w64-python/0080-sqlite3-module-defines.patch rename to mingw-w64-python/0068-sqlite3-module-defines.patch index 0677a1ba60..7ee187fcb9 100644 --- a/mingw-w64-python/0080-sqlite3-module-defines.patch +++ b/mingw-w64-python/0068-sqlite3-module-defines.patch @@ -1,17 +1,17 @@ -From 5fd45d9433577159d5ca4080fc338030f7a9e367 Mon Sep 17 00:00:00 2001 +From fdb194111cc3b59ae7193577e9c63d1367a6a6f2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 -Subject: [PATCH 080/N] sqlite3 module defines +Subject: [PATCH 068/N] sqlite3 module defines --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index ea2aa96..14e1396 100644 +index a4d206e..8458232 100644 --- a/setup.py +++ b/setup.py -@@ -1554,10 +1554,7 @@ class PyBuildExt(build_ext): +@@ -1560,10 +1560,7 @@ class PyBuildExt(build_ext): '_sqlite/util.c', ] sqlite_defines = [] @@ -24,5 +24,5 @@ index ea2aa96..14e1396 100644 # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0081-configure-have-inet-pton.patch b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch similarity index 77% rename from mingw-w64-python/0081-configure-have-inet-pton.patch rename to mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch index a233867adc..6caa8692c8 100644 --- a/mingw-w64-python/0081-configure-have-inet-pton.patch +++ b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch @@ -1,7 +1,7 @@ -From a59150eaa982d06c28e04305056e6064de57bcd0 Mon Sep 17 00:00:00 2001 +From e76cda7b6d05184ac17991dc46a568c42763a94a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 -Subject: [PATCH 081/N] configure have inet pton +Subject: [PATCH 069/N] configure.ac: fix inet_pton check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index cea888c..fb15812 100644 +index be8ede9..032d658 100644 --- a/configure.ac +++ b/configure.ac -@@ -4273,10 +4273,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +@@ -4274,10 +4274,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_MSG_CHECKING(for inet_pton) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -31,5 +31,5 @@ index cea888c..fb15812 100644 [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) AC_MSG_RESULT(yes)], -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0083-set-venv-activate-path-unix.patch b/mingw-w64-python/0070-set-venv-activate-path-unix.patch similarity index 85% rename from mingw-w64-python/0083-set-venv-activate-path-unix.patch rename to mingw-w64-python/0070-set-venv-activate-path-unix.patch index 4788ec5e85..b11395d40d 100644 --- a/mingw-w64-python/0083-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0070-set-venv-activate-path-unix.patch @@ -1,7 +1,7 @@ -From d13ab42085ab58f7114dbe9e50a9431dd0a5b9f4 Mon Sep 17 00:00:00 2001 +From 737d758a51b3e1778df4594ffbc671785c5a6425 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 -Subject: [PATCH 083/N] set venv activate path unix +Subject: [PATCH 070/N] set venv activate path unix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index 45af353..877b5d3 100644 _OLD_VIRTUAL_PATH="$PATH" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0084-venv-creation-fixes.patch b/mingw-w64-python/0071-venv-creation-fixes.patch similarity index 96% rename from mingw-w64-python/0084-venv-creation-fixes.patch rename to mingw-w64-python/0071-venv-creation-fixes.patch index 1b84a22799..fb3f5d66d3 100644 --- a/mingw-w64-python/0084-venv-creation-fixes.patch +++ b/mingw-w64-python/0071-venv-creation-fixes.patch @@ -1,7 +1,7 @@ -From eb0b0f383d56454cc6fde8f19ea056bf5bed75ce Mon Sep 17 00:00:00 2001 +From c82449ed5fed227754cfe841e67b7591b8683ed7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 -Subject: [PATCH 084/N] venv creation fixes +Subject: [PATCH 071/N] venv creation fixes --- Lib/venv/__init__.py | 19 ++++++++++++++----- @@ -67,5 +67,5 @@ index 8009deb..b471006 100644 def setup_scripts(self, context): """ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0085-pass-gen-profile-ldflags.patch b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch similarity index 77% rename from mingw-w64-python/0085-pass-gen-profile-ldflags.patch rename to mingw-w64-python/0072-pass-gen-profile-ldflags.patch index b67e10c61e..6d623b02ec 100644 --- a/mingw-w64-python/0085-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch @@ -1,7 +1,7 @@ -From d7dcc7c569482c7b1d2bc811b12e1f6a82d75cb3 Mon Sep 17 00:00:00 2001 +From 6e6cac92a946334a81bb08adbc54902d428b2dc5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 -Subject: [PATCH 085/N] pass gen profile ldflags +Subject: [PATCH 072/N] pass gen profile ldflags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7c1a775..3331d5c 100644 +index afeee0e..2018514 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -729,7 +729,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -726,7 +726,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o if test -n "$(DLLLIBRARY)"; then \ $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ @@ -25,5 +25,5 @@ index 7c1a775..3331d5c 100644 fi -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0087-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch similarity index 80% rename from mingw-w64-python/0087-pkg-config-windows-must-link-ext-with-python-lib.patch rename to mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch index 0110603636..e01ff57871 100644 --- a/mingw-w64-python/0087-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,8 +1,8 @@ -From 2834911199728b44d81ab258423b7fdbabd4753a Mon Sep 17 00:00:00 2001 +From 95164a8cedfca44250dd81d98d92cfc8d4c7f0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:29 +0530 -Subject: [PATCH 087/N] pkg config windows must link ext with python lib +Subject: [PATCH 073/N] pkg config windows must link ext with python lib --- Misc/python.pc.in | 2 +- @@ -21,18 +21,18 @@ index 87e04de..3900190 100644 +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/configure.ac b/configure.ac -index fb15812..d8b1eb3 100644 +index 032d658..588ffd4 100644 --- a/configure.ac +++ b/configure.ac -@@ -5149,7 +5149,7 @@ AC_MSG_RESULT($LDVERSION) +@@ -5150,7 +5150,7 @@ AC_MSG_RESULT($LDVERSION) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST(LIBPYTHON) -if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then -+if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win"; then ++if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win32"; then LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" else LIBPYTHON='' -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0088-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch similarity index 88% rename from mingw-w64-python/0088-importlib-bootstrap-path-sep.patch rename to mingw-w64-python/0074-importlib-bootstrap-path-sep.patch index f16c8398ec..45ebba4866 100644 --- a/mingw-w64-python/0088-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch @@ -1,7 +1,7 @@ -From 70b8703cafcfd25608f53a4a70403700dd695202 Mon Sep 17 00:00:00 2001 +From 3fa40ebd03d9cd5b0ab7341344f5d3c31647680f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 -Subject: [PATCH 088/N] importlib bootstrap path sep +Subject: [PATCH 074/N] importlib bootstrap path sep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -27,5 +27,5 @@ index fe31f43..229d9aa 100644 setattr(self_module, 'path_sep', path_sep) setattr(self_module, 'path_separators', ''.join(path_separators)) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0089-pathlib-path-sep.patch b/mingw-w64-python/0075-pathlib-path-sep.patch similarity index 76% rename from mingw-w64-python/0089-pathlib-path-sep.patch rename to mingw-w64-python/0075-pathlib-path-sep.patch index ca87d8ae15..9adef32da1 100644 --- a/mingw-w64-python/0089-pathlib-path-sep.patch +++ b/mingw-w64-python/0075-pathlib-path-sep.patch @@ -1,14 +1,14 @@ -From df3c78d7fbec2a02d559d26315c00d8f29e0a6c8 Mon Sep 17 00:00:00 2001 +From 81189e3707d4f72b57e86e40f065f811d80a97ac Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 -Subject: [PATCH 089/N] pathlib path sep +Subject: [PATCH 075/N] pathlib path sep --- Lib/pathlib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/pathlib.py b/Lib/pathlib.py -index 60e2855..9fc9f38 100644 +index 7aeda14..a66e754 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -123,6 +123,8 @@ class _WindowsFlavour(_Flavour): @@ -21,5 +21,5 @@ index 60e2855..9fc9f38 100644 pathmod = ntpath -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0090-warnings-fixes.patch b/mingw-w64-python/0076-warnings-fixes.patch similarity index 96% rename from mingw-w64-python/0090-warnings-fixes.patch rename to mingw-w64-python/0076-warnings-fixes.patch index 2c4719a261..23a7c52864 100644 --- a/mingw-w64-python/0090-warnings-fixes.patch +++ b/mingw-w64-python/0076-warnings-fixes.patch @@ -1,8 +1,8 @@ -From 2a8d3bf3a58d3caad9a27783240c25e9f720d137 Mon Sep 17 00:00:00 2001 +From 92b8d29b62c51db1359f987b022cae560dc5c3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:33 +0530 -Subject: [PATCH 090/N] warnings fixes +Subject: [PATCH 076/N] warnings fixes --- Modules/_winapi.c | 2 +- @@ -15,7 +15,7 @@ Subject: [PATCH 090/N] warnings fixes 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index ba318a1..e4c7d11 100644 +index 1058184..36af7bc 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -950,7 +950,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list) @@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644 /* minimum/maximum thread stack sizes supported */ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0091-fix-build-testinternalcapi.patch b/mingw-w64-python/0077-fix-build-testinternalcapi.patch similarity index 78% rename from mingw-w64-python/0091-fix-build-testinternalcapi.patch rename to mingw-w64-python/0077-fix-build-testinternalcapi.patch index 1a3648a5f2..5bcda88bd5 100644 --- a/mingw-w64-python/0091-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0077-fix-build-testinternalcapi.patch @@ -1,17 +1,17 @@ -From c7083b0b392333103cf09f4f33d66f07b0b5ac18 Mon Sep 17 00:00:00 2001 +From 08145aec08b12bed92d9010aedcf60cfcc23370b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 -Subject: [PATCH 091/N] fix build testinternalcapi +Subject: [PATCH 077/N] fix build testinternalcapi --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py -index 14e1396..0ce4714 100644 +index 8458232..a4e6dc1 100644 --- a/setup.py +++ b/setup.py -@@ -978,7 +978,11 @@ class PyBuildExt(build_ext): +@@ -981,7 +981,11 @@ class PyBuildExt(build_ext): depends=['testcapi_long.h'])) # Python Internal C API test module @@ -24,5 +24,5 @@ index 14e1396..0ce4714 100644 # Python PEP-3118 (buffer protocol) test module -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0092-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch similarity index 80% rename from mingw-w64-python/0092-extend-MS_WINDOWS-flag.patch rename to mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch index 2430614ce7..53acfb6b7d 100644 --- a/mingw-w64-python/0092-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch @@ -1,14 +1,14 @@ -From 1cdb69057f1fa189eaf8ef57c6a6ec946f681aaf Mon Sep 17 00:00:00 2001 +From b3cac7696a876238e11f9ea45b32d8b3ef755dc3 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 -Subject: [PATCH 092/N] extend MS_WINDOWS flag +Subject: [PATCH 078/N] extend MS_WINDOWS flag --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 0ce4714..a2d5656 100644 +index a4e6dc1..d161108 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ if sys.platform == "win32" and "MSYSTEM" in os.environ: @@ -21,5 +21,5 @@ index 0ce4714..a2d5656 100644 MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0093-clang-arm64.patch b/mingw-w64-python/0079-clang-arm64.patch similarity index 60% rename from mingw-w64-python/0093-clang-arm64.patch rename to mingw-w64-python/0079-clang-arm64.patch index 60f11671c6..ab75edefd6 100644 --- a/mingw-w64-python/0093-clang-arm64.patch +++ b/mingw-w64-python/0079-clang-arm64.patch @@ -1,26 +1,12 @@ -From 025cefb3dca7317d7476fa2a40938206e65eaa80 Mon Sep 17 00:00:00 2001 +From 61eb03c5793ae5c6026c7a854e1165556e3c42e7 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:36 +0530 -Subject: [PATCH 093/N] clang arm64 +Subject: [PATCH 079/N] clang arm64 --- - Lib/distutils/cygwinccompiler.py | 2 +- - Python/getcompiler.c | 11 ++++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) + Python/getcompiler.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) -diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index fcba43a..0c063a8 100644 ---- a/Lib/distutils/cygwinccompiler.py -+++ b/Lib/distutils/cygwinccompiler.py -@@ -394,7 +394,7 @@ def check_config_h(): - return (CONFIG_H_UNCERTAIN, - "couldn't read '%s': %s" % (fn, exc.strerror)) - --RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*$') -+RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*') - - def _find_exe_version(cmd): - """Find the version of an executable by running `cmd` in the shell. diff --git a/Python/getcompiler.c b/Python/getcompiler.c index adccaa7..b529e29 100644 --- a/Python/getcompiler.c @@ -59,5 +45,5 @@ index adccaa7..b529e29 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0094-MINGW-stack-reserve.patch b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch similarity index 75% rename from mingw-w64-python/0094-MINGW-stack-reserve.patch rename to mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch index b790b9a932..bee36b50a7 100644 --- a/mingw-w64-python/0094-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch @@ -1,14 +1,14 @@ -From f20f69a24d26de4f570e0c3806b8e328fe54a2b5 Mon Sep 17 00:00:00 2001 +From 2a92ce2774eee311160740719a7c80e85c62ab36 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:37 +0530 -Subject: [PATCH 094/N] MINGW stack reserve +Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index d8b1eb3..d76db66 100644 +index 588ffd4..5b41066 100644 --- a/configure.ac +++ b/configure.ac @@ -3065,6 +3065,11 @@ then @@ -24,5 +24,5 @@ index d8b1eb3..d76db66 100644 AC_MSG_RESULT($LINKFORSHARED) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0097-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch similarity index 82% rename from mingw-w64-python/0097-Don-t-use-os.pathsep-to-find-EOF.patch rename to mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch index b0845a03e7..42e218e12a 100644 --- a/mingw-w64-python/0097-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,7 +1,7 @@ -From d0241e1a50f2bd27876a54ee3047487d7ce66cc5 Mon Sep 17 00:00:00 2001 +From c791a766360579cd96c1a03563f674ca4e9e5698 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 -Subject: [PATCH 097/N] Don't use os.pathsep to find EOF not all +Subject: [PATCH 081/N] Don't use os.pathsep to find EOF not all distributions in win32 have them as \ instead check using sys.platform Signed-off-by: Naveen M K @@ -23,5 +23,5 @@ index b344f03..474ef89 100644 else: eof = 'Ctrl-D (i.e. EOF)' -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch similarity index 87% rename from mingw-w64-python/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch rename to mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 226494752d..95d3aefab8 100644 --- a/mingw-w64-python/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,7 +1,7 @@ -From 07a8e1ed1285bf5e2708036b1c1cc72fc87dfa21 Mon Sep 17 00:00:00 2001 +From cda85af5ff314ebd772e1000b48eefaddb0914b7 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 -Subject: [PATCH 098/N] Fix extension suffix for c-extensions on mingw +Subject: [PATCH 082/N] Fix extension suffix for c-extensions on mingw Python is compiled with various compilers which previously had same platform tags or extension suffix. This can be error @@ -17,11 +17,11 @@ Signed-off-by: Naveen M K --- Makefile.pre.in | 6 ++-- Python/dynload_win.c | 6 ---- - configure.ac | 76 +++++++++++++++++++++++++++++++++++++++----- - 3 files changed, 71 insertions(+), 17 deletions(-) + configure.ac | 77 +++++++++++++++++++++++++++++++++++++++----- + 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3331d5c..e18239f 100644 +index 2018514..a8aecc2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -165,6 +165,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) @@ -32,7 +32,7 @@ index 3331d5c..e18239f 100644 LDSHARED= @LDSHARED@ $(PY_LDFLAGS) BLDSHARED= @BLDSHARED@ $(PY_CORE_LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ -@@ -851,8 +852,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -848,8 +849,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ @@ -42,7 +42,7 @@ index 3331d5c..e18239f 100644 -o $@ $(srcdir)/Python/dynload_win.c Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h -@@ -1691,7 +1691,7 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1688,7 +1688,7 @@ libainstall: @DEF_MAKE_RULE@ python-config done @if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ @@ -69,7 +69,7 @@ index bd34310..60fb603 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index 7cf6519..bba2006 100644 +index 5b41066..69cb8fb 100644 --- a/configure.ac +++ b/configure.ac @@ -2825,7 +2825,7 @@ if test -z "$SHLIB_SUFFIX"; then @@ -81,7 +81,7 @@ index 7cf6519..bba2006 100644 esac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -5114,6 +5114,67 @@ esac +@@ -5115,6 +5115,68 @@ esac # check for endianness AC_C_BIGENDIAN @@ -102,11 +102,12 @@ index 7cf6519..bba2006 100644 + *-*-mingw*) + # check if we are linking to ucrt + AC_MSG_CHECKING(whether linking to ucrt) -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include -+ int main(){ -+ _UCRT; -+ } ++ #ifndef _UCRT ++ #error no ucrt ++ #endif ++ int main(){ return 0; } + ]])],[linking_to_ucrt=yes],[linking_to_ucrt=no]) + AC_MSG_RESULT($linking_to_ucrt) + ;; @@ -149,7 +150,7 @@ index 7cf6519..bba2006 100644 # ABI version string for Python extension modules. This appears between the # periods in shared library file names, e.g. foo..so. It is calculated # from the following attributes which affect the ABI of this Python build (in -@@ -5146,7 +5207,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -5147,7 +5209,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then fi AC_SUBST(EXT_SUFFIX) @@ -163,7 +164,7 @@ index 7cf6519..bba2006 100644 AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -@@ -5824,12 +5890,6 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5819,12 +5886,6 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac @@ -177,5 +178,5 @@ index 7cf6519..bba2006 100644 case $ac_sys_system in AIX*) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch similarity index 53% rename from mingw-w64-python/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch rename to mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch index 07dd2e3f79..d466f7d6dc 100644 --- a/mingw-w64-python/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch +++ b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch @@ -1,8 +1,7 @@ -From 0e71a45f5306c61085b972fb6799dad58cc51b83 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Mon, 28 Jun 2021 17:31:35 +0530 -Subject: [PATCH 099/N] Change the `get_platform()` method in sysconfig and - distutils +From ff2b019fd2d67ea53fd8431a3aa59b4508331f2c Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 21:36:58 +0200 +Subject: [PATCH 083/N] Change the `get_platform()` method in sysconfig This would possibly fix building wheels when mingw python is used and would be unique to each python same as EXT_SUFFIX. @@ -12,43 +11,15 @@ in it. Signed-off-by: Naveen M K --- - Lib/distutils/util.py | 16 ++++++++++++++-- - Lib/sysconfig.py | 16 ++++++++++++++-- - Python/getcompiler.c | 4 ++++ - 3 files changed, 32 insertions(+), 4 deletions(-) + Lib/sysconfig.py | 16 ++++++++++++++-- + Python/getcompiler.c | 4 ++++ + 2 files changed, 18 insertions(+), 2 deletions(-) -diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py -index 75a369d..5b51c76 100644 ---- a/Lib/distutils/util.py -+++ b/Lib/distutils/util.py -@@ -36,8 +36,20 @@ def get_host_platform(): - - """ - if os.name == 'nt': -- if 'GCC' in sys.version: -- return 'mingw' -+ if 'gcc' in sys.version.lower(): -+ if 'ucrt' in sys.version.lower(): -+ if 'amd64' in sys.version.lower(): -+ return 'mingw_x86_64_ucrt' -+ return 'mingw_i686_ucrt' -+ if 'clang' in sys.version.lower(): -+ if 'amd64' in sys.version.lower(): -+ return 'mingw_x86_64_clang' -+ if 'arm64' in sys.version.lower(): -+ return 'mingw_aarch64' -+ return 'mingw_i686_clang' -+ if 'amd64' in sys.version.lower(): -+ return 'mingw_x86_64' -+ return 'mingw_i686' - if 'amd64' in sys.version.lower(): - return 'win-amd64' - if '(arm)' in sys.version.lower(): diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index c0695e2..854b382 100644 +index 64f7719..7a34759 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -667,8 +667,20 @@ def get_platform(): +@@ -668,8 +668,20 @@ def get_platform(): """ if os.name == 'nt': @@ -89,5 +60,5 @@ index b529e29..2d935fe 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch similarity index 93% rename from mingw-w64-python/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch rename to mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch index b5fd650acb..a4ce9d2d02 100644 --- a/mingw-w64-python/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,8 +1,8 @@ -From 2f233ca6cfa1122c784219e130e50ce9d0276777 Mon Sep 17 00:00:00 2001 +From 68b961fb34930195f208a85d0123e3a6d700f515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 -Subject: [PATCH 012/N] MINGW compiler customize mingw cygwin compilers +Subject: [PATCH 084/N] distutils: compiler customize mingw cygwin compilers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -50,5 +50,5 @@ index 37feae5..bbe8e3c 100644 if not get_config_var('CUSTOMIZED_OSX_COMPILER'): import _osx_support -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0013-MINGW-compiler-enable-new-dtags.patch b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch similarity index 91% rename from mingw-w64-python/0013-MINGW-compiler-enable-new-dtags.patch rename to mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch index 5e46bbea97..a9427386e0 100644 --- a/mingw-w64-python/0013-MINGW-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch @@ -1,8 +1,8 @@ -From d96bd363de3b94dccbe4e685796c5fd482fac63d Mon Sep 17 00:00:00 2001 +From fc9e160c083b5aa586615624a0000dcc901990df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:22 +0530 -Subject: [PATCH 013/N] MINGW compiler enable new dtags +Subject: [PATCH 085/N] distutils: compiler enable new dtags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -33,5 +33,5 @@ index f0792de..60776bc 100644 return "-Wl,-R" + dir else: -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0024-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch similarity index 71% rename from mingw-w64-python/0024-MINGW-build-extensions-with-GCC.patch rename to mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch index 6dc1bd1010..ee576d1c54 100644 --- a/mingw-w64-python/0024-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,18 +1,12 @@ -From 386008948b544e74ebe06620dc41a6a555195170 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= - -Date: Thu, 17 Jun 2021 18:51:34 +0530 -Subject: [PATCH 024/N] MINGW build extensions with GCC -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From bc18b4c3c94375ddff17aaf5a1bb5bd1e401997f Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 20:52:22 +0200 +Subject: [PATCH 086/N] distutils: MINGW build extensions with GCC -Co-authored-by: Алексей --- Lib/distutils/command/build_ext.py | 16 +++++++++++++++- Lib/distutils/util.py | 2 ++ - Lib/sysconfig.py | 2 ++ - 3 files changed, 19 insertions(+), 1 deletion(-) + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 1a9bd12..1c9d471 100644 @@ -57,23 +51,10 @@ index 4b002ec..7b2e1e0 100644 """ if os.name == 'nt': + if 'GCC' in sys.version: -+ return 'mingw' - if 'amd64' in sys.version.lower(): - return 'win-amd64' - if '(arm)' in sys.version.lower(): -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 505d538..aa49d80 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -656,6 +656,8 @@ def get_platform(): - - """ - if os.name == 'nt': -+ if 'GCC' in sys.version: + return 'mingw' if 'amd64' in sys.version.lower(): return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch similarity index 95% rename from mingw-w64-python/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch rename to mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index ca5bc25822..fbd3d55ee1 100644 --- a/mingw-w64-python/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch +++ b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,8 +1,9 @@ -From 88fba0fa0fcc87ea40fbd329f5e21ab6ebbe6f29 Mon Sep 17 00:00:00 2001 +From 40bf9e42ca67d8ac0592bc6674a9e958eabd74c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:35 +0530 -Subject: [PATCH 025/N] MINGW use Mingw32CCompiler as default compiler for m +Subject: [PATCH 087/N] distutils: use Mingw32CCompiler as default compiler + for m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -68,5 +69,5 @@ index 66c12dd..1960ef8 100644 # Because these compilers aren't configured in Python's pyconfig.h file by # default, we should at least warn the user if he is using an unmodified -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0026-MINGW-find-import-library.patch b/mingw-w64-python/0088-distutils-find-import-library.patch similarity index 86% rename from mingw-w64-python/0026-MINGW-find-import-library.patch rename to mingw-w64-python/0088-distutils-find-import-library.patch index 7987c37ba7..6f470345ab 100644 --- a/mingw-w64-python/0026-MINGW-find-import-library.patch +++ b/mingw-w64-python/0088-distutils-find-import-library.patch @@ -1,8 +1,8 @@ -From 193124357e5d484853f54fdc1ecc1e131bfc3794 Mon Sep 17 00:00:00 2001 +From 41d8050684eb5925e8a4c979610a3aa340139e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:36 +0530 -Subject: [PATCH 026/N] MINGW find import library +Subject: [PATCH 088/N] distutils: find import library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -25,5 +25,5 @@ index 1960ef8..39ad631 100644 shared_lib_format = "%s%s" exe_extension = ".exe" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch similarity index 87% rename from mingw-w64-python/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch rename to mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch index fb2fc5ebe8..c4862dd516 100644 --- a/mingw-w64-python/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch +++ b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,8 +1,9 @@ -From 4ffbd9b3c17b527f172d805010b5e20679165833 Mon Sep 17 00:00:00 2001 +From a4abb467ae7cf72e1552727b7725e40fc7412448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 -Subject: [PATCH 031/N] MINGW avoid circular dependency from time module dur +Subject: [PATCH 089/N] distutils: avoid circular dependency from time module + dur MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -33,5 +34,5 @@ index 39ad631..5b281e2 100644 try: out_string = out.read() -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch similarity index 95% rename from mingw-w64-python/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch rename to mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch index 6993dfc415..9a66e7e348 100644 --- a/mingw-w64-python/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch +++ b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,8 +1,9 @@ -From 2b69618ed982a6f174a7bc666b08c90eee83c268 Mon Sep 17 00:00:00 2001 +From 24eed4bff46abb9913a9869684eef985161155a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 -Subject: [PATCH 032/N] MINGW generalization of posix build in distutils sys +Subject: [PATCH 090/N] distutils: generalization of posix build in distutils + sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -90,5 +91,5 @@ index bbe8e3c..80d3523 100644 if (not os.path.isabs(_config_vars['srcdir']) and base != os.getcwd()): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch new file mode 100644 index 0000000000..57703912c9 --- /dev/null +++ b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch @@ -0,0 +1,28 @@ +From a0d9baa8dc4b4afb5e7ba33980ec6d9f3d67551c Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 20:53:29 +0200 +Subject: [PATCH 091/N] distutils: mingw sysconfig like posix + +--- + Lib/distutils/command/build_ext.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +index 1c9d471..1dbdfe0 100644 +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -221,9 +221,10 @@ class build_ext(Command): + if sys.platform[:6] == 'cygwin': + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): + # building third party extensions ++ config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) + self.library_dirs.append(os.path.join(sys.prefix, "lib", + "python" + get_python_version(), +- "config")) ++ config_dir_name)) + else: + # building python standard extensions + self.library_dirs.append('.') +-- +2.33.0 + diff --git a/mingw-w64-python/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch b/mingw-w64-python/0092-distutils-get_versions-fixes.patch similarity index 53% rename from mingw-w64-python/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch rename to mingw-w64-python/0092-distutils-get_versions-fixes.patch index 5f109c9cdc..8a0f671ae8 100644 --- a/mingw-w64-python/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch +++ b/mingw-w64-python/0092-distutils-get_versions-fixes.patch @@ -1,8 +1,7 @@ -From c4507430c95893ad2be0a1796f8dc7a7962ef789 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= - -Date: Thu, 17 Jun 2021 18:51:51 +0530 -Subject: [PATCH 044/N] mingw _winapi_as_builtin_for_Popen_in_cygwinccompiler +From 985a20ad50a309a528397ec6f43cf15f848c2797 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 21:14:31 +0200 +Subject: [PATCH 092/N] distutils: get_versions() fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -11,12 +10,10 @@ Co-authored-by: Алексей Co-authored-by: Christoph Reiter --- Lib/distutils/cygwinccompiler.py | 14 ++++++++++++-- - Modules/Setup.config.in | 1 + - setup.py | 4 +++- - 3 files changed, 16 insertions(+), 3 deletions(-) + 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 5b281e2..f90af3b 100644 +index 5b281e2..fba3485 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -56,6 +56,7 @@ from distutils.errors import (DistutilsExecError, CCompilerError, @@ -32,7 +29,7 @@ index 5b281e2..f90af3b 100644 "couldn't read '%s': %s" % (fn, exc.strerror)) -RE_VERSION = re.compile(br'(\d+\.\d+(\.\d+)*)') -+RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*$') ++RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*') def _find_exe_version(cmd): """Find the version of an executable by running `cmd` in the shell. @@ -54,31 +51,6 @@ index 5b281e2..f90af3b 100644 return tuple([_find_exe_version(cmd) for cmd in commands]) def is_cygwingcc(): -diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in -index 825ce5d..b4e7ff7 100644 ---- a/Modules/Setup.config.in -+++ b/Modules/Setup.config.in -@@ -12,4 +12,5 @@ - # build-in modules for windows platform: - @USE_WIN32_MODULE@winreg ../PC/winreg.c - @USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c -+@USE_WIN32_MODULE@_winapi _winapi.c - -diff --git a/setup.py b/setup.py -index 72f1281..36af6e9 100644 ---- a/setup.py -+++ b/setup.py -@@ -1607,7 +1607,9 @@ class PyBuildExt(build_ext): - self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p) - for p in ['msvcrtmodule.c']])) - -- self.add(Extension('_winapi', ['_winapi.c'])) -+ # Added to Setup.config.in as now needed earlier since I -+ # use subprocess (which uses Popen) in cygwinccompiler.py -+ # self.add(Extension('_winapi', ['_winapi.c'])) - - self.add(Extension('_msi', [os.path.join(pc_srcdir, p) - for p in ['_msi.c']], -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0054-mingw-install-layout-as-posix.patch b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch similarity index 90% rename from mingw-w64-python/0054-mingw-install-layout-as-posix.patch rename to mingw-w64-python/0093-distutils-install-layout-as-posix.patch index 4e160b71bb..bc9f61071f 100644 --- a/mingw-w64-python/0054-mingw-install-layout-as-posix.patch +++ b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch @@ -1,8 +1,8 @@ -From d2e564612e1c443c7e8b523e8d7e9ac34e522fc4 Mon Sep 17 00:00:00 2001 +From 71cd2a0390d9e9fad42fed5c0e06d758de39edcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 -Subject: [PATCH 054/N] mingw install layout as posix +Subject: [PATCH 093/N] distutils: install layout as posix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py -index eea417e..f8c42c7 100644 +index aaa300e..c611252 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -20,10 +20,10 @@ from site import USER_SITE @@ -43,5 +43,5 @@ index eea417e..f8c42c7 100644 } -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0047-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch similarity index 63% rename from mingw-w64-python/0047-msys-convert_path-fix-and-root-hack.patch rename to mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch index 75425a9ed9..53b7f4e45a 100644 --- a/mingw-w64-python/0047-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,23 +1,15 @@ -From c96759da7b85fe3100ea018eabcce4fb11008212 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= - -Date: Thu, 17 Jun 2021 18:51:54 +0530 -Subject: [PATCH 047/N] msys convert_path fix and root hack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 1ed69d8e50d34a111c7b42951863e13d9cef1930 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 21:18:50 +0200 +Subject: [PATCH 094/N] distutils: msys convert_path fix and root hack -Co-authored-by: Алексей -Co-authored-by: Christoph Reiter -Co-authored-by: Audrey Dutcher --- Lib/distutils/command/install.py | 3 ++- Lib/distutils/util.py | 26 ++++++++++++++++++++++++-- - Makefile.pre.in | 12 +++++++++--- - 3 files changed, 35 insertions(+), 6 deletions(-) + 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py -index aaa300e..eea417e 100644 +index c611252..f8c42c7 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -342,7 +342,8 @@ class install(Command): @@ -82,36 +74,6 @@ index 7b2e1e0..75a369d 100644 else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5271dd8..72be72d 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1707,6 +1707,12 @@ libainstall: @DEF_MAKE_RULE@ python-config - else true; \ - fi - -+ifeq ($(shell uname -o),Msys) -+DESTDIRFINAL=$(DESTDIR) -+else -+DESTDIRFINAL=$(DESTDIR)/ -+endif -+ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -@@ -1714,9 +1720,9 @@ sharedinstall: sharedmods - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -- --root=$(DESTDIR)/ -- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py -- -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ -+ --root=$(DESTDIRFINAL) -+ -rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py -+ -rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__ - - # Here are a couple of targets for MacOSX again, to install a full - # framework-based Python. frameworkinstall installs everything, the -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0061-mingw-build-optimized-ext.patch b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch similarity index 88% rename from mingw-w64-python/0061-mingw-build-optimized-ext.patch rename to mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch index 118ab56d11..21d2284f0c 100644 --- a/mingw-w64-python/0061-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch @@ -1,8 +1,8 @@ -From af81cead554790e55ac7297c78c7cf0751741b40 Mon Sep 17 00:00:00 2001 +From 1da2752289e00fe51e2c8a0b25138ac83f1f0983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:04 +0530 -Subject: [PATCH 061/N] mingw build optimized ext +Subject: [PATCH 095/N] distutils: mingw build optimized ext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index f90af3b..0bda7a3 100644 +index fba3485..bb97880 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -303,9 +303,9 @@ class Mingw32CCompiler(CygwinCCompiler): @@ -30,5 +30,5 @@ index f90af3b..0bda7a3 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0096-Add-CI-to-Build-and-Test.patch b/mingw-w64-python/0096-Add-CI-to-Build-and-Test.patch deleted file mode 100644 index bd3dd00f2b..0000000000 --- a/mingw-w64-python/0096-Add-CI-to-Build-and-Test.patch +++ /dev/null @@ -1,388 +0,0 @@ -From 3a33db28df3b60d7127396f76366e2081eccd386 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Fri, 18 Jun 2021 17:51:59 +0530 -Subject: [PATCH 096/N] Add CI to Build and Test - ---- - .github/workflows/mingw.yml | 229 ++++++++++++++++++++++++++++++++ - .github/workflows/smoketests.py | 132 ++++++++++++++++++ - 2 files changed, 361 insertions(+) - create mode 100644 .github/workflows/mingw.yml - create mode 100644 .github/workflows/smoketests.py - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -new file mode 100644 -index 0000000..fff5fa5 ---- /dev/null -+++ b/.github/workflows/mingw.yml -@@ -0,0 +1,229 @@ -+name: Build -+on: [push, pull_request, workflow_dispatch] -+ -+jobs: -+ build: -+ runs-on: windows-latest -+ strategy: -+ fail-fast: false -+ matrix: -+ msystem: ['MINGW64','MINGW32','UCRT64','CLANG64'] -+ include: -+ - msystem: MINGW64 -+ prefix: mingw-w64-x86_64 -+ - msystem: MINGW32 -+ prefix: mingw-w64-i686 -+ - msystem: UCRT64 -+ prefix: mingw-w64-ucrt-x86_64 -+ - msystem: CLANG64 -+ prefix: mingw-w64-clang-x86_64 -+ #- msystem: CLANG32 -+ # prefix: mingw-w64-clang-i686 -+ steps: -+ - name: Setup git -+ run: | -+ git config --global core.autocrlf false -+ git config --global core.eol lf -+ - uses: actions/checkout@v2 -+ - uses: msys2/setup-msys2@v2 -+ with: -+ msystem: ${{ matrix.msystem }} -+ release: false -+ install: >- -+ make -+ binutils -+ autoconf-archive -+ ${{ matrix.prefix }}-toolchain -+ ${{ matrix.prefix }}-expat -+ ${{ matrix.prefix }}-bzip2 -+ ${{ matrix.prefix }}-libffi -+ ${{ matrix.prefix }}-mpdecimal -+ ${{ matrix.prefix }}-ncurses -+ ${{ matrix.prefix }}-openssl -+ ${{ matrix.prefix }}-sqlite3 -+ ${{ matrix.prefix }}-tcl -+ ${{ matrix.prefix }}-tk -+ ${{ matrix.prefix }}-zlib -+ ${{ matrix.prefix }}-xz -+ -+ - name: Build Python -+ shell: msys2 {0} -+ run: | -+ set -ex -+ pkgver='3.9.5' -+ _pybasever='3.9' -+ -+ PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) -+ if [ ${{ matrix.msystem }} == "CLANG64" ] -+ then -+ export CC=clang -+ export CXX=clang++ -+ fi -+ autoreconf -vfi -+ CFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601" -+ CXXFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601" -+ CPPFLAGS+=" -I${PREFIX_WIN}/include/ncurses " -+ CFLAGS+=" -DNDEBUG " -+ CXXFLAGS+=" -DNDEBUG " -+ _extra_config+=("--enable-optimizations") -+ # Fix MS_DLL_ID undeclared in PC/dl_nt.c -+ f3f=0 -+ re='^[0-9]+$' -+ part3=${pkgver##*.} -+ if ! [[ $part3 =~ $re ]]; then -+ c= -+ while test -n "$part3"; do -+ b=${part3:0:1} -+ if ! [[ $b =~ $re ]]; then -+ break -+ fi -+ c+=${b} -+ part3=${part3:1} -+ done -+ f3f=$((f3f + 1000 * $((${c})))) -+ part3Len=${#part3} -+ if [ "$part3Len" -ge "1" ]; then -+ f3f=$((f3f + 10 * $((0x${part3:0:1})))) -+ if [ "$part3Len" -ge "2" ]; then -+ f3f=$((f3f + ${part3:1:1})) -+ fi -+ fi -+ else -+ f3f=$((f3f + 1000 * ${part3})) -+ fi -+ CFLAGS+=" -DMS_DLL_ID=\\\"${_pybasever}\\\"" -+ CFLAGS+=" -DFIELD3=${f3f}" -+ CFLAGS+=" -DORIGINAL_FILENAME=\\\"libpython${_pybasever}.dll\\\"" -+ rc_flags=" -DMS_DLL_ID=\\\\\\\"${_pybasever}\\\\\\\" -DFIELD3=${f3f} -DORIGINAL_FILENAME=\\\\\\\"libpython${_pybasever}.dll\\\\\\\"" -+ -+ # Workaround for conftest error on 64-bit builds -+ export ac_cv_working_tzset=no -+ -+ # Workaround for when dlfcn exists on Windows, which causes -+ # some conftests to succeed when they shouldn't (we don't use dlfcn). -+ export ac_cv_header_dlfcn_h=no -+ export ac_cv_lib_dl_dlopen=no -+ export ac_cv_have_decl_RTLD_GLOBAL=no -+ export ac_cv_have_decl_RTLD_LAZY=no -+ export ac_cv_have_decl_RTLD_LOCAL=no -+ export ac_cv_have_decl_RTLD_NOW=no -+ export ac_cv_have_decl_RTLD_DEEPBIND=no -+ export ac_cv_have_decl_RTLD_MEMBER=no -+ export ac_cv_have_decl_RTLD_NODELETE=no -+ export ac_cv_have_decl_RTLD_NOLOAD=no -+ -+ export CFLAGS -+ export CXXFLAGS -+ export CPPFLAGS -+ -+ -+ MSYSTEM=MINGW ./configure \ -+ --prefix=${MINGW_PREFIX} \ -+ --host=${MINGW_CHOST} \ -+ --build=${MINGW_CHOST} \ -+ --enable-shared \ -+ --with-nt-threads \ -+ --with-system-expat \ -+ --with-system-ffi \ -+ --with-system-libmpdec \ -+ --without-ensurepip \ -+ --without-c-locale-coercion \ -+ --enable-loadable-sqlite-extensions \ -+ "${_extra_config[@]}" \ -+ RCFLAGS="$rc_flags" \ -+ OPT="" -+ # We patch importlib which is embedded in C headers, so regenerate them -+ make regen-importlib -+ -+ make -j8 -+ -+ # Add missing venvlauncher files (issue #7014) -+ # FIXME: build these from PC/launcher.c instead -+ cp python.exe venvlauncher.exe -+ cp pythonw.exe venvwlauncher.exe -+ -+ - name: Install -+ shell: msys2 {0} -+ run: | -+ set -ex -+ -+ pkgver='3.9.5' -+ _pybasever='3.9' -+ srcdir=. -+ -+ # now install things -+ -+ pkgdir=python_pkgdir -+ -+ PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) -+ MSYSTEM=MINGW \ -+ MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ -+ make -j1 install DESTDIR="${pkgdir}" -+ VERABI=${_pybasever} -+ -+ # gdb pretty printers for debugging Python itself; to use: -+ # python -+ # sys.path.append('C:/msys64/mingw64/share/gdb/python3') -+ # import python_gdb -+ # reload(python_gdb) -+ # end -+ -+ cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${VERABI}.dll.a -+ -+ # Need for building boost python module -+ cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a -+ -+ for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do -+ sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts} -+ done -+ -+ -+ cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe -+ cp "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe "${pkgdir}${MINGW_PREFIX}"/bin/pythonw.exe -+ cp "${pkgdir}${MINGW_PREFIX}"/bin/python3-config "${pkgdir}${MINGW_PREFIX}"/bin/python-config -+ cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle -+ cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc -+ -+ sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${VERABI}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/python-config.py -+ -+ # fix permissons -+ find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755 -+ -+ # replace paths in sysconfig -+ sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \ -+ "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/lib-dynload/_sysconfigdata*.py \ -+ "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/smtpd.py -+ -+ # install venv launchers -+ mkdir -p "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt -+ cp venvlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/python.exe -+ cp venvwlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/pythonw.exe -+ -+ - name: Run Smoke Test -+ shell: msys2 {0} -+ run: | -+ SMOKETESTS="$(pwd)/.github/workflows/smoketests.py" -+ cd python_pkgdir/${MINGW_PREFIX}/bin -+ ./python.exe "$SMOKETESTS" -+ MSYSTEM= ./python.exe "$SMOKETESTS" -+ -+ - name: Run tests -+ continue-on-error: true -+ shell: msys2 {0} -+ run: | -+ cd python_pkgdir/${MINGW_PREFIX}/bin -+ ./python.exe -m test -j4 -+ -+ - name: Compress -+ if: always() -+ shell: msys2 {0} -+ run: | -+ tar -I 'zstd --ultra -20' -cf python.tar.zst python_pkgdir/ -+ -+ - name: Upload -+ uses: actions/upload-artifact@v2 -+ if: always() -+ with: -+ name: build-${{ matrix.msystem }} -+ path: python.tar.zst -+ -diff --git a/.github/workflows/smoketests.py b/.github/workflows/smoketests.py -new file mode 100644 -index 0000000..9277c14 ---- /dev/null -+++ b/.github/workflows/smoketests.py -@@ -0,0 +1,132 @@ -+#!/usr/bin/env python3 -+# Copyright 2017 Christoph Reiter -+# -+# Permission is hereby granted, free of charge, to any person obtaining -+# a copy of this software and associated documentation files (the -+# "Software"), to deal in the Software without restriction, including -+# without limitation the rights to use, copy, modify, merge, publish, -+# distribute, sublicense, and/or sell copies of the Software, and to -+# permit persons to whom the Software is furnished to do so, subject to -+# the following conditions: -+# -+# The above copyright notice and this permission notice shall be included -+# in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+"""The goal of this test suite is collect tests for update regressions -+and to test msys2 related modifications like for path handling. -+Feel free to extend. -+""" -+ -+import os -+import unittest -+ -+if "MSYSTEM" in os.environ: -+ SEP = "/" -+else: -+ SEP = "\\" -+ -+ -+class Tests(unittest.TestCase): -+ -+ def test_sep(self): -+ self.assertEqual(os.sep, SEP) -+ -+ def test_module_file_path(self): -+ import asyncio -+ import zlib -+ self.assertEqual(zlib.__file__, os.path.normpath(zlib.__file__)) -+ self.assertEqual(asyncio.__file__, os.path.normpath(asyncio.__file__)) -+ -+ def test_importlib_frozen_path_sep(self): -+ import importlib._bootstrap_external -+ self.assertEqual(importlib._bootstrap_external.path_sep, SEP) -+ -+ def test_os_commonpath(self): -+ self.assertEqual( -+ os.path.commonpath( -+ [os.path.join("C:", os.sep, "foo", "bar"), -+ os.path.join("C:", os.sep, "foo")]), -+ os.path.join("C:", os.sep, "foo")) -+ -+ def test_pathlib(self): -+ import pathlib -+ -+ p = pathlib.Path("foo") / pathlib.Path("foo") -+ self.assertEqual(str(p), os.path.normpath(p)) -+ -+ def test_modules_import(self): -+ import sqlite3 -+ import ssl -+ import ctypes -+ -+ def test_socket_inet_ntop(self): -+ import socket -+ self.assertTrue(hasattr(socket, "inet_ntop")) -+ -+ def test_socket_inet_pton(self): -+ import socket -+ self.assertTrue(hasattr(socket, "inet_pton")) -+ -+ def test_multiprocessing_queue(self): -+ from multiprocessing import Queue -+ Queue(0) -+ -+ #def test_socket_timout_normal_error(self): -+ # import urllib.request -+ # from urllib.error import URLError -+ -+ # try: -+ # urllib.request.urlopen( -+ # 'http://localhost', timeout=0.0001).close() -+ # except URLError: -+ # pass -+ -+ def test_threads(self): -+ from concurrent.futures import ThreadPoolExecutor -+ -+ with ThreadPoolExecutor(1) as pool: -+ for res in pool.map(lambda *x: None, range(10000)): -+ pass -+ -+ def test_sysconfig(self): -+ import sysconfig -+ # This should be able to execute without exceptions -+ sysconfig.get_config_vars() -+ -+ def test_sqlite_enable_load_extension(self): -+ # Make sure --enable-loadable-sqlite-extensions is used -+ import sqlite3 -+ self.assertTrue(sqlite3.Connection.enable_load_extension) -+ -+ def test_venv_creation(self): -+ import tempfile -+ import venv -+ import subprocess -+ import shutil -+ with tempfile.TemporaryDirectory() as tmp: -+ builder = venv.EnvBuilder() -+ builder.create(tmp) -+ assert os.path.exists(os.path.join(tmp, "bin", "activate")) -+ assert os.path.exists(os.path.join(tmp, "bin", "python.exe")) -+ assert os.path.exists(os.path.join(tmp, "bin", "python3.exe")) -+ subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")]) -+ -+ def test_has_mktime(self): -+ from time import mktime, gmtime -+ mktime(gmtime()) -+ -+ -+def suite(): -+ return unittest.TestLoader().loadTestsFromName(__name__) -+ -+ -+if __name__ == '__main__': -+ unittest.main(defaultTest='suite') --- -2.32.0 - diff --git a/mingw-w64-python/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch similarity index 83% rename from mingw-w64-python/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch rename to mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index 14ca139a1b..44e13720ea 100644 --- a/mingw-w64-python/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch +++ b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,7 +1,8 @@ -From 01a2e7616c9e8d8cb554a125ef768eb010275dee Mon Sep 17 00:00:00 2001 +From 6d880609657632bc2f9d93964d7f9edbb2a6e430 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 -Subject: [PATCH 062/N] cygwinccompiler dont strip modules if pydebug +Subject: [PATCH 096/N] distutils: cygwinccompiler dont strip modules if + pydebug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 0bda7a3..09b6eda 100644 +index bb97880..c134525 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -236,7 +236,7 @@ class CygwinCCompiler(UnixCCompiler): @@ -25,5 +26,5 @@ index 0bda7a3..09b6eda 100644 UnixCCompiler.link(self, target_desc, objects, output_filename, -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch new file mode 100644 index 0000000000..7b6ecc4267 --- /dev/null +++ b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch @@ -0,0 +1,161 @@ +From b1f1cbeefcc5ed956ee484cd96008d5d37eb7db2 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Tue, 17 Aug 2021 20:26:05 +0700 +Subject: [PATCH 097/N] distutils: get compilers from env vars + +Upstreamed at https://github.com/pypa/distutils/pull/26 + +This would allow us to bypass all gcc workarounds when we're using clang +--- + Lib/distutils/cygwinccompiler.py | 91 ++++++++++++++++++-------------- + 1 file changed, 51 insertions(+), 40 deletions(-) + +diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +index c134525..75bc17b 100644 +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -44,6 +44,8 @@ cygwin in no-cygwin mode). + # (ld supports -shared) + # * mingw gcc 3.2/ld 2.13 works + # (ld supports -shared) ++# * llvm-mingw with Clang 11 works ++# (lld supports -shared) + + import os + import sys +@@ -110,41 +112,46 @@ class CygwinCCompiler(UnixCCompiler): + "Compiling may fail because of undefined preprocessor macros." + % details) + +- self.gcc_version, self.ld_version, self.dllwrap_version = \ +- get_versions() +- self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" % +- (self.gcc_version, +- self.ld_version, +- self.dllwrap_version) ) +- +- # ld_version >= "2.10.90" and < "2.13" should also be able to use +- # gcc -mdll instead of dllwrap +- # Older dllwraps had own version numbers, newer ones use the +- # same as the rest of binutils ( also ld ) +- # dllwrap 2.10.90 is buggy +- if self.ld_version >= "2.10.90": +- self.linker_dll = "gcc" +- else: +- self.linker_dll = "dllwrap" ++ self.cc = os.environ.get('CC', 'gcc') ++ self.cxx = os.environ.get('CXX', 'g++') ++ ++ if ('gcc' in self.cc): # Start gcc workaround ++ self.gcc_version, self.ld_version, self.dllwrap_version = \ ++ get_versions() ++ self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" % ++ (self.gcc_version, ++ self.ld_version, ++ self.dllwrap_version) ) ++ ++ # ld_version >= "2.10.90" and < "2.13" should also be able to use ++ # gcc -mdll instead of dllwrap ++ # Older dllwraps had own version numbers, newer ones use the ++ # same as the rest of binutils ( also ld ) ++ # dllwrap 2.10.90 is buggy ++ if self.ld_version >= "2.10.90": ++ self.linker_dll = self.cc ++ else: ++ self.linker_dll = "dllwrap" + +- # ld_version >= "2.13" support -shared so use it instead of +- # -mdll -static +- if self.ld_version >= "2.13": ++ # ld_version >= "2.13" support -shared so use it instead of ++ # -mdll -static ++ if self.ld_version >= "2.13": ++ shared_option = "-shared" ++ else: ++ shared_option = "-mdll -static" ++ else: # Assume linker is up to date ++ self.linker_dll = self.cc + shared_option = "-shared" +- else: +- shared_option = "-mdll -static" + +- # Hard-code GCC because that's what this is all about. +- # XXX optimization, warnings etc. should be customizable. +- self.set_executables(compiler='gcc -mcygwin -O -Wall', +- compiler_so='gcc -mcygwin -mdll -O -Wall', +- compiler_cxx='g++ -mcygwin -O -Wall', +- linker_exe='gcc -mcygwin', ++ self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc, ++ compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, ++ compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, ++ linker_exe='%s -mcygwin' % self.cc, + linker_so=('%s -mcygwin %s' % + (self.linker_dll, shared_option))) + + # cygwin and mingw32 need different sets of libraries +- if self.gcc_version == "2.91.57": ++ if ('gcc' in self.cc and self.gcc_version == "2.91.57"): + # cygwin shouldn't need msvcrt, but without the dlls will crash + # (gcc version 2.91.57) -- perhaps something about initialization + self.dll_libraries=["msvcrt"] +@@ -287,26 +294,26 @@ class Mingw32CCompiler(CygwinCCompiler): + + # ld_version >= "2.13" support -shared so use it instead of + # -mdll -static +- if self.ld_version >= "2.13": +- shared_option = "-shared" +- else: ++ if ('gcc' in self.cc and self.ld_version < "2.13"): + shared_option = "-mdll -static" ++ else: ++ shared_option = "-shared" + + # A real mingw32 doesn't need to specify a different entry point, + # but cygwin 2.91.57 in no-cygwin-mode needs it. +- if self.gcc_version <= "2.91.57": ++ if ('gcc' in self.cc and self.gcc_version <= "2.91.57"): + entry_point = '--entry _DllMain@12' + else: + entry_point = '' + +- if is_cygwingcc(): ++ if is_cygwincc(self.cc): + raise CCompilerError( + 'Cygwin gcc cannot be used with --compiler=mingw32') + +- self.set_executables(compiler='gcc -O2 -Wall', +- compiler_so='gcc -mdll -O2 -Wall', +- compiler_cxx='g++ -O2 -Wall', +- linker_exe='gcc', ++ self.set_executables(compiler='%s -O2 -Wall' % self.cc, ++ compiler_so='%s -mdll -O2 -Wall' % self.cc, ++ compiler_cxx='%s -O2 -Wall' % self.cxx, ++ linker_exe='%s' % self.cc, + linker_so='%s %s %s' + % (self.linker_dll, shared_option, + entry_point)) +@@ -357,6 +364,10 @@ def check_config_h(): + if "GCC" in sys.version: + return CONFIG_H_OK, "sys.version mentions 'GCC'" + ++ # Clang would also work ++ if "Clang" in sys.version: ++ return CONFIG_H_OK, "sys.version mentions 'Clang'" ++ + # let's see if __GNUC__ is mentioned in python.h + fn = sysconfig.get_config_h_filename() + try: +@@ -413,7 +424,7 @@ def get_versions(): + commands = [gcc+' -dumpversion', ld+' -v', dllwrap+' --version'] + return tuple([_find_exe_version(cmd) for cmd in commands]) + +-def is_cygwingcc(): +- '''Try to determine if the gcc that would be used is from cygwin.''' +- out_string = check_output(['gcc', '-dumpmachine']) ++def is_cygwincc(cc): ++ '''Try to determine if the compiler that would be used is from cygwin.''' ++ out_string = check_output([cc, '-dumpmachine']) + return out_string.strip().endswith(b'cygwin') +-- +2.33.0 + diff --git a/mingw-w64-python/0086-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch similarity index 90% rename from mingw-w64-python/0086-distutils-add-windmc-to-cygwinccompiler.patch rename to mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch index 07a7a0bee9..fafce741ac 100644 --- a/mingw-w64-python/0086-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,18 +1,18 @@ -From 4f1841b7211dd4d9557a868525b5005e4d67e55e Mon Sep 17 00:00:00 2001 +From 0c751ecfc03048c60a59b090cf93f64d09255c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:28 +0530 -Subject: [PATCH 086/N] distutils add windmc to cygwinccompiler +Subject: [PATCH 098/N] distutils: add windmc to cygwinccompiler --- Lib/distutils/cygwinccompiler.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 09b6eda..fcba43a 100644 +index 75bc17b..6a40e80 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py -@@ -163,6 +163,28 @@ class CygwinCCompiler(UnixCCompiler): +@@ -170,6 +170,28 @@ class CygwinCCompiler(UnixCCompiler): self.spawn(["windres", "-i", src, "-o", obj]) except DistutilsExecError as msg: raise CompileError(msg) @@ -41,7 +41,7 @@ index 09b6eda..fcba43a 100644 else: # for other files use the C-compiler try: self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -@@ -257,9 +279,9 @@ class CygwinCCompiler(UnixCCompiler): +@@ -264,9 +286,9 @@ class CygwinCCompiler(UnixCCompiler): base, ext = os.path.splitext(src_name) # use 'normcase' only for resource suffixes ext_normcase = os.path.normcase(ext) @@ -54,5 +54,5 @@ index 09b6eda..fcba43a 100644 (ext, src_name)) base = os.path.splitdrive(base)[1] # Chop off the drive -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0082-fix-msvc9-import.patch b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch similarity index 90% rename from mingw-w64-python/0082-fix-msvc9-import.patch rename to mingw-w64-python/0099-distutils-fix-msvc9-import.patch index 0d73ce2b41..f2e24600a6 100644 --- a/mingw-w64-python/0082-fix-msvc9-import.patch +++ b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch @@ -1,7 +1,7 @@ -From 5db67822f24f57c96ef4424c7738aca59e0dd7aa Mon Sep 17 00:00:00 2001 +From d947ead836ca0eead2e28103a790011387720a2f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 -Subject: [PATCH 082/N] fix msvc9 import +Subject: [PATCH 099/N] distutils: fix msvc9 import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -34,5 +34,5 @@ index 6934e96..dddb2fd 100644 self.__root = r"Software\Microsoft\VisualStudio" # self.__macros = MACROS -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0100-Add-a-test-to-build-C-Ext.patch b/mingw-w64-python/0100-Add-a-test-to-build-C-Ext.patch deleted file mode 100644 index 067b446289..0000000000 --- a/mingw-w64-python/0100-Add-a-test-to-build-C-Ext.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 30080e89858fc1ae343eea6ba2d2bf152257a458 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Tue, 29 Jun 2021 18:24:37 +0530 -Subject: [PATCH 100/N] Add a test to build C-Ext - ---- - .github/workflows/smoketests.py | 85 +++++++++++++++++++++++++++++++++ - 1 file changed, 85 insertions(+) - -diff --git a/.github/workflows/smoketests.py b/.github/workflows/smoketests.py -index 9277c14..1761724 100644 ---- a/.github/workflows/smoketests.py -+++ b/.github/workflows/smoketests.py -@@ -123,6 +123,91 @@ class Tests(unittest.TestCase): - from time import mktime, gmtime - mktime(gmtime()) - -+ def test_c_ext_build(self): -+ import tempfile -+ import sys -+ import subprocess -+ import textwrap -+ from pathlib import Path -+ -+ with tempfile.TemporaryDirectory() as tmppro: -+ subprocess.check_call([sys.executable, "-m", "ensurepip", "--user"]) -+ with Path(tmppro, "setup.py").open("w") as f: -+ f.write( -+ textwrap.dedent( -+ """\ -+ from setuptools import setup, Extension -+ -+ setup( -+ name='cwrapper', -+ version='1.0', -+ ext_modules=[ -+ Extension( -+ 'cwrapper', -+ sources=['cwrapper.c']), -+ ], -+ ) -+ """ -+ ) -+ ) -+ with Path(tmppro, "cwrapper.c").open("w") as f: -+ f.write( -+ textwrap.dedent( -+ """\ -+ #include -+ static PyObject * -+ helloworld(PyObject *self, PyObject *args) -+ { -+ printf("Hello World\\n"); -+ return Py_None; -+ } -+ static PyMethodDef -+ myMethods[] = { -+ { "helloworld", helloworld, METH_NOARGS, "Prints Hello World" }, -+ { NULL, NULL, 0, NULL } -+ }; -+ static struct PyModuleDef cwrapper = { -+ PyModuleDef_HEAD_INIT, -+ "cwrapper", -+ "Test Module", -+ -1, -+ myMethods -+ }; -+ -+ PyMODINIT_FUNC -+ PyInit_cwrapper(void) -+ { -+ return PyModule_Create(&cwrapper); -+ } -+ """ -+ ) -+ ) -+ subprocess.check_call( -+ [sys.executable, "-c", "import struct"], -+ ) -+ subprocess.check_call( -+ [ -+ sys.executable, -+ "-m", -+ "pip", -+ "install", -+ "wheel", -+ ], -+ ) -+ subprocess.check_call( -+ [ -+ sys.executable, -+ "-m", -+ "pip", -+ "install", -+ tmppro, -+ ], -+ ) -+ subprocess.check_call( -+ [sys.executable, "-c", "import cwrapper"], -+ ) -+ -+ - - def suite(): - return unittest.TestLoader().loadTestsFromName(__name__) --- -2.32.0 - diff --git a/mingw-w64-python/0064-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch similarity index 87% rename from mingw-w64-python/0064-mingw-add-LIBPL-to-library-dirs.patch rename to mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch index 70c10f774f..66c39dfbc8 100644 --- a/mingw-w64-python/0064-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,8 +1,8 @@ -From 01ffe9fb03e551372f0b54912d938f3256e4c5cd Mon Sep 17 00:00:00 2001 +From 609d9e23ff0403233ae2e8a81eaa55eda54d175f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 -Subject: [PATCH 064/N] mingw add LIBPL to library dirs +Subject: [PATCH 100/N] distutils: mingw add LIBPL to library dirs --- Lib/distutils/command/build_ext.py | 2 +- @@ -22,5 +22,5 @@ index 1dbdfe0..1598735 100644 # building third party extensions config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0101-Add-some-platform-related-tests.patch b/mingw-w64-python/0101-Add-some-platform-related-tests.patch deleted file mode 100644 index 50622c9267..0000000000 --- a/mingw-w64-python/0101-Add-some-platform-related-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 23659e23d12299a564b12e527ab144d425a2d572 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Thu, 1 Jul 2021 09:16:20 +0200 -Subject: [PATCH 101/N] Add some platform related tests - -So we notice when things change/break ---- - .github/workflows/smoketests.py | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/.github/workflows/smoketests.py b/.github/workflows/smoketests.py -index 1761724..d8f76e6 100644 ---- a/.github/workflows/smoketests.py -+++ b/.github/workflows/smoketests.py -@@ -123,6 +123,27 @@ class Tests(unittest.TestCase): - from time import mktime, gmtime - mktime(gmtime()) - -+ def test_platform_things(self): -+ import sys -+ import sysconfig -+ import platform -+ import importlib.machinery -+ self.assertEqual(sys.implementation.name, "cpython") -+ self.assertEqual(sys.platform, "win32") -+ self.assertTrue(sysconfig.get_platform().startswith("mingw")) -+ self.assertTrue(sysconfig.get_config_var('SOABI').startswith("cpython-")) -+ ext_suffix = sysconfig.get_config_var('EXT_SUFFIX') -+ self.assertTrue(ext_suffix.endswith(".pyd")) -+ self.assertTrue("mingw" in ext_suffix) -+ self.assertEqual(sysconfig.get_config_var('SHLIB_SUFFIX'), ".pyd") -+ ext_suffixes = importlib.machinery.EXTENSION_SUFFIXES -+ self.assertTrue(ext_suffix in ext_suffixes) -+ self.assertTrue(".pyd" in ext_suffixes) -+ self.assertEqual(sys.winver, ".".join(map(str, sys.version_info[:2]))) -+ self.assertEqual(platform.python_implementation(), "CPython") -+ self.assertEqual(platform.system(), "Windows") -+ self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0) -+ - def test_c_ext_build(self): - import tempfile - import sys --- -2.32.0 - diff --git a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch new file mode 100644 index 0000000000..afe88bb7f7 --- /dev/null +++ b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch @@ -0,0 +1,44 @@ +From 5a61407b52dc9d8f2949af82bff034cac2d99c2d Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Tue, 21 Sep 2021 21:37:23 +0200 +Subject: [PATCH 101/N] distutils: Change the `get_platform()` method in + distutils to match sysconfig + +This would possibly fix building wheels when mingw python +is used and would be unique to each python same as EXT_SUFFIX. + +Signed-off-by: Naveen M K +--- + Lib/distutils/util.py | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py +index 75a369d..5b51c76 100644 +--- a/Lib/distutils/util.py ++++ b/Lib/distutils/util.py +@@ -36,8 +36,20 @@ def get_host_platform(): + + """ + if os.name == 'nt': +- if 'GCC' in sys.version: +- return 'mingw' ++ if 'gcc' in sys.version.lower(): ++ if 'ucrt' in sys.version.lower(): ++ if 'amd64' in sys.version.lower(): ++ return 'mingw_x86_64_ucrt' ++ return 'mingw_i686_ucrt' ++ if 'clang' in sys.version.lower(): ++ if 'amd64' in sys.version.lower(): ++ return 'mingw_x86_64_clang' ++ if 'arm64' in sys.version.lower(): ++ return 'mingw_aarch64' ++ return 'mingw_i686_clang' ++ if 'amd64' in sys.version.lower(): ++ return 'mingw_x86_64' ++ return 'mingw_i686' + if 'amd64' in sys.version.lower(): + return 'win-amd64' + if '(arm)' in sys.version.lower(): +-- +2.33.0 + diff --git a/mingw-w64-python/0108-build-Cleanup-ncursesw-include-lookup-code.patch b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch similarity index 62% rename from mingw-w64-python/0108-build-Cleanup-ncursesw-include-lookup-code.patch rename to mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch index a37be8ae9b..e25e92f126 100644 --- a/mingw-w64-python/0108-build-Cleanup-ncursesw-include-lookup-code.patch +++ b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch @@ -1,20 +1,19 @@ -From 092108ff97a30264657e3f998de754e691cc58f4 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 23 Jul 2021 08:50:39 +0200 -Subject: [PATCH 108/N] build: Cleanup ncursesw include lookup code +From 7f0e7c96729a306b58ab87ecb4e051b460bec6ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= + +Date: Thu, 17 Jun 2021 18:52:09 +0530 +Subject: [PATCH 102/N] build: Fix ncursesw include lookup -Mirror what si already done for libffi; Look it up via +Mirror what is already done for libffi; Look it up via pkg-config and use the exported path via sysconfig in setup.py - -This should be merged into "dont include system ncurses path" --- - Makefile.pre.in | 1 + - configure.ac | 19 ++++++++++--------- - setup.py | 2 +- - 3 files changed, 12 insertions(+), 10 deletions(-) + Makefile.pre.in | 1 + + configure.ac | 9 ++++++++- + setup.py | 2 +- + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 01cc055..fe25d9e 100644 +index a8aecc2..3aca037 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -313,6 +313,7 @@ IO_OBJS= \ @@ -26,10 +25,10 @@ index 01cc055..fe25d9e 100644 ########################################################################## # Parser diff --git a/configure.ac b/configure.ac -index 14e4c8c..bab62ad 100644 +index 69cb8fb..6b21b79 100644 --- a/configure.ac +++ b/configure.ac -@@ -5556,17 +5556,18 @@ then +@@ -5557,10 +5557,17 @@ then [Define if you have struct stat.st_mtimensec]) fi @@ -42,26 +41,17 @@ index 14e4c8c..bab62ad 100644 + # first curses header check ac_save_cppflags="$CPPFLAGS" --case $host_os in -- mingw*) -- ;; -- *) -- if test "$cross_compiling" = no; then -- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -- fi -- ;; --esac -+if test "$cross_compiling" = no; then + if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" + CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR" -+fi + fi AC_CHECK_HEADERS(curses.h ncurses.h) - diff --git a/setup.py b/setup.py -index a2d5656..4e7a284 100644 +index d161108..46de8be 100644 --- a/setup.py +++ b/setup.py -@@ -1098,7 +1098,7 @@ class PyBuildExt(build_ext): +@@ -1104,7 +1104,7 @@ class PyBuildExt(build_ext): if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) if not CROSS_COMPILING: @@ -71,5 +61,5 @@ index a2d5656..4e7a284 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0102-squash-CI-use-O2.patch b/mingw-w64-python/0102-squash-CI-use-O2.patch deleted file mode 100644 index 0814327e35..0000000000 --- a/mingw-w64-python/0102-squash-CI-use-O2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 16dd9f42f911def97236f58be72d6d6aa023373e Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 2 Jul 2021 15:01:54 +0200 -Subject: [PATCH 102/N] [squash] CI: use -O2 - -Without optimizations the stack size increases and tests start to fail -with stack overflow (this is a known problem upstream https://bugs.python.org/issue43271) - -Either we enforce -O2 or we increase the stack size. - -Needs to be merged into the CI setup ---- - .github/workflows/mingw.yml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index fff5fa5..8486bb4 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -52,6 +52,7 @@ jobs: - set -ex - pkgver='3.9.5' - _pybasever='3.9' -+ CFLAGS="-O2" - - PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) - if [ ${{ matrix.msystem }} == "CLANG64" ] --- -2.32.0 - diff --git a/mingw-w64-python/0103-squash-Fixup-.rc-handling.patch b/mingw-w64-python/0103-squash-Fixup-.rc-handling.patch deleted file mode 100644 index abbbc180ec..0000000000 --- a/mingw-w64-python/0103-squash-Fixup-.rc-handling.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 2d66cfe1ae9f08b51abfd8f1aaeeb9ce87ee06b9 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 2 Jul 2021 19:04:05 +0200 -Subject: [PATCH 103/N] [squash] Fixup .rc handling - -Define everything needed in the build system - -This needs to be merged into "link win resource files and build pythonw" ---- - Makefile.pre.in | 11 ++++------- - configure.ac | 16 +++++++++++++++- - 2 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index e18239f..01cc055 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -600,17 +600,14 @@ coverage-report: regen-grammar regen-token regen-importlib - clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir) - --pythonnt_rc.h: -- @echo '#define PYTHON_DLL_NAME "$(DLLLIBRARY)"' >> $@ -- --python_exe.o: pythonnt_rc.h $(srcdir)/PC/python_exe.rc -+python_exe.o: $(srcdir)/PC/python_exe.rc - $(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_exe.rc $@ - --pythonw_exe.o: pythonnt_rc.h $(srcdir)/PC/pythonw_exe.rc -+pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc - $(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pythonw_exe.rc $@ - --python_nt.o: pythonnt_rc.h $(srcdir)/PC/python_nt.rc -- $(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ -+python_nt.o: $(srcdir)/PC/python_nt.rc -+ $(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ - - $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o -diff --git a/configure.ac b/configure.ac -index bba2006..78057de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5942,7 +5942,21 @@ AC_MSG_RESULT(done) - case $host in - *-*-mingw*) - LIBS="$LIBS -lversion -lshlwapi" -- RCFLAGS="$RCFLAGS -O COFF" -+ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ #include -+ #include "Include/patchlevel.h" -+ int main() { -+ fprintf ( -+ fopen ("conftest.out","w"), -+ "%d", -+ PY_MICRO_VERSION * 1000 + PY_RELEASE_LEVEL * 10 + PY_RELEASE_SERIAL); -+ return 0; -+ } -+ ]])], [FIELD3=`cat conftest.out`]) -+ -+ RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF" -+ - case $host in - i686*) RCFLAGS="$RCFLAGS --target=pe-i386" ;; - x86_64*) RCFLAGS="$RCFLAGS --target=pe-x86-64" ;; --- -2.32.0 - diff --git a/mingw-w64-python/0109-tests-fix-test_bytes.patch b/mingw-w64-python/0103-tests-fix-test_bytes.patch similarity index 87% rename from mingw-w64-python/0109-tests-fix-test_bytes.patch rename to mingw-w64-python/0103-tests-fix-test_bytes.patch index eb466629b0..8f5db54627 100644 --- a/mingw-w64-python/0109-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0103-tests-fix-test_bytes.patch @@ -1,7 +1,7 @@ -From c303ac774c185b775e109d857cfd91223825de96 Mon Sep 17 00:00:00 2001 +From dee249e62d0d3f610538286927b24ea6f9f5b332 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 -Subject: [PATCH 109/N] tests: fix test_bytes +Subject: [PATCH 103/N] tests: fix test_bytes %p has different casing with mingw-w64, but it's implementation defined. Change the test to the mingw-w64 variant. @@ -23,5 +23,5 @@ index 227e6d7..193ce10 100644 return (ptr_format % ptr) else: -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0104-squash-Set-MS_DLL_ID.patch b/mingw-w64-python/0104-squash-Set-MS_DLL_ID.patch deleted file mode 100644 index 72b4758ffc..0000000000 --- a/mingw-w64-python/0104-squash-Set-MS_DLL_ID.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a12eab686c41516a51449bcc61883703393870b2 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 2 Jul 2021 19:04:56 +0200 -Subject: [PATCH 104/N] [squash] Set MS_DLL_ID - -This needs to be merged into "MINGW dynamic loading support" ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 78057de..bf21222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3958,6 +3958,7 @@ then - *-*-mingw*) - DYNLOADFILE="dynload_win.o" - extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o" -+ CFLAGS_NODIST="$CFLAGS_NODIST -DMS_DLL_ID='\"$VERSION\"'" - ;; - esac - fi --- -2.32.0 - diff --git a/mingw-w64-python/0110-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch similarity index 86% rename from mingw-w64-python/0110-time-fix-strftime-not-raising-for-invalid-year-value.patch rename to mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch index 32bb8332f3..df30919838 100644 --- a/mingw-w64-python/0110-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,7 +1,7 @@ -From 57bb29b796eca27031584a75e6b44182e4c6b2e5 Mon Sep 17 00:00:00 2001 +From 72e058ef4fdb8aa7a5d5a1a8b45a16d9c0ef975f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 -Subject: [PATCH 110/N] time: fix strftime not raising for invalid year +Subject: [PATCH 104/N] time: fix strftime not raising for invalid year values It's crt specific and not compiler specific. @@ -24,5 +24,5 @@ index 80eab30..f0cdcfa 100644 PyErr_SetString(PyExc_ValueError, "strftime() requires year in [1; 9999]"); -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0113-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch similarity index 89% rename from mingw-w64-python/0113-ctypes-find_library-c-should-return-None-with-ucrt.patch rename to mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch index 9a253d9baa..1352c0210a 100644 --- a/mingw-w64-python/0113-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,7 +1,7 @@ -From a3aa28ae29edfe8ffd0d428742f1e1bee4db971b Mon Sep 17 00:00:00 2001 +From bf97e2d2da502effd0116a00d4a02a69b7a9c2a9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 -Subject: [PATCH 113/N] ctypes: find_library('c') should return None with +Subject: [PATCH 105/N] ctypes: find_library('c') should return None with ucrt Just like with MSVC. This fixes a test in test_ctypes. @@ -37,5 +37,5 @@ index 0c2510e..48ddb3b 100644 # See MSDN for the REAL search order. for directory in os.environ['PATH'].split(os.pathsep): -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0105-squash-CI-Clean-up.patch b/mingw-w64-python/0105-squash-CI-Clean-up.patch deleted file mode 100644 index 1d2f9c9fd5..0000000000 --- a/mingw-w64-python/0105-squash-CI-Clean-up.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 0a6d945f0dc1b1941aa4265ce68718582f5bea32 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 2 Jul 2021 19:11:46 +0200 -Subject: [PATCH 105/N] [squash] CI: Clean up - -this is all no longer needed now - -Needs to be merged into the CI setup ---- - .github/workflows/mingw.yml | 45 +++++-------------------------------- - 1 file changed, 6 insertions(+), 39 deletions(-) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index 8486bb4..d45a9c2 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -50,8 +50,7 @@ jobs: - shell: msys2 {0} - run: | - set -ex -- pkgver='3.9.5' -- _pybasever='3.9' -+ - CFLAGS="-O2" - - PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) -@@ -67,35 +66,6 @@ jobs: - CFLAGS+=" -DNDEBUG " - CXXFLAGS+=" -DNDEBUG " - _extra_config+=("--enable-optimizations") -- # Fix MS_DLL_ID undeclared in PC/dl_nt.c -- f3f=0 -- re='^[0-9]+$' -- part3=${pkgver##*.} -- if ! [[ $part3 =~ $re ]]; then -- c= -- while test -n "$part3"; do -- b=${part3:0:1} -- if ! [[ $b =~ $re ]]; then -- break -- fi -- c+=${b} -- part3=${part3:1} -- done -- f3f=$((f3f + 1000 * $((${c})))) -- part3Len=${#part3} -- if [ "$part3Len" -ge "1" ]; then -- f3f=$((f3f + 10 * $((0x${part3:0:1})))) -- if [ "$part3Len" -ge "2" ]; then -- f3f=$((f3f + ${part3:1:1})) -- fi -- fi -- else -- f3f=$((f3f + 1000 * ${part3})) -- fi -- CFLAGS+=" -DMS_DLL_ID=\\\"${_pybasever}\\\"" -- CFLAGS+=" -DFIELD3=${f3f}" -- CFLAGS+=" -DORIGINAL_FILENAME=\\\"libpython${_pybasever}.dll\\\"" -- rc_flags=" -DMS_DLL_ID=\\\\\\\"${_pybasever}\\\\\\\" -DFIELD3=${f3f} -DORIGINAL_FILENAME=\\\\\\\"libpython${_pybasever}.dll\\\\\\\"" - - # Workaround for conftest error on 64-bit builds - export ac_cv_working_tzset=no -@@ -131,7 +101,6 @@ jobs: - --without-c-locale-coercion \ - --enable-loadable-sqlite-extensions \ - "${_extra_config[@]}" \ -- RCFLAGS="$rc_flags" \ - OPT="" - # We patch importlib which is embedded in C headers, so regenerate them - make regen-importlib -@@ -147,9 +116,8 @@ jobs: - shell: msys2 {0} - run: | - set -ex -- -- pkgver='3.9.5' -- _pybasever='3.9' -+ -+ _pybasever=$(./python.exe -c "import sys; print(sys.winver);") - srcdir=. - - # now install things -@@ -160,7 +128,6 @@ jobs: - MSYSTEM=MINGW \ - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - make -j1 install DESTDIR="${pkgdir}" -- VERABI=${_pybasever} - - # gdb pretty printers for debugging Python itself; to use: - # python -@@ -169,10 +136,10 @@ jobs: - # reload(python_gdb) - # end - -- cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${VERABI}.dll.a -+ cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a - - # Need for building boost python module -- cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a -+ cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a - - for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do - sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts} -@@ -185,7 +152,7 @@ jobs: - cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle - cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc - -- sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${VERABI}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/python-config.py -+ sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py - - # fix permissons - find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755 --- -2.32.0 - diff --git a/mingw-w64-python/0114-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch similarity index 92% rename from mingw-w64-python/0114-build-Disable-checks-for-dlopen-dlfcn.patch rename to mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch index 232c85aec8..605441a8ae 100644 --- a/mingw-w64-python/0114-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,7 +1,7 @@ -From 22537ffc1a86b3f483bd6ff0af9bd89880160f0c Mon Sep 17 00:00:00 2001 +From 33575171384e6e85efaf11ed9210463a870a7258 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 -Subject: [PATCH 114/N] build: Disable checks for dlopen/dlfcn +Subject: [PATCH 106/N] build: Disable checks for dlopen/dlfcn While it is (potentially) available with mingw we don't want to use it, so skip any checks for it. @@ -10,7 +10,7 @@ checks for it. 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index bab62ad..d1b8acb 100644 +index 6b21b79..12373f7 100644 --- a/configure.ac +++ b/configure.ac @@ -2423,7 +2423,7 @@ dnl AC_MSG_RESULT($cpp_type) @@ -62,5 +62,5 @@ index bab62ad..d1b8acb 100644 # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0106-squash-CI-use-srcdir-builddir.patch b/mingw-w64-python/0106-squash-CI-use-srcdir-builddir.patch deleted file mode 100644 index f23054c98a..0000000000 --- a/mingw-w64-python/0106-squash-CI-use-srcdir-builddir.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 29bca6042fe8e66965c3c7207699fff107403296 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 3 Jul 2021 09:22:14 +0200 -Subject: [PATCH 106/N] [squash] CI: use srcdir!=builddir - -To catch me breaking it ---- - .github/workflows/mingw.yml | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index d45a9c2..b2f0d6a 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -87,8 +87,9 @@ jobs: - export CXXFLAGS - export CPPFLAGS - -+ rm -Rf _build && mkdir _build && cd _build - -- MSYSTEM=MINGW ./configure \ -+ MSYSTEM=MINGW ../configure \ - --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ -@@ -117,8 +118,8 @@ jobs: - run: | - set -ex - -+ cd _build - _pybasever=$(./python.exe -c "import sys; print(sys.winver);") -- srcdir=. - - # now install things - -@@ -171,6 +172,7 @@ jobs: - shell: msys2 {0} - run: | - SMOKETESTS="$(pwd)/.github/workflows/smoketests.py" -+ cd _build - cd python_pkgdir/${MINGW_PREFIX}/bin - ./python.exe "$SMOKETESTS" - MSYSTEM= ./python.exe "$SMOKETESTS" -@@ -179,6 +181,7 @@ jobs: - continue-on-error: true - shell: msys2 {0} - run: | -+ cd _build - cd python_pkgdir/${MINGW_PREFIX}/bin - ./python.exe -m test -j4 - -@@ -186,6 +189,7 @@ jobs: - if: always() - shell: msys2 {0} - run: | -+ cd _build - tar -I 'zstd --ultra -20' -cf python.tar.zst python_pkgdir/ - - - name: Upload -@@ -193,5 +197,5 @@ jobs: - if: always() - with: - name: build-${{ matrix.msystem }} -- path: python.tar.zst -+ path: _build/python.tar.zst - --- -2.32.0 - diff --git a/mingw-w64-python/0115-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch similarity index 81% rename from mingw-w64-python/0115-Fix-install-location-of-the-import-library.patch rename to mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch index 7bee5322b8..c538b4eb8e 100644 --- a/mingw-w64-python/0115-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch @@ -1,14 +1,14 @@ -From 88d43ecb5443eaa93965e7f799deed119486fd0a Mon Sep 17 00:00:00 2001 +From 212191d85f1af9b7fb395c07db30ff4a9e3cd8da Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 -Subject: [PATCH 115/N] Fix install location of the import library +Subject: [PATCH 107/N] Fix install location of the import library --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index fe25d9e..2dfc47f 100644 +index 3aca037..2154bdf 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1690,7 +1690,7 @@ libainstall: @DEF_MAKE_RULE@ python-config @@ -21,5 +21,5 @@ index fe25d9e..2dfc47f 100644 $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0107-squash-fix-srcdir-builddir.patch b/mingw-w64-python/0107-squash-fix-srcdir-builddir.patch deleted file mode 100644 index 5494f6db55..0000000000 --- a/mingw-w64-python/0107-squash-fix-srcdir-builddir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b38e504287a07e713de6facb001b2b9e069e5f74 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 3 Jul 2021 09:34:29 +0200 -Subject: [PATCH 107/N] [squash] fix srcdir!=builddir - -merge into "Fixup .rc handling" ---- - configure.ac | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bf21222..14e4c8c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5944,9 +5944,12 @@ case $host in - *-*-mingw*) - LIBS="$LIBS -lversion -lshlwapi" - -+ AC_MSG_CHECKING([FIELD3]) -+ SAVE_CFLAGS=$CFLAGS -+ CFLAGS="-I $srcdir/Include" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include -- #include "Include/patchlevel.h" -+ #include "patchlevel.h" - int main() { - fprintf ( - fopen ("conftest.out","w"), -@@ -5955,7 +5958,8 @@ case $host in - return 0; - } - ]])], [FIELD3=`cat conftest.out`]) -- -+ CFLAGS=$SAVE_CFLAGS -+ AC_MSG_RESULT([${FIELD3}]) - RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF" - - case $host in --- -2.32.0 - diff --git a/mingw-w64-python/0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch similarity index 80% rename from mingw-w64-python/0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch rename to mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index 1078e6b617..928ad0a161 100644 --- a/mingw-w64-python/0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,7 +1,7 @@ -From aa693f38199fb21c4b1e7520c4de3a515243aa34 Mon Sep 17 00:00:00 2001 +From be91fcc4aa3d4b31521a4eda1256470f5ea43760 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 -Subject: [PATCH 116/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module +Subject: [PATCH 108/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module install Otherwise one has to set it when calling "make install". @@ -10,7 +10,7 @@ Otherwise one has to set it when calling "make install". 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2dfc47f..a17dcdf 100644 +index 2154bdf..7b8317a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1736,6 +1736,7 @@ endif @@ -22,5 +22,5 @@ index 2dfc47f..a17dcdf 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0117-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch similarity index 95% rename from mingw-w64-python/0117-build-Integrate-venvlauncher-build-installation-into.patch rename to mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch index 576b5db5e4..33c151e75c 100644 --- a/mingw-w64-python/0117-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,7 +1,7 @@ -From 4dc2cda4b0eaffbb79f67174db060452dc43e3ea Mon Sep 17 00:00:00 2001 +From f86fcd93f6748af7964e2875a890e3957ce3a2c4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 -Subject: [PATCH 117/N] build: Integrate venvlauncher build/installation into +Subject: [PATCH 109/N] build: Integrate venvlauncher build/installation into the Makefile This is required for venv creation on Windows. @@ -12,7 +12,7 @@ but a copy of main binary seems to work as well for now. 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index a17dcdf..ab90e65 100644 +index 7b8317a..6012869 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -161,6 +161,7 @@ BINLIBDEST= @BINLIBDEST@ @@ -75,5 +75,5 @@ index a17dcdf..ab90e65 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0126-Set-_WIN32_WINNT-version-in-configure.ac.patch b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch similarity index 71% rename from mingw-w64-python/0126-Set-_WIN32_WINNT-version-in-configure.ac.patch rename to mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch index 73829c70ed..31fa061157 100644 --- a/mingw-w64-python/0126-Set-_WIN32_WINNT-version-in-configure.ac.patch +++ b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,17 +1,17 @@ -From 32c54c2c248fe463a4b0078cb945f1845178780a Mon Sep 17 00:00:00 2001 +From 3724005ffa45a6115f94f8361d0f08cb95af568b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 -Subject: [PATCH 126/N] Set _WIN32_WINNT version in configure.ac +Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 736e1b9..82bea12 100644 +index 12373f7..2455a05 100644 --- a/configure.ac +++ b/configure.ac -@@ -3470,6 +3470,11 @@ else +@@ -3477,6 +3477,11 @@ else fi]) AC_MSG_RESULT($with_dbmliborder) @@ -24,5 +24,5 @@ index 736e1b9..82bea12 100644 AC_SUBST(USE_WIN32_MODULE) USE_WIN32_MODULE='#' -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0131-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch similarity index 81% rename from mingw-w64-python/0131-configure.ac-don-t-check-for-clock_-functions.patch rename to mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch index e77f120f29..3af3c2dce8 100644 --- a/mingw-w64-python/0131-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,7 +1,7 @@ -From 839f384b8d3f1b77bef639609246f67e979d8159 Mon Sep 17 00:00:00 2001 +From 80640c7c44d34d8cebfa0768575750e7753bcb8e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 -Subject: [PATCH 131/N] configure.ac: don't check for clock_ functions +Subject: [PATCH 111/N] configure.ac: don't check for clock_ functions They shouldn't be exposed on Windows and lead to winpthread being linked in --- @@ -9,7 +9,7 @@ They shouldn't be exposed on Windows and lead to winpthread being linked in 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 0497199..23dd59b 100644 +index 2455a05..dd6969d 100644 --- a/configure.ac +++ b/configure.ac @@ -4369,6 +4369,9 @@ char *r = crypt_r("", "", &d); @@ -32,5 +32,5 @@ index 0497199..23dd59b 100644 AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch b/mingw-w64-python/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch deleted file mode 100644 index fd6674c533..0000000000 --- a/mingw-w64-python/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bf8eeb610de434dc3adbdf0f4e8da39c70171cca Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 23 Jul 2021 08:55:03 +0200 -Subject: [PATCH 111/N] winconsoleio: build _testconsole which is required - for the tests - -This fixes test_winconsoleio - -Should be merged into "build winconsoleio" ---- - setup.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/setup.py b/setup.py -index 4e7a284..63f486c 100644 ---- a/setup.py -+++ b/setup.py -@@ -999,6 +999,9 @@ class PyBuildExt(build_ext): - ['_xxtestfuzz/_xxtestfuzz.c', - '_xxtestfuzz/fuzzer.c'])) - -+ if MS_WINDOWS: -+ self.add(Extension('_testconsole', ['../PC/_testconsole.c'])) -+ - def detect_readline_curses(self): - # readline - if not MS_WINDOWS: --- -2.32.0 - diff --git a/mingw-w64-python/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch b/mingw-w64-python/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch deleted file mode 100644 index 945c86d7c5..0000000000 --- a/mingw-w64-python/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44f87e70a74f9acde6536373a37e0623020a07a5 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 23 Jul 2021 08:55:42 +0200 -Subject: [PATCH 112/N] Adjust Py_WINVER for our Win 7 target - -We support win7 still, so adjust accordingly. - -Should be merged into the win7 patch ---- - PC/pyconfig.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index d7d3cf0..6e9c090 100644 ---- a/PC/pyconfig.h -+++ b/PC/pyconfig.h -@@ -136,8 +136,8 @@ WIN32 is still required for the locale module. - - /* set the version macros for the windows headers */ - /* Python 3.9+ requires Windows 8 or greater */ --#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */ --#define Py_NTDDI NTDDI_WIN8 -+#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */ -+#define Py_NTDDI NTDDI_WIN7 - - /* We only set these values when building Python - we don't want to force - these values on extensions, as that will affect the prototypes and --- -2.32.0 - diff --git a/mingw-w64-python/0134-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch similarity index 87% rename from mingw-w64-python/0134-expanduser-normpath-paths-coming-from-env-vars.patch rename to mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch index 9b7fb03aa1..894fc90c8d 100644 --- a/mingw-w64-python/0134-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,7 +1,7 @@ -From 6f3a083adc2e679029614ecb2ce4aa2f066324b1 Mon Sep 17 00:00:00 2001 +From 2748eca808bc4a0d9f79a86803217147fa4c69ec Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 -Subject: [PATCH 134/N] expanduser: normpath paths coming from env vars +Subject: [PATCH 112/N] expanduser: normpath paths coming from env vars This makes sure we get the same paths as with related functions in pathlib. --- @@ -31,5 +31,5 @@ index 77f5614..5d1c6b9 100644 # Expand paths containing shell variable substitutions. -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0095-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch similarity index 94% rename from mingw-w64-python/0095-Add-support-for-Windows-7-Python-3.9.patch rename to mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch index 44c514d30b..311bad70f0 100644 --- a/mingw-w64-python/0095-Add-support-for-Windows-7-Python-3.9.patch +++ b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch @@ -1,7 +1,7 @@ -From 71fba9ef0080a54dcd80fa5ff6c85c567101206d Mon Sep 17 00:00:00 2001 +From 0f459a423fa1754bae5817940d62348b5197fda5 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 -Subject: [PATCH 095/N] Add support for Windows 7 Python 3.9 +Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9 --- Modules/posixmodule.c | 22 +++++++++++------ @@ -159,18 +159,18 @@ index 53da3a6..40b0db3 100644 return _PyStatus_OK(); } diff --git a/configure.ac b/configure.ac -index d76db66..7cf6519 100644 +index dd6969d..23dd59b 100644 --- a/configure.ac +++ b/configure.ac -@@ -5881,7 +5881,7 @@ AC_MSG_RESULT(done) +@@ -5968,7 +5968,7 @@ AC_MSG_RESULT(done) # For mingw build need additional library for linking case $host in *-*-mingw*) - LIBS="$LIBS -lversion -lshlwapi -lpathcch" + LIBS="$LIBS -lversion -lshlwapi" - RCFLAGS="$RCFLAGS -O COFF" - case $host in - i686*) RCFLAGS="$RCFLAGS --target=pe-i386" ;; + AC_PROG_AWK + if test "$AWK" = "gawk"; then + awk_extra_flag="--non-decimal-data" -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0128-Commit-regenerated-importlib.patch b/mingw-w64-python/0114-Commit-regenerated-importlib.patch similarity index 99% rename from mingw-w64-python/0128-Commit-regenerated-importlib.patch rename to mingw-w64-python/0114-Commit-regenerated-importlib.patch index c42bc2a50f..f8b830b008 100644 --- a/mingw-w64-python/0128-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0114-Commit-regenerated-importlib.patch @@ -1,7 +1,7 @@ -From 73ef914a5fa580212ee63d4336484f788618972e Mon Sep 17 00:00:00 2001 +From 4ad86b7afa525e568e3c57b795df33b6a5369a3c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 16:09:12 +0200 -Subject: [PATCH 128/N] Commit regenerated importlib +Subject: [PATCH 114/N] Commit regenerated importlib It needs a native Python when building which isn't available when cross compiling @@ -2390,5 +2390,5 @@ index 6d40249..17f549b 100644 + 0,20,14,127,0,27,10,23,8,11,8,61, }; -- -2.32.0 +2.33.0 diff --git a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch new file mode 100644 index 0000000000..f463717a0d --- /dev/null +++ b/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -0,0 +1,589 @@ +From dace5a0283f861847979063d2ceb14bbf3cbc0f2 Mon Sep 17 00:00:00 2001 +From: Naveen M K +Date: Fri, 18 Jun 2021 17:51:59 +0530 +Subject: [PATCH 115/N] CI: test the build and add some mingw specific tests + +--- + .github/workflows/mingw.yml | 209 ++++++++++++++++++++++++ + mingw_ignorefile.txt | 34 ++++ + mingw_smoketests.py | 310 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 553 insertions(+) + create mode 100644 .github/workflows/mingw.yml + create mode 100644 mingw_ignorefile.txt + create mode 100644 mingw_smoketests.py + +diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml +new file mode 100644 +index 0000000..eb27adc +--- /dev/null ++++ b/.github/workflows/mingw.yml +@@ -0,0 +1,209 @@ ++name: Build ++on: [push, pull_request, workflow_dispatch] ++ ++jobs: ++ build: ++ runs-on: windows-2022 ++ strategy: ++ fail-fast: false ++ matrix: ++ msystem: ['MINGW64','MINGW32','UCRT64','CLANG64'] ++ include: ++ - msystem: MINGW64 ++ prefix: mingw-w64-x86_64 ++ - msystem: MINGW32 ++ prefix: mingw-w64-i686 ++ - msystem: UCRT64 ++ prefix: mingw-w64-ucrt-x86_64 ++ - msystem: CLANG64 ++ prefix: mingw-w64-clang-x86_64 ++ #- msystem: CLANG32 ++ # prefix: mingw-w64-clang-i686 ++ steps: ++ - name: Setup git ++ run: | ++ git config --global core.autocrlf false ++ git config --global core.eol lf ++ - uses: actions/checkout@v2 ++ - uses: msys2/setup-msys2@v2 ++ with: ++ msystem: ${{ matrix.msystem }} ++ release: false ++ update: true ++ install: >- ++ make ++ binutils ++ autoconf ++ autoconf-archive ++ automake-wrapper ++ tar ++ gzip ++ ${{ matrix.prefix }}-toolchain ++ ${{ matrix.prefix }}-expat ++ ${{ matrix.prefix }}-bzip2 ++ ${{ matrix.prefix }}-libffi ++ ${{ matrix.prefix }}-mpdecimal ++ ${{ matrix.prefix }}-ncurses ++ ${{ matrix.prefix }}-openssl ++ ${{ matrix.prefix }}-sqlite3 ++ ${{ matrix.prefix }}-tcl ++ ${{ matrix.prefix }}-tk ++ ${{ matrix.prefix }}-zlib ++ ${{ matrix.prefix }}-xz ++ ${{ matrix.prefix }}-tzdata ++ ++ - name: Build Python ++ shell: msys2 {0} ++ run: | ++ set -ex ++ ++ if [ ${{ matrix.msystem }} == "CLANG64" ] ++ then ++ export CC=clang ++ export CXX=clang++ ++ fi ++ autoreconf -vfi ++ ++ rm -Rf _build && mkdir _build && cd _build ++ ++ ../configure \ ++ --prefix=${MINGW_PREFIX} \ ++ --host=${MINGW_CHOST} \ ++ --build=${MINGW_CHOST} \ ++ --enable-shared \ ++ --with-system-expat \ ++ --with-system-ffi \ ++ --with-system-libmpdec \ ++ --without-ensurepip \ ++ --without-c-locale-coercion \ ++ --enable-loadable-sqlite-extensions \ ++ --with-tzpath=${MINGW_PREFIX}/share/zoneinfo \ ++ --enable-optimizations ++ ++ make -j8 ++ ++ - name: Run Smoke Test (build) ++ shell: msys2 {0} ++ run: | ++ SMOKETESTS="$(pwd)/mingw_smoketests.py" ++ cd _build ++ ./python.exe "$SMOKETESTS" ++ MSYSTEM= ./python.exe "$SMOKETESTS" ++ ++ - name: Run tests ++ shell: msys2 {0} ++ run: | ++ IGNOREFILE="$(pwd)/mingw_ignorefile.txt" ++ cd _build ++ MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W ++ ++ - name: Run broken tests ++ continue-on-error: true ++ shell: msys2 {0} ++ run: | ++ IGNOREFILE="$(pwd)/mingw_ignorefile.txt" ++ cd _build ++ MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W ++ ++ - name: Install ++ shell: msys2 {0} ++ run: | ++ set -ex ++ cd _build ++ ++ pkgdir=python_pkgdir ++ ++ make -j1 install DESTDIR="${pkgdir}" ++ ++ # Fix shebangs ++ _pybasever=$(./python.exe -c "import sys; print(sys.winver);") ++ for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do ++ sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts} ++ done ++ sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py ++ ++ # Create version-less aliases ++ cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe ++ cp "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe "${pkgdir}${MINGW_PREFIX}"/bin/pythonw.exe ++ cp "${pkgdir}${MINGW_PREFIX}"/bin/python3-config "${pkgdir}${MINGW_PREFIX}"/bin/python-config ++ cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle ++ cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc ++ ++ - name: Run Smoke Test (installed) ++ shell: msys2 {0} ++ run: | ++ export PYTHONTZPATH="${MINGW_PREFIX}/share/zoneinfo" ++ SMOKETESTS="$(pwd)/mingw_smoketests.py" ++ cd _build ++ cd python_pkgdir/${MINGW_PREFIX}/bin ++ ./python.exe "$SMOKETESTS" ++ MSYSTEM= ./python.exe "$SMOKETESTS" ++ ++ - name: Compress ++ if: always() ++ shell: msys2 {0} ++ run: | ++ cd _build ++ tar -zcf python.tar.gz python_pkgdir/ ++ ++ - name: Upload ++ uses: actions/upload-artifact@v2 ++ if: always() ++ with: ++ name: build-${{ matrix.msystem }} ++ path: _build/python.tar.gz ++ ++ cross: ++ runs-on: ubuntu-latest ++ container: ++ image: archlinux:base-devel ++ steps: ++ - uses: actions/checkout@v2 ++ - name: Install deps ++ run: | ++ pacman --noconfirm -Suuy ++ pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake python zip ++ ++ - name: Build ++ run: | ++ autoreconf -vfi ++ ++ mkdir _build && cd _build ++ ++ ../configure \ ++ --host=x86_64-w64-mingw32 \ ++ --build=x86_64-pc-linux-gnu \ ++ --enable-shared \ ++ --with-system-expat \ ++ --with-system-ffi \ ++ --with-system-libmpdec \ ++ --without-ensurepip \ ++ --without-c-locale-coercion \ ++ --enable-loadable-sqlite-extensions ++ ++ make -j8 ++ ++ make install DESTDIR="$(pwd)/install" ++ ++ - name: 'Zip files' ++ run: | ++ zip -r install.zip _build/install ++ ++ - name: Upload ++ uses: actions/upload-artifact@v2 ++ with: ++ name: build-cross ++ path: install.zip ++ ++ cross-test: ++ needs: [cross] ++ runs-on: windows-latest ++ steps: ++ - uses: actions/download-artifact@v2 ++ with: ++ name: build-cross ++ ++ - name: 'Run tests' ++ run: | ++ 7z x install.zip ++ ./_build/install/usr/local/bin/python3.exe -c "import sysconfig, pprint; pprint.pprint(sysconfig.get_config_vars())" +diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt +new file mode 100644 +index 0000000..dc3802e +--- /dev/null ++++ b/mingw_ignorefile.txt +@@ -0,0 +1,34 @@ ++ctypes.test.test_loading.LoaderTest.test_load_dll_with_flags ++distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built ++distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions ++distutils.tests.test_util.UtilTestCase.test_change_root ++test.datetimetester.TestLocalTimeDisambiguation_Fast.* ++test.datetimetester.TestLocalTimeDisambiguation_Pure.* ++test.test_cmath.CMathTests.test_specific_values ++test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution ++test.test_compileall.CommandLineTestsNoSourceEpoch.* ++test.test_compileall.CommandLineTestsWithSourceEpoch.* ++test.test_compileall.CompileallTestsWithoutSourceEpoch.* ++test.test_compileall.CompileallTestsWithSourceEpoch.* ++test.test_import.ImportTests.test_dll_dependency_import ++test.test_math.MathTests.* ++test.test_ntpath.NtCommonTest.test_import ++test.test_os.StatAttributeTests.test_stat_block_device ++test.test_os.TestScandir.test_attributes ++test.test_os.UtimeTests.test_large_time ++test.test_platform.PlatformTest.test_architecture_via_symlink ++test.test_regrtest.ProgramsTestCase.test_pcbuild_rt ++test.test_regrtest.ProgramsTestCase.test_tools_buildbot_test ++test.test_site._pthFileTests.* ++test.test_site.HelperFunctionsTests.* ++test.test_site.StartupImportTests.* ++test.test_ssl.* ++test.test_strptime.CalculationTests.* ++test.test_strptime.StrptimeTests.test_weekday ++test.test_strptime.TimeRETests.test_compile ++test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date ++test.test_venv.BasicTest.* ++test.test_venv.EnsurePipTest.* ++# flaky ++test.test__xxsubinterpreters.* ++test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe +\ No newline at end of file +diff --git a/mingw_smoketests.py b/mingw_smoketests.py +new file mode 100644 +index 0000000..70acbd1 +--- /dev/null ++++ b/mingw_smoketests.py +@@ -0,0 +1,310 @@ ++#!/usr/bin/env python3 ++# Copyright 2017 Christoph Reiter ++# ++# Permission is hereby granted, free of charge, to any person obtaining ++# a copy of this software and associated documentation files (the ++# "Software"), to deal in the Software without restriction, including ++# without limitation the rights to use, copy, modify, merge, publish, ++# distribute, sublicense, and/or sell copies of the Software, and to ++# permit persons to whom the Software is furnished to do so, subject to ++# the following conditions: ++# ++# The above copyright notice and this permission notice shall be included ++# in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++"""The goal of this test suite is collect tests for update regressions ++and to test msys2 related modifications like for path handling. ++Feel free to extend. ++""" ++ ++import os ++import unittest ++import sysconfig ++ ++if "MSYSTEM" in os.environ: ++ SEP = "/" ++else: ++ SEP = "\\" ++ ++_UCRT = "clang" in sysconfig.get_platform() or "ucrt" in sysconfig.get_platform() ++ ++ ++class Tests(unittest.TestCase): ++ ++ def test_zoneinfo(self): ++ # https://github.com/msys2-contrib/cpython-mingw/issues/32 ++ import zoneinfo ++ self.assertTrue(any(os.path.exists(p) for p in zoneinfo.TZPATH)) ++ zoneinfo.ZoneInfo("America/Sao_Paulo") ++ ++ def test_userdir_path_sep(self): ++ # Make sure os.path and pathlib use the same path separators ++ from unittest import mock ++ from os.path import expanduser ++ from pathlib import Path ++ ++ profiles = ["C:\\foo", "C:/foo"] ++ for profile in profiles: ++ with mock.patch.dict(os.environ, {"USERPROFILE": profile}): ++ self.assertEqual(expanduser("~"), os.path.normpath(expanduser("~"))) ++ self.assertEqual(str(Path("~").expanduser()), expanduser("~")) ++ self.assertEqual(str(Path.home()), expanduser("~")) ++ ++ def test_sysconfig_schemes(self): ++ # https://github.com/msys2/MINGW-packages/issues/9319 ++ import sysconfig ++ from distutils.dist import Distribution ++ from distutils.command.install import install ++ ++ names = ['scripts', 'purelib', 'platlib', 'data', 'include'] ++ for scheme in ["nt", "nt_user"]: ++ for name in names: ++ c = install(Distribution({"name": "foobar"})) ++ c.user = (scheme == "nt_user") ++ c.finalize_options() ++ if name == "include": ++ dist_path = os.path.dirname(getattr(c, "install_" + "headers")) ++ else: ++ dist_path = getattr(c, "install_" + name) ++ sys_path = sysconfig.get_path(name, scheme) ++ self.assertEqual(dist_path, sys_path, (scheme, name)) ++ ++ def test_ctypes_find_library(self): ++ from ctypes.util import find_library ++ from ctypes import cdll ++ self.assertTrue(cdll.msvcrt) ++ if _UCRT: ++ self.assertIsNone(find_library('c')) ++ else: ++ self.assertEqual(find_library('c'), 'msvcrt.dll') ++ ++ def test_ctypes_dlopen(self): ++ import ctypes ++ import sys ++ self.assertEqual(ctypes.RTLD_GLOBAL, 0) ++ self.assertEqual(ctypes.RTLD_GLOBAL, ctypes.RTLD_LOCAL) ++ self.assertFalse(hasattr(sys, 'setdlopenflags')) ++ self.assertFalse(hasattr(sys, 'getdlopenflags')) ++ self.assertFalse([n for n in dir(os) if n.startswith("RTLD_")]) ++ ++ def test_time_no_unix_stuff(self): ++ import time ++ self.assertFalse([n for n in dir(time) if n.startswith("clock_")]) ++ self.assertFalse([n for n in dir(time) if n.startswith("CLOCK_")]) ++ self.assertFalse([n for n in dir(time) if n.startswith("pthread_")]) ++ self.assertFalse(hasattr(time, 'tzset')) ++ ++ def test_strftime(self): ++ import time ++ with self.assertRaises(ValueError): ++ time.strftime('%Y', (12345,) + (0,) * 8) ++ ++ def test_sep(self): ++ self.assertEqual(os.sep, SEP) ++ ++ def test_module_file_path(self): ++ import asyncio ++ import zlib ++ self.assertEqual(zlib.__file__, os.path.normpath(zlib.__file__)) ++ self.assertEqual(asyncio.__file__, os.path.normpath(asyncio.__file__)) ++ ++ def test_importlib_frozen_path_sep(self): ++ import importlib._bootstrap_external ++ self.assertEqual(importlib._bootstrap_external.path_sep, SEP) ++ ++ def test_os_commonpath(self): ++ self.assertEqual( ++ os.path.commonpath( ++ [os.path.join("C:", os.sep, "foo", "bar"), ++ os.path.join("C:", os.sep, "foo")]), ++ os.path.join("C:", os.sep, "foo")) ++ ++ def test_pathlib(self): ++ import pathlib ++ ++ p = pathlib.Path("foo") / pathlib.Path("foo") ++ self.assertEqual(str(p), os.path.normpath(p)) ++ ++ def test_modules_import(self): ++ import sqlite3 ++ import ssl ++ import ctypes ++ import curses ++ ++ def test_socket_inet_ntop(self): ++ import socket ++ self.assertTrue(hasattr(socket, "inet_ntop")) ++ ++ def test_socket_inet_pton(self): ++ import socket ++ self.assertTrue(hasattr(socket, "inet_pton")) ++ ++ def test_multiprocessing_queue(self): ++ from multiprocessing import Queue ++ Queue(0) ++ ++ #def test_socket_timout_normal_error(self): ++ # import urllib.request ++ # from urllib.error import URLError ++ ++ # try: ++ # urllib.request.urlopen( ++ # 'http://localhost', timeout=0.0001).close() ++ # except URLError: ++ # pass ++ ++ def test_threads(self): ++ from concurrent.futures import ThreadPoolExecutor ++ ++ with ThreadPoolExecutor(1) as pool: ++ for res in pool.map(lambda *x: None, range(10000)): ++ pass ++ ++ def test_sysconfig(self): ++ import sysconfig ++ # This should be able to execute without exceptions ++ sysconfig.get_config_vars() ++ ++ def test_sqlite_enable_load_extension(self): ++ # Make sure --enable-loadable-sqlite-extensions is used ++ import sqlite3 ++ self.assertTrue(sqlite3.Connection.enable_load_extension) ++ ++ def test_venv_creation(self): ++ import tempfile ++ import venv ++ import subprocess ++ import shutil ++ with tempfile.TemporaryDirectory() as tmp: ++ builder = venv.EnvBuilder() ++ builder.create(tmp) ++ assert os.path.exists(os.path.join(tmp, "bin", "activate")) ++ assert os.path.exists(os.path.join(tmp, "bin", "python.exe")) ++ assert os.path.exists(os.path.join(tmp, "bin", "python3.exe")) ++ subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")]) ++ ++ def test_has_mktime(self): ++ from time import mktime, gmtime ++ mktime(gmtime()) ++ ++ def test_platform_things(self): ++ import sys ++ import sysconfig ++ import platform ++ import importlib.machinery ++ self.assertEqual(sys.implementation.name, "cpython") ++ self.assertEqual(sys.platform, "win32") ++ self.assertTrue(sysconfig.get_platform().startswith("mingw")) ++ self.assertTrue(sysconfig.get_config_var('SOABI').startswith("cpython-")) ++ ext_suffix = sysconfig.get_config_var('EXT_SUFFIX') ++ self.assertTrue(ext_suffix.endswith(".pyd")) ++ self.assertTrue("mingw" in ext_suffix) ++ self.assertEqual(sysconfig.get_config_var('SHLIB_SUFFIX'), ".pyd") ++ ext_suffixes = importlib.machinery.EXTENSION_SUFFIXES ++ self.assertTrue(ext_suffix in ext_suffixes) ++ self.assertTrue(".pyd" in ext_suffixes) ++ self.assertEqual(sys.winver, ".".join(map(str, sys.version_info[:2]))) ++ self.assertEqual(platform.python_implementation(), "CPython") ++ self.assertEqual(platform.system(), "Windows") ++ self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0) ++ ++ def test_c_ext_build(self): ++ import tempfile ++ import sys ++ import subprocess ++ import textwrap ++ from pathlib import Path ++ ++ with tempfile.TemporaryDirectory() as tmppro: ++ subprocess.check_call([sys.executable, "-m", "ensurepip", "--user"]) ++ with Path(tmppro, "setup.py").open("w") as f: ++ f.write( ++ textwrap.dedent( ++ """\ ++ from setuptools import setup, Extension ++ ++ setup( ++ name='cwrapper', ++ version='1.0', ++ ext_modules=[ ++ Extension( ++ 'cwrapper', ++ sources=['cwrapper.c']), ++ ], ++ ) ++ """ ++ ) ++ ) ++ with Path(tmppro, "cwrapper.c").open("w") as f: ++ f.write( ++ textwrap.dedent( ++ """\ ++ #include ++ static PyObject * ++ helloworld(PyObject *self, PyObject *args) ++ { ++ printf("Hello World\\n"); ++ return Py_None; ++ } ++ static PyMethodDef ++ myMethods[] = { ++ { "helloworld", helloworld, METH_NOARGS, "Prints Hello World" }, ++ { NULL, NULL, 0, NULL } ++ }; ++ static struct PyModuleDef cwrapper = { ++ PyModuleDef_HEAD_INIT, ++ "cwrapper", ++ "Test Module", ++ -1, ++ myMethods ++ }; ++ ++ PyMODINIT_FUNC ++ PyInit_cwrapper(void) ++ { ++ return PyModule_Create(&cwrapper); ++ } ++ """ ++ ) ++ ) ++ subprocess.check_call( ++ [sys.executable, "-c", "import struct"], ++ ) ++ subprocess.check_call( ++ [ ++ sys.executable, ++ "-m", ++ "pip", ++ "install", ++ "wheel", ++ ], ++ ) ++ subprocess.check_call( ++ [ ++ sys.executable, ++ "-m", ++ "pip", ++ "install", ++ tmppro, ++ ], ++ ) ++ subprocess.check_call( ++ [sys.executable, "-c", "import cwrapper"], ++ ) ++ ++ ++ ++def suite(): ++ return unittest.TestLoader().loadTestsFromName(__name__) ++ ++ ++if __name__ == '__main__': ++ unittest.main(defaultTest='suite') +-- +2.33.0 + diff --git a/mingw-w64-python/0118-Update-smoketests.patch b/mingw-w64-python/0118-Update-smoketests.patch deleted file mode 100644 index c27b707061..0000000000 --- a/mingw-w64-python/0118-Update-smoketests.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6cc4ce00eeed7ab066c848637b4d06381d161a11 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 23 Jul 2021 08:56:15 +0200 -Subject: [PATCH 118/N] Update smoketests - ---- - .../smoketests.py => mingw_smoketests.py | 27 +++++++++++++++++++ - 1 file changed, 27 insertions(+) - rename .github/workflows/smoketests.py => mingw_smoketests.py (90%) - -diff --git a/.github/workflows/smoketests.py b/mingw_smoketests.py -similarity index 90% -rename from .github/workflows/smoketests.py -rename to mingw_smoketests.py -index d8f76e6..3f41855 100644 ---- a/.github/workflows/smoketests.py -+++ b/mingw_smoketests.py -@@ -27,15 +27,41 @@ Feel free to extend. - - import os - import unittest -+import sysconfig - - if "MSYSTEM" in os.environ: - SEP = "/" - else: - SEP = "\\" - -+_UCRT = "clang" in sysconfig.get_platform() or "ucrt" in sysconfig.get_platform() -+ - - class Tests(unittest.TestCase): - -+ def test_ctypes_find_library(self): -+ from ctypes.util import find_library -+ from ctypes import cdll -+ self.assertTrue(cdll.msvcrt) -+ if _UCRT: -+ self.assertIsNone(find_library('c')) -+ else: -+ self.assertEqual(find_library('c'), 'msvcrt.dll') -+ -+ def test_ctypes_dlopen(self): -+ import ctypes -+ import sys -+ self.assertEqual(ctypes.RTLD_GLOBAL, 0) -+ self.assertEqual(ctypes.RTLD_GLOBAL, ctypes.RTLD_LOCAL) -+ self.assertFalse(hasattr(sys, 'setdlopenflags')) -+ self.assertFalse(hasattr(sys, 'getdlopenflags')) -+ self.assertFalse([n for n in dir(os) if n.startswith("RTLD_")]) -+ -+ def test_strftime(self): -+ import time -+ with self.assertRaises(ValueError): -+ time.strftime('%Y', (12345,) + (0,) * 8) -+ - def test_sep(self): - self.assertEqual(os.sep, SEP) - -@@ -66,6 +92,7 @@ class Tests(unittest.TestCase): - import sqlite3 - import ssl - import ctypes -+ import curses - - def test_socket_inet_ntop(self): - import socket --- -2.32.0 - diff --git a/mingw-w64-python/0119-CI-clean-up-the-build-enforce-some-tests.patch b/mingw-w64-python/0119-CI-clean-up-the-build-enforce-some-tests.patch deleted file mode 100644 index eb4a531d26..0000000000 --- a/mingw-w64-python/0119-CI-clean-up-the-build-enforce-some-tests.patch +++ /dev/null @@ -1,247 +0,0 @@ -From 02aeab593ce0e2e5fe99717d286a8e1776de5b9d Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 23 Jul 2021 09:03:21 +0200 -Subject: [PATCH 119/N] CI: clean up the build; enforce some tests - -This now enforces success of a subset of tests (see mingw_ignorefile.txt) -and runs smoketests on the build as well as after installation. - -Remove everything that is no longer needed after the previous patches: - -* the build uses -O3 by default -* it sets fwrapv by default -* __USE_MINGW_ANSI_STDIO is not needed anymore with c99 -* it sets_WIN32_WINNT anyway -* ncurses is fixed by patching the build -* debug is handled by autotools -* all ac_cv_* overrides are now handled in configure.ac -* venvlauncher is handled by the main makefile -* setting MSYS2_ARG_CONV_EXCL is now handled by the makefile -* the import library is now installed by the makefile -* _sysconfig_data overrides are handled at runtime anyway -* we don't care about permissions.. (I think?) ---- - .github/workflows/mingw.yml | 118 +++++++++++------------------------- - mingw_ignorefile.txt | 34 +++++++++++ - 2 files changed, 68 insertions(+), 84 deletions(-) - create mode 100644 mingw_ignorefile.txt - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index b2f0d6a..16a96b5 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -51,45 +51,16 @@ jobs: - run: | - set -ex - -- CFLAGS="-O2" -- -- PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) - if [ ${{ matrix.msystem }} == "CLANG64" ] - then - export CC=clang - export CXX=clang++ - fi - autoreconf -vfi -- CFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601" -- CXXFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601" -- CPPFLAGS+=" -I${PREFIX_WIN}/include/ncurses " -- CFLAGS+=" -DNDEBUG " -- CXXFLAGS+=" -DNDEBUG " -- _extra_config+=("--enable-optimizations") -- -- # Workaround for conftest error on 64-bit builds -- export ac_cv_working_tzset=no -- -- # Workaround for when dlfcn exists on Windows, which causes -- # some conftests to succeed when they shouldn't (we don't use dlfcn). -- export ac_cv_header_dlfcn_h=no -- export ac_cv_lib_dl_dlopen=no -- export ac_cv_have_decl_RTLD_GLOBAL=no -- export ac_cv_have_decl_RTLD_LAZY=no -- export ac_cv_have_decl_RTLD_LOCAL=no -- export ac_cv_have_decl_RTLD_NOW=no -- export ac_cv_have_decl_RTLD_DEEPBIND=no -- export ac_cv_have_decl_RTLD_MEMBER=no -- export ac_cv_have_decl_RTLD_NODELETE=no -- export ac_cv_have_decl_RTLD_NOLOAD=no -- -- export CFLAGS -- export CXXFLAGS -- export CPPFLAGS -- -+ - rm -Rf _build && mkdir _build && cd _build -- -- MSYSTEM=MINGW ../configure \ -+ -+ ../configure \ - --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ -@@ -101,90 +72,69 @@ jobs: - --without-ensurepip \ - --without-c-locale-coercion \ - --enable-loadable-sqlite-extensions \ -- "${_extra_config[@]}" \ -- OPT="" -+ --enable-optimizations -+ - # We patch importlib which is embedded in C headers, so regenerate them - make regen-importlib - - make -j8 -- -- # Add missing venvlauncher files (issue #7014) -- # FIXME: build these from PC/launcher.c instead -- cp python.exe venvlauncher.exe -- cp pythonw.exe venvwlauncher.exe - -- - name: Install -+ - name: Run Smoke Test (build) - shell: msys2 {0} - run: | -- set -ex -+ SMOKETESTS="$(pwd)/mingw_smoketests.py" -+ cd _build -+ ./python.exe "$SMOKETESTS" -+ MSYSTEM= ./python.exe "$SMOKETESTS" -+ -+ - name: Run tests -+ shell: msys2 {0} -+ run: | -+ IGNOREFILE="$(pwd)/mingw_ignorefile.txt" -+ cd _build -+ MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W - -+ - name: Run broken tests -+ continue-on-error: true -+ shell: msys2 {0} -+ run: | -+ IGNOREFILE="$(pwd)/mingw_ignorefile.txt" - cd _build -- _pybasever=$(./python.exe -c "import sys; print(sys.winver);") -+ MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W - -- # now install things -+ - name: Install -+ shell: msys2 {0} -+ run: | -+ set -ex -+ cd _build - - pkgdir=python_pkgdir - -- PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) -- MSYSTEM=MINGW \ -- MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - make -j1 install DESTDIR="${pkgdir}" - -- # gdb pretty printers for debugging Python itself; to use: -- # python -- # sys.path.append('C:/msys64/mingw64/share/gdb/python3') -- # import python_gdb -- # reload(python_gdb) -- # end -- -- cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a -- -- # Need for building boost python module -- cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a -- -+ # Fix shebangs -+ _pybasever=$(./python.exe -c "import sys; print(sys.winver);") - for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do - sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts} - done -+ sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py - -- -+ # Create version-less aliases - cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe - cp "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe "${pkgdir}${MINGW_PREFIX}"/bin/pythonw.exe - cp "${pkgdir}${MINGW_PREFIX}"/bin/python3-config "${pkgdir}${MINGW_PREFIX}"/bin/python-config - cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle - cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc - -- sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py -- -- # fix permissons -- find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755 -- -- # replace paths in sysconfig -- sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \ -- "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/lib-dynload/_sysconfigdata*.py \ -- "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/smtpd.py -- -- # install venv launchers -- mkdir -p "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt -- cp venvlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/python.exe -- cp venvwlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/pythonw.exe -- -- - name: Run Smoke Test -+ - name: Run Smoke Test (installed) - shell: msys2 {0} - run: | -- SMOKETESTS="$(pwd)/.github/workflows/smoketests.py" -+ SMOKETESTS="$(pwd)/mingw_smoketests.py" - cd _build - cd python_pkgdir/${MINGW_PREFIX}/bin - ./python.exe "$SMOKETESTS" - MSYSTEM= ./python.exe "$SMOKETESTS" - -- - name: Run tests -- continue-on-error: true -- shell: msys2 {0} -- run: | -- cd _build -- cd python_pkgdir/${MINGW_PREFIX}/bin -- ./python.exe -m test -j4 -- - - name: Compress - if: always() - shell: msys2 {0} -diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt -new file mode 100644 -index 0000000..dc3802e ---- /dev/null -+++ b/mingw_ignorefile.txt -@@ -0,0 +1,34 @@ -+ctypes.test.test_loading.LoaderTest.test_load_dll_with_flags -+distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built -+distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions -+distutils.tests.test_util.UtilTestCase.test_change_root -+test.datetimetester.TestLocalTimeDisambiguation_Fast.* -+test.datetimetester.TestLocalTimeDisambiguation_Pure.* -+test.test_cmath.CMathTests.test_specific_values -+test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution -+test.test_compileall.CommandLineTestsNoSourceEpoch.* -+test.test_compileall.CommandLineTestsWithSourceEpoch.* -+test.test_compileall.CompileallTestsWithoutSourceEpoch.* -+test.test_compileall.CompileallTestsWithSourceEpoch.* -+test.test_import.ImportTests.test_dll_dependency_import -+test.test_math.MathTests.* -+test.test_ntpath.NtCommonTest.test_import -+test.test_os.StatAttributeTests.test_stat_block_device -+test.test_os.TestScandir.test_attributes -+test.test_os.UtimeTests.test_large_time -+test.test_platform.PlatformTest.test_architecture_via_symlink -+test.test_regrtest.ProgramsTestCase.test_pcbuild_rt -+test.test_regrtest.ProgramsTestCase.test_tools_buildbot_test -+test.test_site._pthFileTests.* -+test.test_site.HelperFunctionsTests.* -+test.test_site.StartupImportTests.* -+test.test_ssl.* -+test.test_strptime.CalculationTests.* -+test.test_strptime.StrptimeTests.test_weekday -+test.test_strptime.TimeRETests.test_compile -+test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date -+test.test_venv.BasicTest.* -+test.test_venv.EnsurePipTest.* -+# flaky -+test.test__xxsubinterpreters.* -+test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe -\ No newline at end of file --- -2.32.0 - diff --git a/mingw-w64-python/0120-1-2-AC_RUN_IFELSE-replace.patch b/mingw-w64-python/0120-1-2-AC_RUN_IFELSE-replace.patch deleted file mode 100644 index 9f5d846e3b..0000000000 --- a/mingw-w64-python/0120-1-2-AC_RUN_IFELSE-replace.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 92b9a55e916277392c5e308a4193179637e04eae Mon Sep 17 00:00:00 2001 -From: Long Nguyen -Date: Thu, 29 Jul 2021 22:19:32 +0700 -Subject: [PATCH 120/N] [1/2] AC_RUN_IFELSE replace - ---- - configure.ac | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d1b8acb..ae9b1d8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5146,11 +5146,12 @@ case $host in - *-*-mingw*) - # check if we are linking to ucrt - AC_MSG_CHECKING(whether linking to ucrt) -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include -- int main(){ -- _UCRT; -- } -+ #ifndef _UCRT -+ #error no ucrt -+ #endif -+ int main(){} - ]])],[linking_to_ucrt=yes],[linking_to_ucrt=no]) - AC_MSG_RESULT($linking_to_ucrt) - ;; --- -2.32.0 - diff --git a/mingw-w64-python/0121-Add-return-0-to-the-test-code.patch b/mingw-w64-python/0121-Add-return-0-to-the-test-code.patch deleted file mode 100644 index 662a846d46..0000000000 --- a/mingw-w64-python/0121-Add-return-0-to-the-test-code.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b63a2139c30c268fdc763abae966f527b9a7d798 Mon Sep 17 00:00:00 2001 -From: Long Nguyen -Date: Fri, 30 Jul 2021 10:31:55 +0700 -Subject: [PATCH 121/N] Add return 0 to the test code - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ae9b1d8..14eb4b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5151,7 +5151,7 @@ case $host in - #ifndef _UCRT - #error no ucrt - #endif -- int main(){} -+ int main(){ return 0; } - ]])],[linking_to_ucrt=yes],[linking_to_ucrt=no]) - AC_MSG_RESULT($linking_to_ucrt) - ;; --- -2.32.0 - diff --git a/mingw-w64-python/0122-2-2-AC_RUN_IFELSE-replace.patch b/mingw-w64-python/0122-2-2-AC_RUN_IFELSE-replace.patch deleted file mode 100644 index e806c69d80..0000000000 --- a/mingw-w64-python/0122-2-2-AC_RUN_IFELSE-replace.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 91ea75c8a7e2c91fd1ba454f3522ac8f27989805 Mon Sep 17 00:00:00 2001 -From: Long Nguyen -Date: Fri, 30 Jul 2021 16:34:41 +0700 -Subject: [PATCH 122/N] [2/2] AC_RUN_IFELSE replace - -Replace strtonum() with --non-decimal-data ---- - configure.ac | 28 +++++++++++++--------------- - 1 file changed, 13 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 14eb4b6..215dc75 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5959,22 +5959,20 @@ AC_MSG_RESULT(done) - case $host in - *-*-mingw*) - LIBS="$LIBS -lversion -lshlwapi" -- -+ AC_PROG_AWK -+ if test "$AWK" = "gawk"; then -+ awk_extra_flag="--non-decimal-data" -+ fi - AC_MSG_CHECKING([FIELD3]) -- SAVE_CFLAGS=$CFLAGS -- CFLAGS="-I $srcdir/Include" -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- #include -- #include "patchlevel.h" -- int main() { -- fprintf ( -- fopen ("conftest.out","w"), -- "%d", -- PY_MICRO_VERSION * 1000 + PY_RELEASE_LEVEL * 10 + PY_RELEASE_SERIAL); -- return 0; -- } -- ]])], [FIELD3=`cat conftest.out`]) -- CFLAGS=$SAVE_CFLAGS -+ FIELD3=$($AWK $awk_extra_flag '\ -+ /^#define PY_RELEASE_LEVEL_/ {levels[$2]=$3} \ -+ /^#define PY_MICRO_VERSION[[:space:]]+/ {micro=$3} \ -+ /^#define PY_RELEASE_LEVEL[[:space:]]+/ {level=levels[$3]} \ -+ /^#define PY_RELEASE_SERIAL[[:space:]]+/ {serial=$3} \ -+ END {print micro * 1000 + level * 10 + serial}' \ -+ $srcdir/Include/patchlevel.h -+ ) -+ - AC_MSG_RESULT([${FIELD3}]) - RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF" - --- -2.32.0 - diff --git a/mingw-w64-python/0123-Make-sure-MACHDEP-matches-sys.platform.patch b/mingw-w64-python/0123-Make-sure-MACHDEP-matches-sys.platform.patch deleted file mode 100644 index b3bd2f27b7..0000000000 --- a/mingw-w64-python/0123-Make-sure-MACHDEP-matches-sys.platform.patch +++ /dev/null @@ -1,83 +0,0 @@ -From aacd49b757cccfef161f2107248b8a80ab62f3d5 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 31 Jul 2021 15:55:00 +0200 -Subject: [PATCH 123/N] Make sure MACHDEP matches sys.platform - -MACHDEP=win32 - -This simplifies things a bit and also makes sure that -_PYTHON_SYSCONFIGDATA_NAME is set correctly when cross compiling ---- - Python/getplatform.c | 6 ------ - configure.ac | 17 +++++------------ - 2 files changed, 5 insertions(+), 18 deletions(-) - -diff --git a/Python/getplatform.c b/Python/getplatform.c -index 636b0a8..81a0f7a 100644 ---- a/Python/getplatform.c -+++ b/Python/getplatform.c -@@ -1,12 +1,6 @@ - - #include "Python.h" - --#ifdef __MINGW32__ --# undef PLATFORM --/* see PC/pyconfig.h */ --# define PLATFORM "win32" --#endif -- - #ifndef PLATFORM - #define PLATFORM "unknown" - #endif -diff --git a/configure.ac b/configure.ac -index 215dc75..736e1b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -383,17 +383,6 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name]) - # Set name for machine-dependent library files - AC_ARG_VAR([MACHDEP], [name for machine-dependent library files]) - AC_MSG_CHECKING(MACHDEP) --case $host in -- *-*-mingw*) -- # On those hosts MACHDEP is 'win', as platform specific files -- # go in plat-$(MACHDEP), but runtime platform is 'win32' -- test -z "$MACHDEP" && MACHDEP=win -- -- dnl Configuration will be based only on "host triplet" as build -- dnl must not depend from posix compatible environement. -- ac_sys_system=ignore -- ;; --esac - if test -z "$MACHDEP" - then - # avoid using uname for cross builds -@@ -412,6 +401,9 @@ then - *-*-cygwin*) - ac_sys_system=Cygwin - ;; -+ *-*-mingw*) -+ ac_sys_system=MINGW -+ ;; - *-*-darwin*) - ac_sys_system=Darwin - ac_sys_release=$(echo $host | sed -n 's/.*-[^0-9]\+\([0-9]\+\)/\1/p') -@@ -461,6 +453,7 @@ then - linux*) MACHDEP="linux";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; -+ mingw*) MACHDEP="win32";; - '') MACHDEP="unknown";; - esac - fi -@@ -5236,7 +5229,7 @@ AC_MSG_RESULT($LDVERSION) - - # On Android and Cygwin the shared libraries must be linked with libpython. - AC_SUBST(LIBPYTHON) --if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win"; then -+if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win32"; then - LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" - else - LIBPYTHON='' --- -2.32.0 - diff --git a/mingw-w64-python/0124-CI-add-a-cross-build-job.patch b/mingw-w64-python/0124-CI-add-a-cross-build-job.patch deleted file mode 100644 index 38b4452d8f..0000000000 --- a/mingw-w64-python/0124-CI-add-a-cross-build-job.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3ea2b7adc6859e939b75c02260d9512de758eb5c Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 31 Jul 2021 18:04:05 +0200 -Subject: [PATCH 124/N] CI: add a cross build job - ---- - .github/workflows/mingw.yml | 57 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 57 insertions(+) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index 16a96b5..af2f57c 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -149,3 +149,60 @@ jobs: - name: build-${{ matrix.msystem }} - path: _build/python.tar.zst - -+ cross: -+ runs-on: ubuntu-latest -+ container: -+ image: archlinux:base-devel -+ steps: -+ - uses: actions/checkout@v2 -+ - name: Install deps -+ run: | -+ pacman --noconfirm -Suuy -+ pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake python zip -+ -+ - name: Build -+ run: | -+ autoreconf -vfi -+ -+ mkdir _build && cd _build -+ -+ CFLAGS="-O2 -D_WIN32_WINNT=0x0601" \ -+ ../configure \ -+ --host=x86_64-w64-mingw32 \ -+ --build=x86_64-pc-linux-gnu \ -+ --enable-shared \ -+ --with-nt-threads \ -+ --with-system-expat \ -+ --with-system-ffi \ -+ --with-system-libmpdec \ -+ --without-ensurepip \ -+ --without-c-locale-coercion \ -+ --enable-loadable-sqlite-extensions -+ -+ make -j8 -+ -+ make install DESTDIR="$(pwd)/install" -+ cp /usr/x86_64-w64-mingw32/bin/libwinpthread-1.dll install/usr/local/bin -+ -+ - name: 'Zip files' -+ run: | -+ zip -r install.zip _build/install -+ -+ - name: Upload -+ uses: actions/upload-artifact@v2 -+ with: -+ name: build-cross -+ path: install.zip -+ -+ cross-test: -+ needs: [cross] -+ runs-on: windows-latest -+ steps: -+ - uses: actions/download-artifact@v2 -+ with: -+ name: build-cross -+ -+ - name: 'Run tests' -+ run: | -+ 7z x install.zip -+ ./_build/install/usr/local/bin/python3.exe -c "import sysconfig, pprint; pprint.pprint(sysconfig.get_config_vars())" --- -2.32.0 - diff --git a/mingw-w64-python/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch b/mingw-w64-python/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch deleted file mode 100644 index 69638967d9..0000000000 --- a/mingw-w64-python/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9f09ab8856a9b220e700345ad3a8378f51a372e6 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 1 Aug 2021 15:18:28 +0200 -Subject: [PATCH 125/N] Revert "Adjust Py_WINVER for our Win 7 target" - -This reverts commit 44f87e70a74f9acde6536373a37e0623020a07a5. ---- - PC/pyconfig.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index 6e9c090..d7d3cf0 100644 ---- a/PC/pyconfig.h -+++ b/PC/pyconfig.h -@@ -136,8 +136,8 @@ WIN32 is still required for the locale module. - - /* set the version macros for the windows headers */ - /* Python 3.9+ requires Windows 8 or greater */ --#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */ --#define Py_NTDDI NTDDI_WIN7 -+#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */ -+#define Py_NTDDI NTDDI_WIN8 - - /* We only set these values when building Python - we don't want to force - these values on extensions, as that will affect the prototypes and --- -2.32.0 - diff --git a/mingw-w64-python/0127-CI-cleanup.patch b/mingw-w64-python/0127-CI-cleanup.patch deleted file mode 100644 index 74a466db1a..0000000000 --- a/mingw-w64-python/0127-CI-cleanup.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ea45b9740011bbd6d09c6f66e43f71f21e354c00 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 1 Aug 2021 15:19:48 +0200 -Subject: [PATCH 127/N] CI: cleanup - ---- - .github/workflows/mingw.yml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index af2f57c..17aab89 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -166,7 +166,6 @@ jobs: - - mkdir _build && cd _build - -- CFLAGS="-O2 -D_WIN32_WINNT=0x0601" \ - ../configure \ - --host=x86_64-w64-mingw32 \ - --build=x86_64-pc-linux-gnu \ --- -2.32.0 - diff --git a/mingw-w64-python/0129-CI-clean-up.patch b/mingw-w64-python/0129-CI-clean-up.patch deleted file mode 100644 index ae315b925a..0000000000 --- a/mingw-w64-python/0129-CI-clean-up.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1f588119d6fade355756f06124a246456e7a5c0e Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 1 Aug 2021 16:14:20 +0200 -Subject: [PATCH 129/N] CI: clean up - ---- - .github/workflows/mingw.yml | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index 17aab89..0662196 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -74,9 +74,6 @@ jobs: - --enable-loadable-sqlite-extensions \ - --enable-optimizations - -- # We patch importlib which is embedded in C headers, so regenerate them -- make regen-importlib -- - make -j8 - - - name: Run Smoke Test (build) --- -2.32.0 - diff --git a/mingw-w64-python/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch b/mingw-w64-python/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch deleted file mode 100644 index a9192b00e4..0000000000 --- a/mingw-w64-python/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0973babb46f37ae7a2c7cf4f6884ea700802d9a9 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 1 Aug 2021 18:33:52 +0200 -Subject: [PATCH 130/N] configure.ac: default to --with-nt-threads with mingw - -Everything else is untested, so make the default system dependent ---- - configure.ac | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 82bea12..0497199 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2215,24 +2215,31 @@ dnl impact build process. When a new functionality is added, developers - dnl are responsible to update configure script to avoid thread models - dnl to be mixed. - --AC_MSG_CHECKING([for NT threads]) -+AC_MSG_CHECKING([for --with-nt-threads]) - AC_ARG_WITH(nt-threads, -- AS_HELP_STRING([--with-nt-threads], [build with windows threads]), -+ AS_HELP_STRING([--with-nt-threads], [build with windows threads (default is system-dependent)]), - [ - case $withval in - no) with_nt_threads=no;; - yes) with_nt_threads=yes;; - *) with_nt_threads=yes;; -- esac], [ -- with_nt_threads=no]) -+ esac -+], [ -+ case $host in -+ *-*-mingw*) with_nt_threads=yes;; -+ *) with_nt_threads=no;; -+ esac -+]) -+AC_MSG_RESULT([$with_nt_threads]) -+ - if test $with_nt_threads = yes ; then -+AC_MSG_CHECKING([whether linking with nt-threads work]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[]],[[_beginthread(0, 0, 0);]]) - ], -- [with_nt_threads=yes], -- [with_nt_threads=no]) -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_ERROR([failed to link with nt-threads])]) - fi --AC_MSG_RESULT([$with_nt_threads]) - - if test $with_nt_threads = yes ; then - dnl temporary default flag to avoid additional pthread checks --- -2.32.0 - diff --git a/mingw-w64-python/0132-CI-clean-up.patch b/mingw-w64-python/0132-CI-clean-up.patch deleted file mode 100644 index 5375a359a2..0000000000 --- a/mingw-w64-python/0132-CI-clean-up.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e8a5966d9e80ed05b7792c910111db145be24475 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 1 Aug 2021 18:48:31 +0200 -Subject: [PATCH 132/N] CI: clean up - ---- - .github/workflows/mingw.yml | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index 0662196..f860493 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -65,7 +65,6 @@ jobs: - --host=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ - --enable-shared \ -- --with-nt-threads \ - --with-system-expat \ - --with-system-ffi \ - --with-system-libmpdec \ -@@ -167,7 +166,6 @@ jobs: - --host=x86_64-w64-mingw32 \ - --build=x86_64-pc-linux-gnu \ - --enable-shared \ -- --with-nt-threads \ - --with-system-expat \ - --with-system-ffi \ - --with-system-libmpdec \ -@@ -178,7 +176,6 @@ jobs: - make -j8 - - make install DESTDIR="$(pwd)/install" -- cp /usr/x86_64-w64-mingw32/bin/libwinpthread-1.dll install/usr/local/bin - - - name: 'Zip files' - run: | --- -2.32.0 - diff --git a/mingw-w64-python/0133-smoketests-update.patch b/mingw-w64-python/0133-smoketests-update.patch deleted file mode 100644 index 0178d817df..0000000000 --- a/mingw-w64-python/0133-smoketests-update.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 61c5a4a14932539b31878de0b60bc98bcba791b9 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 1 Aug 2021 18:48:43 +0200 -Subject: [PATCH 133/N] smoketests: update - ---- - mingw_smoketests.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index 3f41855..0b99c88 100644 ---- a/mingw_smoketests.py -+++ b/mingw_smoketests.py -@@ -57,6 +57,13 @@ class Tests(unittest.TestCase): - self.assertFalse(hasattr(sys, 'getdlopenflags')) - self.assertFalse([n for n in dir(os) if n.startswith("RTLD_")]) - -+ def test_time_no_unix_stuff(self): -+ import time -+ self.assertFalse([n for n in dir(time) if n.startswith("clock_")]) -+ self.assertFalse([n for n in dir(time) if n.startswith("CLOCK_")]) -+ self.assertFalse([n for n in dir(time) if n.startswith("pthread_")]) -+ self.assertFalse(hasattr(time, 'tzset')) -+ - def test_strftime(self): - import time - with self.assertRaises(ValueError): --- -2.32.0 - diff --git a/mingw-w64-python/0135-sysconfig-fix-platlib-purelib-paths.patch b/mingw-w64-python/0135-sysconfig-fix-platlib-purelib-paths.patch deleted file mode 100644 index 50d1a65e1c..0000000000 --- a/mingw-w64-python/0135-sysconfig-fix-platlib-purelib-paths.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 86ec35c1c09f3ef98cab669915a9aec7a7ddb275 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 8 Aug 2021 10:19:01 +0200 -Subject: [PATCH 135/N] sysconfig: fix platlib/purelib paths - -make them match what we use in distutils. pip is moving from distutils -to sysconfig and this is breaking things. ---- - Lib/sysconfig.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 854b382..0729dc9 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -50,8 +50,8 @@ _INSTALL_SCHEMES = { - 'nt': { - 'stdlib': '{installed_base}/lib/python{py_version_short}', - 'platstdlib': '{base}/lib/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}', -- 'platlib': '{base}/lib/python{py_version_short}', -+ 'purelib': '{base}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{base}/lib/python{py_version_short}/site-packages', - 'include': '{installed_base}/include/python{py_version_short}', - 'platinclude': '{installed_base}/include/python{py_version_short}', - 'scripts': '{base}/bin', --- -2.32.0 - diff --git a/mingw-w64-python/0136-smoketests-update.patch b/mingw-w64-python/0136-smoketests-update.patch deleted file mode 100644 index 8874db793f..0000000000 --- a/mingw-w64-python/0136-smoketests-update.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 05def4bb6e292c3967ef3b219cc720ae28446272 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 8 Aug 2021 10:19:57 +0200 -Subject: [PATCH 136/N] smoketests: update - ---- - mingw_smoketests.py | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index 0b99c88..dc26169 100644 ---- a/mingw_smoketests.py -+++ b/mingw_smoketests.py -@@ -39,6 +39,38 @@ _UCRT = "clang" in sysconfig.get_platform() or "ucrt" in sysconfig.get_platform( - - class Tests(unittest.TestCase): - -+ def test_userdir_path_sep(self): -+ # Make sure os.path and pathlib use the same path separators -+ from unittest import mock -+ from os.path import expanduser -+ from pathlib import Path -+ -+ profiles = ["C:\\foo", "C:/foo"] -+ for profile in profiles: -+ with mock.patch.dict(os.environ, {"USERPROFILE": profile}): -+ self.assertEqual(expanduser("~"), os.path.normpath(expanduser("~"))) -+ self.assertEqual(str(Path("~").expanduser()), expanduser("~")) -+ self.assertEqual(str(Path.home()), expanduser("~")) -+ -+ def test_sysconfig_schemes(self): -+ # https://github.com/msys2/MINGW-packages/issues/9319 -+ import sysconfig -+ from distutils.dist import Distribution -+ from distutils.command.install import install -+ -+ names = ['scripts', 'purelib', 'platlib', 'data', 'include'] -+ for scheme in ["nt", "nt_user"]: -+ for name in names: -+ c = install(Distribution({"name": "foobar"})) -+ c.user = (scheme == "nt_user") -+ c.finalize_options() -+ if name == "include": -+ dist_path = os.path.dirname(getattr(c, "install_" + "headers")) -+ else: -+ dist_path = getattr(c, "install_" + name) -+ sys_path = sysconfig.get_path(name, scheme) -+ self.assertEqual(dist_path, sys_path, (scheme, name)) -+ - def test_ctypes_find_library(self): - from ctypes.util import find_library - from ctypes import cdll --- -2.32.0 - diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 290d731fb2..09828907c6 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -21,8 +21,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.6 -pkgrel=4 +pkgver=${_pybasever}.7 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -39,7 +39,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-tcl" "${MINGW_PACKAGE_PREFIX}-tk" "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-xz") + "${MINGW_PACKAGE_PREFIX}-xz" + "${MINGW_PACKAGE_PREFIX}-tzdata") makedepends=( "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" @@ -47,9 +48,9 @@ makedepends=( ) options=('makeflags') # 'debug' '!strip') source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" - 0001-make-_sysconfigdata.py-relocatable.patch + 0001-sysconfig-make-_sysconfigdata.py-relocatable.patch 0002-restore-setup-config.patch - 0003-MINGW-BASE-use-NT-thread-model.patch + 0003-build-add-with-nt-threads-and-make-it-default-on-min.patch 0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch 0005-MINGW-configure-MACHDEP-and-platform-for-build.patch 0006-MINGW-preset-configure-defaults.patch @@ -58,131 +59,110 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0009-MINGW-init-system-calls.patch 0010-MINGW-build-in-windows-modules-winreg.patch 0011-MINGW-determine-if-pwdmodule-should-be-used.patch - 0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch - 0013-MINGW-compiler-enable-new-dtags.patch - 0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch - 0015-MINGW-configure-for-shared-build.patch - 0016-MINGW-dynamic-loading-support.patch - 0017-MINGW-ignore-main-program-for-frozen-scripts.patch - 0018-MINGW-setup-_multiprocessing-module.patch - 0019-MINGW-setup-select-module.patch - 0020-MINGW-setup-_ctypes-module-with-system-libffi.patch - 0021-MINGW-defect-winsock2-and-setup-_socket-module.patch - 0022-MINGW-exclude-unix-only-modules.patch - 0023-MINGW-setup-msvcrt-and-_winapi-modules.patch - 0024-MINGW-build-extensions-with-GCC.patch - 0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch - 0026-MINGW-find-import-library.patch - 0027-MINGW-setup-_ssl-module.patch - 0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch - 0029-MINGW-support-stdcall-without-underscore.patch - 0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch - 0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch - 0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch - 0033-MINGW-customize-site.patch - 0034-add-python-config-sh.patch - 0035-cross-darwin-feature.patch - 0036-py3k-mingw-ntthreads-vs-pthreads.patch - 0037-mingw-system-libffi.patch - 0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch - 0039-mingw-use-posix-getpath.patch - 0040-mingw-add-ModuleFileName-dir-to-PATH.patch - 0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch - 0042-msys-cygwin-semi-native-build-sysconfig.patch - 0043-mingw-sysconfig-like-posix.patch - 0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch - 0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch - 0046-mingw-use-backslashes-in-compileall-py.patch - 0047-msys-convert_path-fix-and-root-hack.patch - 0048-allow-static-tcltk.patch - 0049-mingw-pdcurses_ISPAD.patch - 0050-grammar-fixes.patch - 0051-builddir-fixes.patch - 0052-msys-monkeypatch-os-system-via-sh-exe.patch - 0053-msys-replace-slashes-used-in-io-redirection.patch - 0054-mingw-install-layout-as-posix.patch - 0055-remove_path_max.default.patch - 0056-dont-link-with-gettext.patch - 0057-ctypes-python-dll.patch - 0058-gdbm-module-includes.patch - 0059-use-gnu_printf-in-format.patch - 0060-mingw-fix-ssl-dont-use-enum_certificates.patch - 0061-mingw-build-optimized-ext.patch - 0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch - 0063-fix-using-dllhandle-and-winver-mingw.patch - 0064-mingw-add-LIBPL-to-library-dirs.patch - 0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch - 0066-MINGW-link-with-additional-library.patch - 0067-install-msilib.patch - 0068-dont-include-system-ncurses-path.patch - 0069-fix-signal-module-build.patch - 0070-build-winconsoleio.patch - 0071-expose-sem_unlink.patch - 0072-cygpty-isatty.patch - 0073-disable-broken-gdbm-module.patch - 0074-link-win-resource-files-and-build-pythonw.patch - 0075-3.7-mpdec-mingw.patch - 0076-disable-readline.patch - 0077-fix-isselectable.patch - 0078-use-_wcsnicmp-instead-wcsncasecmp.patch - 0079-_xxsubinterpretersmodule.patch - 0080-sqlite3-module-defines.patch - 0081-configure-have-inet-pton.patch - 0082-fix-msvc9-import.patch - 0083-set-venv-activate-path-unix.patch - 0084-venv-creation-fixes.patch - 0085-pass-gen-profile-ldflags.patch - 0086-distutils-add-windmc-to-cygwinccompiler.patch - 0087-pkg-config-windows-must-link-ext-with-python-lib.patch - 0088-importlib-bootstrap-path-sep.patch - 0089-pathlib-path-sep.patch - 0090-warnings-fixes.patch - 0091-fix-build-testinternalcapi.patch - 0092-extend-MS_WINDOWS-flag.patch - 0093-clang-arm64.patch - 0094-MINGW-stack-reserve.patch - 0095-Add-support-for-Windows-7-Python-3.9.patch - 0096-Add-CI-to-Build-and-Test.patch - 0097-Don-t-use-os.pathsep-to-find-EOF.patch - 0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch - 0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch - 0100-Add-a-test-to-build-C-Ext.patch - 0101-Add-some-platform-related-tests.patch - 0102-squash-CI-use-O2.patch - 0103-squash-Fixup-.rc-handling.patch - 0104-squash-Set-MS_DLL_ID.patch - 0105-squash-CI-Clean-up.patch - 0106-squash-CI-use-srcdir-builddir.patch - 0107-squash-fix-srcdir-builddir.patch - 0108-build-Cleanup-ncursesw-include-lookup-code.patch - 0109-tests-fix-test_bytes.patch - 0110-time-fix-strftime-not-raising-for-invalid-year-value.patch - 0111-winconsoleio-build-_testconsole-which-is-required-fo.patch - 0112-Adjust-Py_WINVER-for-our-Win-7-target.patch - 0113-ctypes-find_library-c-should-return-None-with-ucrt.patch - 0114-build-Disable-checks-for-dlopen-dlfcn.patch - 0115-Fix-install-location-of-the-import-library.patch - 0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch - 0117-build-Integrate-venvlauncher-build-installation-into.patch - 0118-Update-smoketests.patch - 0119-CI-clean-up-the-build-enforce-some-tests.patch - 0120-1-2-AC_RUN_IFELSE-replace.patch - 0121-Add-return-0-to-the-test-code.patch - 0122-2-2-AC_RUN_IFELSE-replace.patch - 0123-Make-sure-MACHDEP-matches-sys.platform.patch - 0124-CI-add-a-cross-build-job.patch - 0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch - 0126-Set-_WIN32_WINNT-version-in-configure.ac.patch - 0127-CI-cleanup.patch - 0128-Commit-regenerated-importlib.patch - 0129-CI-clean-up.patch - 0130-configure.ac-default-to-with-nt-threads-with-mingw.patch - 0131-configure.ac-don-t-check-for-clock_-functions.patch - 0132-CI-clean-up.patch - 0133-smoketests-update.patch - 0134-expanduser-normpath-paths-coming-from-env-vars.patch - 0135-sysconfig-fix-platlib-purelib-paths.patch - 0136-smoketests-update.patch) + 0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch + 0013-MINGW-configure-for-shared-build.patch + 0014-MINGW-dynamic-loading-support.patch + 0015-MINGW-ignore-main-program-for-frozen-scripts.patch + 0016-MINGW-setup-_multiprocessing-module.patch + 0017-MINGW-setup-select-module.patch + 0018-MINGW-setup-_ctypes-module-with-system-libffi.patch + 0019-MINGW-defect-winsock2-and-setup-_socket-module.patch + 0020-MINGW-exclude-unix-only-modules.patch + 0021-MINGW-setup-msvcrt-and-_winapi-modules.patch + 0022-sysconfig-MINGW-build-extensions-with-GCC.patch + 0023-MINGW-setup-_ssl-module.patch + 0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch + 0025-MINGW-support-stdcall-without-underscore.patch + 0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch + 0027-MINGW-customize-site.patch + 0028-add-python-config-sh.patch + 0029-cross-darwin-feature.patch + 0030-mingw-system-libffi.patch + 0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch + 0032-mingw-use-posix-getpath.patch + 0033-mingw-add-ModuleFileName-dir-to-PATH.patch + 0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch + 0035-msys-cygwin-semi-native-build-sysconfig.patch + 0036-sysconfig-mingw-sysconfig-like-posix.patch + 0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch + 0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch + 0039-mingw-use-backslashes-in-compileall-py.patch + 0040-msys-convert_path-fix-and-root-hack.patch + 0041-allow-static-tcltk.patch + 0042-mingw-pdcurses_ISPAD.patch + 0043-grammar-fixes.patch + 0044-builddir-fixes.patch + 0045-msys-monkeypatch-os-system-via-sh-exe.patch + 0046-msys-replace-slashes-used-in-io-redirection.patch + 0047-remove_path_max.default.patch + 0048-dont-link-with-gettext.patch + 0049-ctypes-python-dll.patch + 0050-gdbm-module-includes.patch + 0051-use-gnu_printf-in-format.patch + 0052-mingw-fix-ssl-dont-use-enum_certificates.patch + 0053-fix-using-dllhandle-and-winver-mingw.patch + 0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch + 0055-MINGW-link-with-additional-library.patch + 0056-install-msilib.patch + 0057-fix-signal-module-build.patch + 0058-build-build-winconsoleio-and-_testconsole.patch + 0059-expose-sem_unlink.patch + 0060-cygpty-isatty.patch + 0061-disable-broken-gdbm-module.patch + 0062-build-link-win-resource-files-and-build-pythonw.patch + 0063-3.7-mpdec-mingw.patch + 0064-disable-readline.patch + 0065-fix-isselectable.patch + 0066-use-_wcsnicmp-instead-wcsncasecmp.patch + 0067-_xxsubinterpretersmodule.patch + 0068-sqlite3-module-defines.patch + 0069-configure.ac-fix-inet_pton-check.patch + 0070-set-venv-activate-path-unix.patch + 0071-venv-creation-fixes.patch + 0072-pass-gen-profile-ldflags.patch + 0073-pkg-config-windows-must-link-ext-with-python-lib.patch + 0074-importlib-bootstrap-path-sep.patch + 0075-pathlib-path-sep.patch + 0076-warnings-fixes.patch + 0077-fix-build-testinternalcapi.patch + 0078-extend-MS_WINDOWS-flag.patch + 0079-clang-arm64.patch + 0080-configure.ac-set-MINGW-stack-reserve.patch + 0081-Don-t-use-os.pathsep-to-find-EOF.patch + 0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch + 0083-Change-the-get_platform-method-in-sysconfig.patch + 0084-distutils-compiler-customize-mingw-cygwin-compilers.patch + 0085-distutils-compiler-enable-new-dtags.patch + 0086-distutils-MINGW-build-extensions-with-GCC.patch + 0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch + 0088-distutils-find-import-library.patch + 0089-distutils-avoid-circular-dependency-from-time-module.patch + 0090-distutils-generalization-of-posix-build-in-distutils.patch + 0091-distutils-mingw-sysconfig-like-posix.patch + 0092-distutils-get_versions-fixes.patch + 0093-distutils-install-layout-as-posix.patch + 0094-distutils-msys-convert_path-fix-and-root-hack.patch + 0095-distutils-mingw-build-optimized-ext.patch + 0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch + 0097-distutils-get-compilers-from-env-vars.patch + 0098-distutils-add-windmc-to-cygwinccompiler.patch + 0099-distutils-fix-msvc9-import.patch + 0100-distutils-mingw-add-LIBPL-to-library-dirs.patch + 0101-distutils-Change-the-get_platform-method-in-distutil.patch + 0102-build-Fix-ncursesw-include-lookup.patch + 0103-tests-fix-test_bytes.patch + 0104-time-fix-strftime-not-raising-for-invalid-year-value.patch + 0105-ctypes-find_library-c-should-return-None-with-ucrt.patch + 0106-build-Disable-checks-for-dlopen-dlfcn.patch + 0107-Fix-install-location-of-the-import-library.patch + 0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch + 0109-build-Integrate-venvlauncher-build-installation-into.patch + 0110-configure.ac-set-_WIN32_WINNT-version.patch + 0111-configure.ac-don-t-check-for-clock_-functions.patch + 0112-expanduser-normpath-paths-coming-from-env-vars.patch + 0113-Add-support-for-Windows-7-Python-3.9.patch + 0114-Commit-regenerated-importlib.patch + 0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -196,9 +176,9 @@ apply_patch_with_msg() { prepare() { cd "${srcdir}/Python-${pkgver}" - apply_patch_with_msg 0001-make-_sysconfigdata.py-relocatable.patch \ + apply_patch_with_msg 0001-sysconfig-make-_sysconfigdata.py-relocatable.patch \ 0002-restore-setup-config.patch \ - 0003-MINGW-BASE-use-NT-thread-model.patch \ + 0003-build-add-with-nt-threads-and-make-it-default-on-min.patch \ 0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch \ 0005-MINGW-configure-MACHDEP-and-platform-for-build.patch \ 0006-MINGW-preset-configure-defaults.patch \ @@ -207,131 +187,110 @@ prepare() { 0009-MINGW-init-system-calls.patch \ 0010-MINGW-build-in-windows-modules-winreg.patch \ 0011-MINGW-determine-if-pwdmodule-should-be-used.patch \ - 0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch \ - 0013-MINGW-compiler-enable-new-dtags.patch \ - 0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch \ - 0015-MINGW-configure-for-shared-build.patch \ - 0016-MINGW-dynamic-loading-support.patch \ - 0017-MINGW-ignore-main-program-for-frozen-scripts.patch \ - 0018-MINGW-setup-_multiprocessing-module.patch \ - 0019-MINGW-setup-select-module.patch \ - 0020-MINGW-setup-_ctypes-module-with-system-libffi.patch \ - 0021-MINGW-defect-winsock2-and-setup-_socket-module.patch \ - 0022-MINGW-exclude-unix-only-modules.patch \ - 0023-MINGW-setup-msvcrt-and-_winapi-modules.patch \ - 0024-MINGW-build-extensions-with-GCC.patch \ - 0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch \ - 0026-MINGW-find-import-library.patch \ - 0027-MINGW-setup-_ssl-module.patch \ - 0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch \ - 0029-MINGW-support-stdcall-without-underscore.patch \ - 0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch \ - 0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch \ - 0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch \ - 0033-MINGW-customize-site.patch \ - 0034-add-python-config-sh.patch \ - 0035-cross-darwin-feature.patch \ - 0036-py3k-mingw-ntthreads-vs-pthreads.patch \ - 0037-mingw-system-libffi.patch \ - 0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch \ - 0039-mingw-use-posix-getpath.patch \ - 0040-mingw-add-ModuleFileName-dir-to-PATH.patch \ - 0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch \ - 0042-msys-cygwin-semi-native-build-sysconfig.patch \ - 0043-mingw-sysconfig-like-posix.patch \ - 0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch \ - 0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch \ - 0046-mingw-use-backslashes-in-compileall-py.patch \ - 0047-msys-convert_path-fix-and-root-hack.patch \ - 0048-allow-static-tcltk.patch \ - 0049-mingw-pdcurses_ISPAD.patch \ - 0050-grammar-fixes.patch \ - 0051-builddir-fixes.patch \ - 0052-msys-monkeypatch-os-system-via-sh-exe.patch \ - 0053-msys-replace-slashes-used-in-io-redirection.patch \ - 0054-mingw-install-layout-as-posix.patch \ - 0055-remove_path_max.default.patch \ - 0056-dont-link-with-gettext.patch \ - 0057-ctypes-python-dll.patch \ - 0058-gdbm-module-includes.patch \ - 0059-use-gnu_printf-in-format.patch \ - 0060-mingw-fix-ssl-dont-use-enum_certificates.patch \ - 0061-mingw-build-optimized-ext.patch \ - 0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch \ - 0063-fix-using-dllhandle-and-winver-mingw.patch \ - 0064-mingw-add-LIBPL-to-library-dirs.patch \ - 0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch \ - 0066-MINGW-link-with-additional-library.patch \ - 0067-install-msilib.patch \ - 0068-dont-include-system-ncurses-path.patch \ - 0069-fix-signal-module-build.patch \ - 0070-build-winconsoleio.patch \ - 0071-expose-sem_unlink.patch \ - 0072-cygpty-isatty.patch \ - 0073-disable-broken-gdbm-module.patch \ - 0074-link-win-resource-files-and-build-pythonw.patch \ - 0075-3.7-mpdec-mingw.patch \ - 0076-disable-readline.patch \ - 0077-fix-isselectable.patch \ - 0078-use-_wcsnicmp-instead-wcsncasecmp.patch \ - 0079-_xxsubinterpretersmodule.patch \ - 0080-sqlite3-module-defines.patch \ - 0081-configure-have-inet-pton.patch \ - 0082-fix-msvc9-import.patch \ - 0083-set-venv-activate-path-unix.patch \ - 0084-venv-creation-fixes.patch \ - 0085-pass-gen-profile-ldflags.patch \ - 0086-distutils-add-windmc-to-cygwinccompiler.patch \ - 0087-pkg-config-windows-must-link-ext-with-python-lib.patch \ - 0088-importlib-bootstrap-path-sep.patch \ - 0089-pathlib-path-sep.patch \ - 0090-warnings-fixes.patch \ - 0091-fix-build-testinternalcapi.patch \ - 0092-extend-MS_WINDOWS-flag.patch \ - 0093-clang-arm64.patch \ - 0094-MINGW-stack-reserve.patch \ - 0095-Add-support-for-Windows-7-Python-3.9.patch \ - 0096-Add-CI-to-Build-and-Test.patch \ - 0097-Don-t-use-os.pathsep-to-find-EOF.patch \ - 0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch \ - 0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch \ - 0100-Add-a-test-to-build-C-Ext.patch \ - 0101-Add-some-platform-related-tests.patch \ - 0102-squash-CI-use-O2.patch \ - 0103-squash-Fixup-.rc-handling.patch \ - 0104-squash-Set-MS_DLL_ID.patch \ - 0105-squash-CI-Clean-up.patch \ - 0106-squash-CI-use-srcdir-builddir.patch \ - 0107-squash-fix-srcdir-builddir.patch \ - 0108-build-Cleanup-ncursesw-include-lookup-code.patch \ - 0109-tests-fix-test_bytes.patch \ - 0110-time-fix-strftime-not-raising-for-invalid-year-value.patch \ - 0111-winconsoleio-build-_testconsole-which-is-required-fo.patch \ - 0112-Adjust-Py_WINVER-for-our-Win-7-target.patch \ - 0113-ctypes-find_library-c-should-return-None-with-ucrt.patch \ - 0114-build-Disable-checks-for-dlopen-dlfcn.patch \ - 0115-Fix-install-location-of-the-import-library.patch \ - 0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch \ - 0117-build-Integrate-venvlauncher-build-installation-into.patch \ - 0118-Update-smoketests.patch \ - 0119-CI-clean-up-the-build-enforce-some-tests.patch \ - 0120-1-2-AC_RUN_IFELSE-replace.patch \ - 0121-Add-return-0-to-the-test-code.patch \ - 0122-2-2-AC_RUN_IFELSE-replace.patch \ - 0123-Make-sure-MACHDEP-matches-sys.platform.patch \ - 0124-CI-add-a-cross-build-job.patch \ - 0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch \ - 0126-Set-_WIN32_WINNT-version-in-configure.ac.patch \ - 0127-CI-cleanup.patch \ - 0128-Commit-regenerated-importlib.patch \ - 0129-CI-clean-up.patch \ - 0130-configure.ac-default-to-with-nt-threads-with-mingw.patch \ - 0131-configure.ac-don-t-check-for-clock_-functions.patch \ - 0132-CI-clean-up.patch \ - 0133-smoketests-update.patch \ - 0134-expanduser-normpath-paths-coming-from-env-vars.patch \ - 0135-sysconfig-fix-platlib-purelib-paths.patch \ - 0136-smoketests-update.patch + 0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch \ + 0013-MINGW-configure-for-shared-build.patch \ + 0014-MINGW-dynamic-loading-support.patch \ + 0015-MINGW-ignore-main-program-for-frozen-scripts.patch \ + 0016-MINGW-setup-_multiprocessing-module.patch \ + 0017-MINGW-setup-select-module.patch \ + 0018-MINGW-setup-_ctypes-module-with-system-libffi.patch \ + 0019-MINGW-defect-winsock2-and-setup-_socket-module.patch \ + 0020-MINGW-exclude-unix-only-modules.patch \ + 0021-MINGW-setup-msvcrt-and-_winapi-modules.patch \ + 0022-sysconfig-MINGW-build-extensions-with-GCC.patch \ + 0023-MINGW-setup-_ssl-module.patch \ + 0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch \ + 0025-MINGW-support-stdcall-without-underscore.patch \ + 0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch \ + 0027-MINGW-customize-site.patch \ + 0028-add-python-config-sh.patch \ + 0029-cross-darwin-feature.patch \ + 0030-mingw-system-libffi.patch \ + 0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch \ + 0032-mingw-use-posix-getpath.patch \ + 0033-mingw-add-ModuleFileName-dir-to-PATH.patch \ + 0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch \ + 0035-msys-cygwin-semi-native-build-sysconfig.patch \ + 0036-sysconfig-mingw-sysconfig-like-posix.patch \ + 0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch \ + 0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch \ + 0039-mingw-use-backslashes-in-compileall-py.patch \ + 0040-msys-convert_path-fix-and-root-hack.patch \ + 0041-allow-static-tcltk.patch \ + 0042-mingw-pdcurses_ISPAD.patch \ + 0043-grammar-fixes.patch \ + 0044-builddir-fixes.patch \ + 0045-msys-monkeypatch-os-system-via-sh-exe.patch \ + 0046-msys-replace-slashes-used-in-io-redirection.patch \ + 0047-remove_path_max.default.patch \ + 0048-dont-link-with-gettext.patch \ + 0049-ctypes-python-dll.patch \ + 0050-gdbm-module-includes.patch \ + 0051-use-gnu_printf-in-format.patch \ + 0052-mingw-fix-ssl-dont-use-enum_certificates.patch \ + 0053-fix-using-dllhandle-and-winver-mingw.patch \ + 0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch \ + 0055-MINGW-link-with-additional-library.patch \ + 0056-install-msilib.patch \ + 0057-fix-signal-module-build.patch \ + 0058-build-build-winconsoleio-and-_testconsole.patch \ + 0059-expose-sem_unlink.patch \ + 0060-cygpty-isatty.patch \ + 0061-disable-broken-gdbm-module.patch \ + 0062-build-link-win-resource-files-and-build-pythonw.patch \ + 0063-3.7-mpdec-mingw.patch \ + 0064-disable-readline.patch \ + 0065-fix-isselectable.patch \ + 0066-use-_wcsnicmp-instead-wcsncasecmp.patch \ + 0067-_xxsubinterpretersmodule.patch \ + 0068-sqlite3-module-defines.patch \ + 0069-configure.ac-fix-inet_pton-check.patch \ + 0070-set-venv-activate-path-unix.patch \ + 0071-venv-creation-fixes.patch \ + 0072-pass-gen-profile-ldflags.patch \ + 0073-pkg-config-windows-must-link-ext-with-python-lib.patch \ + 0074-importlib-bootstrap-path-sep.patch \ + 0075-pathlib-path-sep.patch \ + 0076-warnings-fixes.patch \ + 0077-fix-build-testinternalcapi.patch \ + 0078-extend-MS_WINDOWS-flag.patch \ + 0079-clang-arm64.patch \ + 0080-configure.ac-set-MINGW-stack-reserve.patch \ + 0081-Don-t-use-os.pathsep-to-find-EOF.patch \ + 0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch \ + 0083-Change-the-get_platform-method-in-sysconfig.patch \ + 0084-distutils-compiler-customize-mingw-cygwin-compilers.patch \ + 0085-distutils-compiler-enable-new-dtags.patch \ + 0086-distutils-MINGW-build-extensions-with-GCC.patch \ + 0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch \ + 0088-distutils-find-import-library.patch \ + 0089-distutils-avoid-circular-dependency-from-time-module.patch \ + 0090-distutils-generalization-of-posix-build-in-distutils.patch \ + 0091-distutils-mingw-sysconfig-like-posix.patch \ + 0092-distutils-get_versions-fixes.patch \ + 0093-distutils-install-layout-as-posix.patch \ + 0094-distutils-msys-convert_path-fix-and-root-hack.patch \ + 0095-distutils-mingw-build-optimized-ext.patch \ + 0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch \ + 0097-distutils-get-compilers-from-env-vars.patch \ + 0098-distutils-add-windmc-to-cygwinccompiler.patch \ + 0099-distutils-fix-msvc9-import.patch \ + 0100-distutils-mingw-add-LIBPL-to-library-dirs.patch \ + 0101-distutils-Change-the-get_platform-method-in-distutil.patch \ + 0102-build-Fix-ncursesw-include-lookup.patch \ + 0103-tests-fix-test_bytes.patch \ + 0104-time-fix-strftime-not-raising-for-invalid-year-value.patch \ + 0105-ctypes-find_library-c-should-return-None-with-ucrt.patch \ + 0106-build-Disable-checks-for-dlopen-dlfcn.patch \ + 0107-Fix-install-location-of-the-import-library.patch \ + 0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch \ + 0109-build-Integrate-venvlauncher-build-installation-into.patch \ + 0110-configure.ac-set-_WIN32_WINNT-version.patch \ + 0111-configure.ac-don-t-check-for-clock_-functions.patch \ + 0112-expanduser-normpath-paths-coming-from-env-vars.patch \ + 0113-Add-support-for-Windows-7-Python-3.9.patch \ + 0114-Commit-regenerated-importlib.patch \ + 0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch autoreconf -vfi } @@ -362,6 +321,7 @@ build() { --without-ensurepip \ --without-c-locale-coercion \ --enable-loadable-sqlite-extensions \ + --with-tzpath=${MINGW_PREFIX}/share/zoneinfo \ "${_extra_config[@]}" make @@ -426,140 +386,119 @@ package() { fi } -sha256sums=('397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a' - '621cbe4120c2f83c39eff9c03aba62b4240c657aaacff6c6063968e597a94f88' - '382f4d6b59da0e3c0ccea985864bd0e1389d97bd6517f068f175a624615f192d' - '36a13e324c8d4001f60799b60e87255db4f5ae9f2a04c2396b2a154fa8c7eb4c' - 'a3aeeeafbeaf8fd0f0884a29e4066e5ce2af0f8d4945b51e420dfdaa4dbfe4b9' - '852be8186f71c46b7f7907a8cef3fd1936f3a288ffeeedba843d73cd2e65caaf' - 'db5a158f9545d554dfad95290aae15fc71f03550c3594e1dabdbc0cfbb0ced29' - 'a8a6eb37672dbe4cfcd6df4ccd755217ee5e433b36b67591a407edcbb262c0eb' - '380a25c2b7cfafb1b9ddff91a94ba8eb7db00fb6a37c5f6bdb1e12ffbdcf2076' - '354b523f924dd066520f6df3f61fb752a7bdfe63b6422d32cb3b860445040878' - 'ac85eca34438d4e38f195da6614663a10e7f3f659e5c9879670a1e9a46a8a1c1' - 'fa0010a847b7156b07aadc7fe976b675d8913df0fa4efdfe5a148a529ff41ec1' - '0581eeba3aab8d851a1af2bf7ac29479d36adf19f7db7f0210d6d5e3ca22b9d8' - 'ff8375e55445678ab17a3d1dff62908dd22d15609160acb670e0fe67198736ee' - 'effc7117a72e0f3cadce63135f18ad513516880e3a6b8121037f6dbfddfc1e46' - '8f515fc87a457462c2d412326907c58dbc4253de95630718c4d56610db24a6de' - '3f833597807e08a85ca5e1fc26a2872f1127a01bfe2336c85f2c78cc547f40c3' - 'e2e9b0439a0e6c9a054c2f35c8f454ec2a4100e7bca9505ea94cd1011dfe7ee3' - '4f4d34bf0b1d3a979988d1dab3cc34d43d267c3b1b3ea1debf3358424302752d' - '02d3058ffe6439033055834f1452edebca5df686d38c2d48bc62f290b11de1a9' - '5185d0763ac3ff351d86b4403421ba8bbb9dac477ceb2816054caf4eb62873a5' - '86e39c652691e6dac338d617d262d0413f7468d74d12305cf8a12806f5e07b5e' - 'e28cfe596fa3087172b00fcdc1f313e1050f97b433a6b4f322a291866b80fc95' - 'fce14bcae4019a1d82b66cf18ad80e2c131eafcb585c1e70843b1f2a7b46a059' - '91499de0d6b5541aae4b544a84af4f85ce25d8bea030dd61cff0f5af2950e26e' - '67e10d47d4fd13b6ca691e9e04aa73a230a7df95318251e232455f8ab5c1eec4' - 'dae01ea768c270bf7e04f909000156d785881116dd05c48f2d6c5c64992943af' - 'f6214537de4f5ab1bc1c9c287bcd9f4108f6bf444b8930a985759753a96241e6' - 'd332fa50c6b6de4cba8b849c18687a420da1448cfc1bbdaafa8e724976fc0ee0' - '8363c5a8baf8dbde51c94413cffc1f9b6da3e3881c98995b30f9264cbf587845' - '5df74f664abbba7302642b7a9791ce891a1a00df2848cb0ac243cf61ca2617dd' - '339d65c6309431bd871810be26eb28ac84468b0dc287d443a40e5116ea7e45c7' - '1e5d15016f9866db88bf0efebe2cabef93955a6a9c54efe254e2219a9938bcba' - '9e3c9dcecb70a1394c2d2ed36ac2161014f95456a7a28fb206ebe14d6e944e28' - '516327a3e0dddd923c20a23dffbfafbad83d9ae782477eb36650a14526e0237f' - '008613913e1d861093ffe980999c1999da8c415f6d6e1f2a630ad872e018048b' - '6a0798d4f3a832bd0a09a22896b59fa4bc69638d99230d81ff3bc45ff16cde82' - '6346ca038c76011ade842ed2fe629897cc53ee7c2517ede0a300d7c8bab13ab0' - 'cd2614a5d8fef3132e08a0037ba66eeec9acfab386df086de8637e39bbd93cef' - '5a7d072a9b3c731818288ee0fe51fdabe5dc257b885eeb5fac6f200bbfc8a63a' - 'a155c770a98ee6bb96cfa0a6f9a5ddb4dce993ea818b83532d90cf57b1615c09' - '4915b4b4ff6c293426671d6bc91c174cc2b2cd7d3d1099a67e9cfe53cd7320b9' - '0d3061a67c8ed855ec78c01f682c12632e36e473d42c3e7008f999dc13bbc5b0' - 'e0c2d8aaa24425aa9f1cfd576d8f0a67d2e39c7108edadc7f322f618cdf9f97e' - '18f30eea4c1efb0f2c7f608a7daa7491c021c15476a1df2323a4f48849b6f77d' - '8ce17fdb9665dcd384744527a1eb155e1d1ff137a0a2a75d275dca0230830645' - '8b34737a4018920ecd31ee40d3a0db1545478258e58028061935e50024ee6b6c' - 'e4060c8d2158d3b2dcf7f8c79eca7490d23ef4897fa8a24388321f77c340fd88' - 'd47c18f14276c6151176c9c7f0780d334a582adcf4b6c71145f328377960bb94' - '25002a2be534ef4b4dbcfbc5598832ef4b64aa0ac849c3b44d796b49e10a3906' - 'c6a731c103ef31589296f60b9e220fe70b0113b49696248c4e379bb3b39ddf03' - 'c5ccfdb8f8695f94f23e9ecd0304ec91b5f4f00f9d6f43426ede4e0038479f24' - '58f5f50ce9e8a6dd4b484f174ad174db397ac5b2b248b56db65acae2122ed805' - '077ce1a4e5fd69de839c5f1bfb24a3bb5d2d548fb4a51250097692626d7c5d6b' - '3b1659b05b3353938a84b9a9f23a1add6f0dc38bb1d81e58010651e07c719a95' - '17d44817baccadcfb23289c15ca23f19fa185aa2a7dd12c88524de8d888f3507' - '54031e5b3f02cc4b80ce6b1702d7c33c6e9251136e1410012c7faa861abffe84' - '3741637112ae6fa0bcc15d73e80810b5e5c6986b8e8a4333f8a08c30c5e21ddb' - '11314e843829ef3fd8058434311dd55eeb7dd512ec8730f28c5b8bc6e101a654' - 'b87f41523bbcb61a8076a46a83b61480a2da79b49c3af3d0310aff02fb3eff7d' - '12f619eb1bcc3dc3a05d3ac077d0970860a8b97ecbd95f735fc95436bc910c1d' - '22f256ab9b1f19aa6ad41ef2ef23bcc67b8d9a2fc24315bac39e5eff4a3d5ef0' - '453be8620a5b47567fd750bdc7226baa2a7bae84d280c082ceea6c822c0152d4' - '167fc8fe20a0122fa0a5dfd7adcf343ba71379732bd0f6ade5a958f4c4c07c84' - 'f99bc96d13d181c0e3604b0b6f3405450cb23504739812cd05d12bb4796d6a4d' - '4e1fed573d0b564faad7770fa1a79525864acb02dd3996bbd28813201d80e941' - 'dcbf48794825acdcfc00e08ae358f2dc51dc8dfde8fc3cf7e304c570b8c477d2' - '3a9876035372157298f0b340c86806a43c193c09a1f732cb116262a8baa6658b' - '4446250eb39ed7afd9d0c79da92f15586bf8dc8c2ba9dec2edaa5d92136e95e6' - '385935abdaedf42ae27e21e895707471a3171a73310d0b97218823d13a1cff52' - '2b890e0612c9aaa0243b3cc86219b47c8f6823af2c57d8f3f100dcc5f664d13e' - '02b98c859ffc4c0d47667e7fa4579699249eb9052b8a985d051630c33d2304ff' - '92c3ed2cbcc0c9bd28a0b669ec68e445be7c5245201bda1c06172712c54d1a17' - '72e51a8f9374766b9afc452a5fbf7646390e89d1ae9f1ec158e22aac6dedf1db' - '5891a8c56eb49b1a9d2c22ee895821c34086a341b4a7e7e57b9e78196dc346a4' - 'e02409488b5cbd9157b6c80abd78ea2972e49092949e902811dabbf56f3f6d0c' - 'adba48cb1daf77542162e4da61caf498c83b2de5abbc5545f68a8ac290fe7b4a' - 'bf1960038604a3ad0ab11bc47007f8d7a97941c3b7f44d4487e2d79d742ca870' - '836723f0d3ec3d10b5ddabd09f7dddc76eefa261b6105b544f9dae7f4416146e' - 'b64e7a874532fe0475d4b3c192fb215948c06392a7ad04fd47a28289cc809967' - 'b49ab150e95bd390101225ba6ac3983df2a5a0bbc47d506a88c9caeefbd4ed3f' - '79f1646fa548a9da9986ded4a51842751cdea7ec579d28e6cc5d86e4a5a89f27' - '233318923f5fd7dd4605c79bb2adfbcdd2e8cc7e242b1e080e59aed1f6b86a29' - 'ceba0f6e583570db571ee9c3fe64b74ea58a474d114847cadd3ad70386c7c199' - 'fb3bee9ba5e4f9b2e8b7e8ec2fb08e12d85542bae8b86e7a4c69f698f720253b' - 'b01320b3c9037bb1fed03c7b8002e7b6af52fc7bb85cdf84cfc96842c7c9657d' - 'e3c10b3eb07b41e804b6a500c848def6f72cb04d94d00657dab307e68e891536' - '5e8113ca39795b59a0144b68db88a197c43c3b907c3f7bf2a5e1c1dd3a41b19c' - '4130af022a9ec1717cac82e3d3d5a7144a9c17611ac4db5150f8adede4ed3276' - '24e9029d664255a96c0346f7e53316640be6a6480bd77fcd7532a2b88881b485' - '754d84bc288da89cdec4b1cf5d216195aaa2f3d4046043d8b487bdd2f5a4c837' - '2d6ce50423f65dded048f64eb0dafe62448ad4786add9295d90fcfa6f316412a' - 'b3ba2ac22cd4263419f3daf93334745bccd1c70c429812c95821ed1e2d649159' - 'a74c4203ccc6f858fa9ee2c203cad1bf5de2bd868650d18c65034897e29e2b5d' - 'fe6bb4725238cbd00b856ed757392bdd2f0e7adb5216ee7738654b7a74594810' - '6fcc769d47e71afd496eef16a6c77d0e1eff983a20b16a7fadb6f4cc1c8ee6d7' - 'e1da93e5c569331313fd3af448b9e5b8d25ed68d25f1c15faaa8cccfe20640c0' - '432b51884bad4e578a64a7a24a8652de025c71c9129d0d3cd4120c71a7d0d57c' - '034a036cbdcbe33bb17a7951658da438ff7047f4f86fe8e5ebac5d84438ed0bd' - '703846000b96d426c50b400f5efbc8c2c877ce7c844f64ecdba86275035577b3' - 'e9906c134715dccccd2d047e62429014467d585deb2697d7f3b43fcdce202a21' - 'dcb016958e13893dbab74a20eba8feef26ce8cddceb75017afbb7c996b5f55a9' - '75073f54464145c2b26cc15e145048e3dca7e3a1e785ee96e09f1a2b4cb4a933' - 'ba079f6735555329997f7bd2e06140a1f4c32bf31e51c7a08f43b6fbf242829e' - '70d2d6d4b0ad50633069f14a13ac7474d97bc6443da51a1f4cdfe50d200c7c97' - '584661fbb281ce7cb9a24971a7501dfff6cbed39bf1b8979667dfd0de1bdfc60' - 'a45af5e34e6a99864cb1fdfcfe3f2387773f4da5020c2aa5cae6ca4e40a50e7b' - '527284880bc4eaf45f657993cbb14b0c9e2355c696bf9da30ffa20fe0a527f72' - 'cbd05feea0d8c76c7ebf2f47de3c20fe5634fdd02ac27a6b43215a4190b8faa4' - '515c8c1fa2a27a83be6a5c5e0f74fd3070305dcb2f5aa714c1eb90275d5c4ec6' - 'd98a8ea115fa4d81da77335e33c5b62ed3001ed9ae0efb646eb773075faaa53d' - '7ae9ab9aca3487d27867af461037bb037f4c8e60e7c5ff52318c0c38f1d50b77' - 'de7e7900839005a9a3bc8991b8d2845dbfb2a8abc857d84a1e8dfaaf820d24dc' - '9e7dbc573b8909b49e14257ea775b1b616c9d2f5dcc1895553f46ef224bbb3ca' - '1a34e8691959bc7a434f2727adc9dd759ac694d6ca4cbcf8caa035b9b68e618d' - '1f64fb52c26e26a5d993ac9d8fe9df8e402361498dec3cc2f9a96e18574cb8e2' - 'f127547c4360bebd48f1e4d9f2a0b3dce3717b221f91dc5af455bd179b8ad7b1' - '3f5ec75f84af9c99aa306ae5682e06868e145f92501a9a4164780a4c9e665fc8' - 'f72b7b304c34331e10cceceead5f34ecb543cffb660fea7cceccad30702ee64c' - 'acf828909bbb4a5450de2c439aa1509b0a952283962c5e6be8f5c78b9c4da0ff' - 'fdc56073ccf68f40a3fb1ff34b7597794755ee552cbef20b45c1106f99a52114' - 'b08fc89f267adfc431372289d56ec313bcefe7732031a68d9321e9d15dec8330' - '12a9c260e5bc429061e8e84b42f3527194cd78605241516d44c5368441c4bba7' - '8df046996bfd83800f1e17fbabe63100e5c793561d5ee23a1995a51aaa41799a' - 'bc45268d236a90fc38150415465dfb4ee71d1e25b6da4e03c1142b5e4927bd58' - '579c785550d4f1586061536e4fbf38d38222b7a76550aac75c854274876466cb' - '38b18859b2f53585e8867b601a8cca2bd7bcedf45bfc38d50f79b9715f8c6279' - 'fcc94978a7d00652ebf343d4d8533dc8749e652e1c656bc37b273b716575cc9a' - 'c33d9c55339253dfe200ee93ab98786826f6868a8cb464504d924e000cd20452' - '5529881b91c1bec732570159bb3d2558ba89e15836bc8edff698cead63621234' - '2beb04d3322f8bafcf554d5e65fc6b4febdbd7b58cafab3576fd0becd96ce5d0' - '88a3b24c77d79463b18caeebc4a21fb3b6f8f02069ca8ed393f34391ba5414b1' - 'ce703c676a1439035e10a636ca8a1d9a07ee9048490a6fb7475eb0ebdeb3ff61' - 'c091aa419722a9f1013a6a6068709ffb6a64bf3cf1db048d2eb162282cc3dcf9' - 'c83667dad52eb127a9fa910d021ffb4409dcdf93a3eaf947f4438cc08881a77c' - '97d8d5f6defe6276e7f0f5d0914964225b6249375004806e5b4df45134bb3598' - 'e50df666ff8d1c3bcd0fa25a634fb9c2e09db14b2b900dd8f83e369c90e4e43c') +sha256sums=('f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57' + 'df2c54e47405ba4d30918f323f80851b5a0b8f950f60530a03683d34742965b7' + 'aa681853a8ee9351df966557d241daba0656eee551774b036427a5e08dd87b38' + 'f2c312b5363441bffae2ea6c9e9265788754436803ac91be864a2d659b124c1a' + '4ced1b71a2719d6a5b955ebc4ffff08cd44f66320ce4ff807b1f1836782adfc1' + '4213cbc8e75212fd27956824ecac1e74e05cb80b4afa1beee8db3f6ae6334443' + '70c24d6615fa720bd787ac86d56fd661736873ffdbb30b8f4c60bafb0e09e5ad' + '9a88613a172987d7ef55809ebf1a795967e7bcf654986ff4623c7546430b0b8a' + 'b5266f8b63ca6d358384822bad1ed7a0e856149f0319eadd84d7a9567088a93b' + '9751a72bc57dd524402999d4dc744daaa7261e87fa337c83b92397e8f3c2fba6' + 'aea7e692aa876fe8c81bff1dc1abed922c6ca43a183fc48d4b51bb7e6cef2299' + 'd4d2f6194175f30f3dfb5c95f4b75df44cd2c451eac43debc11036ccedd3119f' + 'd2a05117adf7b0daa8aa4b5eee1bcb0e1ca6825a75047efb26eed9519d7993d3' + 'cdc74d42a9cba3773cc5948b7c39a8e41761b752c860922fdefcbc289ee9990a' + 'b2cc3901e001e9c0e8906cba06e744b1a04574256059f99bf3c65e3ed27fe30c' + 'a95b268ffb8b2e8f30f3aa7584a5e8ab354228741e3d9ad0b7942bcb57b63850' + 'ad5cc50705b2f139a6f81070693a682fd0a0bb5775cc001103476cd23ddc73ab' + '4f577f6a739fb2927c4f1f2e219eddd5a245f0c088763f7034e6879c83b5be3f' + '4ad655612a31cf43a8dd3116c39e22e17415647a2117f70faa344c7935aa30aa' + 'c6d2b52b2d80d69b54e2c0ff7159f7e1d12a27572d6ea26cbd44fb531a8dc0fe' + '0899e65ed7f83a15fb29af7e161e0879cb51132e81b5ec970c24f5ecc36afae4' + '785771f8db732a948fa3984806ef99060d308a28e2bdc6d3035e0b036eddd762' + 'f751c8c724a5d2b3f778281558ac9a89199a7257f64ca76f47ccd5bbc843355f' + 'ffe5fe6b4ff072f5e3bee914dfc11351bc3961e7f33eafed69b84478eb85292d' + 'c38f79e4b8c611a10720caf54e005b75fdb9fc9695e0b37ee7c760c33fdd77f4' + '899de926db7c206e783cf7f3d795839388cef79a77e52209a96cf891c460d1e9' + 'bc04573076bcb59b103fb2f90d2b0551e8c0974085dce98d4af80bbe73a614b3' + '6882d38451b74058f8875e337fe5c6c7a4a106b6dc19087ea8ec8bb13814d68b' + 'cea1d67f082b5a4cea922c511ab729dff4cfd649db3c7b071ac23584220092c6' + '3382c9072c1a8920578a1961e0dfd1a5877cc3ae6021845d9df82f4ba29beeec' + '6132c9895bbc85787fa9f7fba98e6744998fc7ee6d144efc32dccfaffbe5657e' + '194d0fb0e4b2cacab86c3a33f896d55b9342a3d3830598672de4b767e71d8453' + 'c870804931d7063d7dd7af3893bcd6d21b273f2409abc70ec45394081a42200a' + 'feba9e4ff147372c45c74b616d1b9c5bda4c1708eecd2da4d7b9c5860b3e087a' + 'e1007147d43c293dbc8a6215e0af00c743d59517ac761c263376060fe9deea3c' + '0167a7fb96e623ed1dcb8ff7f8fee4a06f7b74e96cd87313f939eaa5e789e587' + 'c58aa31a402ca0a28d6c7d8384294e2e052aa7ecafd58a9ea4c2e07397c88c3f' + '9a0e76acd2d767ffdff5e37582ace6013eee9c07ccddec2fd367111f3d0f1c07' + 'b4345e18d4b8a2e6e146e4d0cb0969a56c246c637d5ff45c2de7566cfa5ecd77' + '7fac3b2a4e7ebe887ff1637722fd0a4d8736e817df1c9f255fadae23e8aea2ad' + 'c10bf06ce86c932e4bf8e80e5d25c4298b4642da448ffb82a89de6d51c3d4c21' + '1bc7faa6de9908ac58a4d2d3666a7c9b45fca9128eba28b6408204f29bbcd5ad' + '1c0c98e6e2ce6150aee1ca8b85e1d8189a7b2fcd02a430cc08785a05ec231d0c' + '90c06d4db535a4c9ec6cdb82e6be011daa0be48a3faed33ee653281102d2c94d' + '3c15a49603b039f3fe2369801325f7bfc928c48a7d801d62e18304bd50263f5c' + '3f8bd30931f29fb64b6d3e24018628885690a05548e2fe2f553dfa600a9b38ff' + '3ba7d08bcebb55058b2b5d2a134f8ba790729050aeb3f37787fc25708aebb812' + '8072de1f6ff54072822b5daa12f7f03ec9face678e2a791c39b4e90bd427ad32' + '15d2837596e0fe66c049edcce708edcd335dd16d753829813bbe114a6f6d3b64' + 'cd8337276ec3758eefbc6be8d6ad5e9420172611f36cff20178791c6377a6454' + '7fc9581d1e21eb521d7e17d2eb6c42c29cf7da090992dfa982d3ec3fdec33d35' + 'eeea5d40d0d9652522af9745cd520c133d7831c6ab9921a37e98aa09e5f886b1' + 'a716d9e602955b613ccdd3112dade5295cf7788ea256b3eb473b180db5495631' + 'a570b8dd51a7d0cd677d97ffa8a953853ece49e3b3646cefaa79a3a2c5d6715a' + '204902ebe3057e1f8456b2cefb1f45de98089ff06a0e29896977f59f0d427f88' + '74de5a88dbc897387ae49ae520bf4ae6abbdfde609328dc47e5e6bf92fdca58f' + '286e26df606946a02abc744afc47652f515b5bf49d6eaf41fa7ebc527091d31a' + 'd124c3d7c5c64e5d58ea65251acf843c7a9840ad07fba7e66320b6770b1bb627' + '60077b7b57bc9fb33a46c50f7fc4a4d8dd7bc595d5577754abc9450acd9b699f' + 'f16d9a0463f0153be2ce1fb97de669a939de2abb273336cfaaf5197ee24298ba' + '15fce27d400acaf4e8b6906f52b45630820b31705cdd4275bf318d0f0ea7ca76' + 'bc576e90799d911e04d5d0a849cf69e8f7b16203a6d3fa242ea877c7b248dc68' + '33227eaa8be6128d493e20264288c6cdef25c05658802abbc723972e9c20ae7f' + '2febd7ff601d1e898cdc469e21acb73af75c67404d9bb2fd4a85f0daf1ee8b19' + 'f441313d7b5a94c7664b84460e7c54a28eb3eebdf746ac91a0dfc9e5e28c904c' + '4389341d39da0a905e2c068a3ea4c690c73bbd7f776f5c90120c5c96d3584e8c' + '19fd3ac3134443641b750b884286aa3e9bca53ce7b0c510eb03990bc7c01827b' + '09eb6edad897dfecc67c0300e2a3c965456e8544089eeac184d51d581bdd1bd5' + 'ab5be61da63d9e626ab24cb94abaef9dd272b80d3ad1721cb84c0c9673d4eeb1' + 'd24a731946d1eeb2b10e3acef2458078259f17271a88602e305bca2b1ec9b1f1' + '294847acdd6170224b8c6e4264902d7698c8dc7dfdf9909fbcde73b77e562b56' + '5b17efce0754ba9f4c2e1054b87cfc52bdcd3d97a2069a062341a6b20922973d' + '81a68ca41ce94fca4db88685700dff6ca991b28197a6a8d25a41b8c8cba3d0b2' + '412495b7b757c8ae4a91a9a93f40740491f1908544e43cacc79b2d586937f21f' + '79d6df7ca3255fc83b0d757da32bb4e738d2738e43077b3d9d2fbf1d331e9e19' + 'b174c0b8818646f2631f22bb2cdc6f40d0f9e6f11388fad67875b2701ea949b7' + '0fa468b37c54c3faf857928d94310380a8c4775be7b5b8f641160951755936e3' + 'b23d1f68e7c4c8036294abc0ad0bae681ed5e03543b437b079899b69bd53bbda' + '9bd82e248f900023406cbb95294feb98d436749f6261ebc92addc38011f70644' + '8b3a0b9d2972532da541d2cb2e6b91fa922db9000e8ede8cc4c5bdce8be689e7' + '2c2a3e69826f543ee9144f3218dd0a9bd061c817182232f550bb4e44d9c525c7' + '66478434640138aa1533b844377e12b047385d8e375e5c97f88185ddaa72ef31' + '8911ffd4760c1c95ad99f4faa6fca3c908908fbbed4fb3dab99a8f446192e5e2' + 'f447ebdc2f4719794f12fcde2de794a0e0470a38c89db8aaab5100a539fccde0' + '32e3020ac50fc25000e92df557a9890c5ee46ab3cfd402b4e53fe7cbc5076f06' + 'a62971909bc503db6842d434138115b917fdd86194f8c3e1b12daf2281756dad' + 'a83c2faa794149d6f2f7a0645425b893af48e33aaf3f893f064e65e20d72f360' + '842d7ccdb0377f6f90254087db112c3110d19b2aacb28cfaa1e8499d5198bafe' + '73b5f1df4bc5547ac35da2d6878a7d575c945bbb0d9d8de99249ec95fb4e968a' + '53d10f411edf4223c35f5643356a08e10a43429cb4120b0f5c50766d39593f71' + '509d93d8e4043e5060ef5ea47c5bdaeb735ad592d162699b3c7a044fac8d007a' + 'b229bc121c4e9e582d37e34498e16d8f8337b677f6e8e3c947739800edba4282' + '6da7fc39ed6c8618e9bb83694923682840c63cd95a47a7e329e2e6457c640d8c' + 'c4e9f0ac0acc62ebd5225a93493899237ec2ab6bed933e94c5c85befc8484403' + 'f764ba9cc51ae4792a3fcf41ba6009e4d475baa884435d012a882bd1c7500b99' + '0a08f9501f104adb53fa4607b7359dee03d94521f6a2c4773067ae59522c9044' + '12a16d62b5cf3f300160f9bce070191c6158bcf69d66065bf4157d6785f9a233' + '113e7398c9d650d4933a61348ab6e9bcc6150a8dee68daaf8d461efcc180a82c' + '56f28ac0c4ee97de1759b1fe71766fa33ed42622c4a293450819db1d3cb23ed6' + '6feb4cc5fa9e7a5ccb901c5395fb1901e18998932b85eb4d586f94a651deee82' + 'ed7753f26f6137201a51c83b6248072336ca7ecc0bc84f6af699f86fc43d9888' + '4e578eb794d5c596d5c9ef506a4f6da5a34502ce41880d09e2858a9b5f22c22a' + '61230841fadc6b4034a14fe98660bb50e3bf2655f0ab0a7136c7a6fa69966edd' + 'a6116651c9d4cded146398e95ab2e98874fc9ca192b62f5b4f74cc5d57af15ed' + 'd7fa6e7fd9fe3d6526a8c0bfce969e8c7cce8fe585465f0786b096abe303f791' + 'c1f0083ea07591961042f476cacd1a7d7ae0abb0f3730b94c3e67cdca0ade27b' + 'ce11acd1a6089ad94817347fe9a35e6a288e5b5afc8f0ddff9bffd617b8cb82b' + 'f88485b3f587d7793ca3d6a4a0e2a768570a04f9e81d67c58aae5d5cc5b16aa6' + '55033e8ec9ba08e22a509c10e11f30271f032d9181783f99701c4c7e77bb5eb6' + 'fe0e4a3116a5c7a7efb84da66b0317b3004a6d3d9bb0eff93240cf04fbf617e6' + '1230f98066a2d463b3e050c9d3e8364f9002eba576af10faaff81cfd182bd0f3' + '7acb2a9d98dee9592a0ec4fa25877288b268cfdb4f2f1cc8e24bc34599d79f77' + 'c4e3e7903b17056a97af98a7b1e9737b323e51097e967789d3a2796914a8d6af' + 'a0c51295efba6111c9916d26decf810119f56695bdb2776179367ce291a875d4' + '14251dcc7b776b2640941f675be4449addb598537b522c4e574f9a4bc37c65c1' + 'e4d481bc25f6386c6da99e2cbe058b21bc0c68bf8f01c73d3adf60e98f5a506d') From 6fecf00ba11f804127a9f9530d7d9cf39711072c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 22 Sep 2021 09:50:44 +0200 Subject: [PATCH 44/52] curl: Update to 7.79.1 --- mingw-w64-curl/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD index 7ed64651e5..137507aabb 100644 --- a/mingw-w64-curl/PKGBUILD +++ b/mingw-w64-curl/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls" "${MINGW_PACKAGE_PREFIX}-${_realname}-winssl") -pkgver=7.79.0 +pkgver=7.79.1 pkgrel=1 pkgdesc="Command line tool and library for transferring data with URLs. (mingw-w64)" arch=('any') @@ -36,7 +36,7 @@ source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//. "0001-Make-cURL-relocatable.patch" "0002-nghttp2-static.patch" "0003-libpsl-static-libs.patch") -sha256sums=('2a1420076f9ffc35c982c78e85b7a69e2ef5d532267895fdb2eac16ad9b680c9' +sha256sums=('0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689' 'SKIP' '6f1016e6647b6340fdceefaf24ff391f4c0ea3c785ddf70c9794ca2356797888' '6ce4dcf4ef6c4bce48dbcb6f1b5226baf79f74ac76719fb0c06419a0aadb37a3' From 0573d9d1fa600543f8c8a1e38b6e3fd3c949ded0 Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Wed, 22 Sep 2021 18:17:57 +0800 Subject: [PATCH 45/52] Update with vala 0.54.1 --- mingw-w64-vala-language-server/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-vala-language-server/PKGBUILD b/mingw-w64-vala-language-server/PKGBUILD index 92cad5b719..c5bd8d687a 100644 --- a/mingw-w64-vala-language-server/PKGBUILD +++ b/mingw-w64-vala-language-server/PKGBUILD @@ -4,7 +4,7 @@ _realname=vala-language-server pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.48.3 -pkgrel=3 +pkgrel=4 pkgdesc="Vala Language Server for the Vala programming language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') From da8aa3435c727738f8768dc914d25cc0a1f51489 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Wed, 22 Sep 2021 15:42:54 +0300 Subject: [PATCH 46/52] mingw-w64-mesa: Update to 21.2.2 --- mingw-w64-mesa/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-mesa/PKGBUILD b/mingw-w64-mesa/PKGBUILD index 77df59cd19..0220b05f04 100644 --- a/mingw-w64-mesa/PKGBUILD +++ b/mingw-w64-mesa/PKGBUILD @@ -3,7 +3,7 @@ _realname=mesa pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=21.2.1 +pkgver=21.2.2 pkgrel=1 pkgdesc="Open-source implementation of the OpenGL specification (mingw-w64)" arch=('any') @@ -27,7 +27,7 @@ license=('MIT') options=('staticlibs' 'strip') source=(https://mesa.freedesktop.org/archive/${_realname}-${pkgver}.tar.xz{,.sig} llvmwrapgen.sh) -sha256sums=('2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787' +sha256sums=('c4aaf1bf974217ed825e1c536de6ab72a4e266d44bcf69fc4ec499039f99e5c4' 'SKIP' '69f21522f20c10f5699dfe3e128aa88d4fedde816f6e8df1506d7470c44bf3da') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov From f2cc97713b87d014ca8686694ecdc2a005128294 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 22 Sep 2021 13:14:29 +0530 Subject: [PATCH 47/52] libuv: Revert an upstream commit for Win7 support Revert the upstream commit to support Windows 7 because GetHostNameW is supported from Windows 8. But this also reintroduces issue in uv_os_gethostname() which returns grabled code if the name contains non ascii characters --- .../0001-workaround-for-mingw-w64.patch | 10 ---------- mingw-w64-libuv/PKGBUILD | 15 +++++++++++---- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 mingw-w64-libuv/0001-workaround-for-mingw-w64.patch diff --git a/mingw-w64-libuv/0001-workaround-for-mingw-w64.patch b/mingw-w64-libuv/0001-workaround-for-mingw-w64.patch deleted file mode 100644 index 8318dcf6fb..0000000000 --- a/mingw-w64-libuv/0001-workaround-for-mingw-w64.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/win/util.c -+++ b/src/win/util.c -@@ -1662,6 +1662,7 @@ - return 0; - } - -+WINSOCK_API_LINKAGE int WSAAPI GetHostNameW(PWSTR name, int namelen); - - int uv_os_gethostname(char* buffer, size_t* size) { - WCHAR buf[UV_MAXHOSTNAMESIZE]; diff --git a/mingw-w64-libuv/PKGBUILD b/mingw-w64-libuv/PKGBUILD index 15773c5bf0..4c5fca6ee6 100644 --- a/mingw-w64-libuv/PKGBUILD +++ b/mingw-w64-libuv/PKGBUILD @@ -5,7 +5,7 @@ _realname=libuv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.42.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform asynchronous I/O (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -15,16 +15,23 @@ makedepends=() depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('staticlibs' 'strip') source=(https://dist.libuv.org/dist/v${pkgver}/libuv-v${pkgver}.tar.gz{,.sign} - "0001-workaround-for-mingw-w64.patch") + "string-encoding-uv_os_gethostname.patch::https://github.com/libuv/libuv/commit/95f88f4.patch") sha256sums=('43129625155a8aed796ebe90b8d4c990a73985ec717de2b2d5d3a23cfe4deb72' 'SKIP' - '2422256061c8d77b2646bc1d162d0922eea1185f5f004bd49689ec1894d67770') + '18e4c2af57254f0550c684d48b259b54f9bcad27b4286aad1d8c4e5ec0932fc5') # PGP key IDs are available from https://github.com/libuv/libuv/blob/v1.x/MAINTAINERS.md validpgpkeys=('AEAD0A4B686767751A0E4AEF34A25FB128246514') # Jameson Nash " prepare() { cd "${srcdir}/${_realname}-v${pkgver}" - patch -p1 -i "${srcdir}/0001-workaround-for-mingw-w64.patch" + + # Revert the upstream commit to support Windows 7 because + # GetHostNameW is supported from Windows 8. But this also + # reintroduces issue in uv_os_gethostname() which returns + # grabled code if the name contains non ascii characters + # https://github.com/msys2/MINGW-packages/issues/9632 + + patch -R -p1 -i "${srcdir}/string-encoding-uv_os_gethostname.patch" ./autogen.sh } From 32ca0b78e5d607c76ffb3a2265bea3ef14150fc9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 22 Sep 2021 19:40:55 +0200 Subject: [PATCH 48/52] tzdata: enable for clangarm64 new dep for python --- mingw-w64-tzdata/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-tzdata/PKGBUILD b/mingw-w64-tzdata/PKGBUILD index 24fa22711a..b51b56c568 100644 --- a/mingw-w64-tzdata/PKGBUILD +++ b/mingw-w64-tzdata/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2021a pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://www.iana.org/time-zones" license=('custom: public domain') options=('!emptydirs') From 6355d3a54be81da9053eb5392fb6a40b423119e3 Mon Sep 17 00:00:00 2001 From: Rafal Date: Wed, 22 Sep 2021 20:26:19 +0200 Subject: [PATCH 49/52] Update PKGBUILD --- mingw-w64-pastix/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-pastix/PKGBUILD b/mingw-w64-pastix/PKGBUILD index 773778f206..bc80cf94f7 100644 --- a/mingw-w64-pastix/PKGBUILD +++ b/mingw-w64-pastix/PKGBUILD @@ -4,7 +4,7 @@ _realname=pastix pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=6.2.1 -pkgrel=2 +pkgrel=3 pkgdesc='High performance parallel solver for very large sparse linear systems based on direct methods (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -16,11 +16,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cmake") -provides=('spm') +provides=("${MINGW_PACKAGE_PREFIX}-spm") license=('LGPL') url="https://gitlab.inria.fr/solverstack/pastix" -source=("https://gitlab.inria.fr/solverstack/pastix//uploads/baa57033d98378e0f3affbf45900fb6e/${_realname}-${pkgver}.tar.gz") -sha256sums=('50742CC0E6E03728F7529FC607D5C65B9E14205F192947678D6103A872A6210C') +source=("https://gitlab.inria.fr/solverstack/pastix//uploads/3fc798eb3ca6282e21506349df7f9da2/${_realname}-${pkgver}.tar.gz") +sha256sums=('B680CBFC265DF8CBA18D3A7093FCC02E260198C4A2D6A86D1E684BB291E309DD') build() { local _arch_opt="" From 7ccb67de23ceef14240c16b8b78e4a2c7b52772a Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Wed, 22 Sep 2021 11:27:44 -0700 Subject: [PATCH 50/52] libvirt-glib: update to 4.0.0, which uses meson --- .../001-disable-glib-max-version.patch | 10 +++ mingw-w64-libvirt-glib/001-win.patch | 12 ---- .../002-disable-stack-protector-windows.patch | 11 ++++ mingw-w64-libvirt-glib/PKGBUILD | 63 +++++++++++-------- 4 files changed, 58 insertions(+), 38 deletions(-) create mode 100644 mingw-w64-libvirt-glib/001-disable-glib-max-version.patch delete mode 100644 mingw-w64-libvirt-glib/001-win.patch create mode 100644 mingw-w64-libvirt-glib/002-disable-stack-protector-windows.patch diff --git a/mingw-w64-libvirt-glib/001-disable-glib-max-version.patch b/mingw-w64-libvirt-glib/001-disable-glib-max-version.patch new file mode 100644 index 0000000000..83948d6741 --- /dev/null +++ b/mingw-w64-libvirt-glib/001-disable-glib-max-version.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2021-09-22 11:56:17.941233800 -0700 ++++ b/meson.build 2021-09-22 11:58:57.734639500 -0700 +@@ -51,7 +51,6 @@ + libxml_dep = dependency('libxml-2.0', version: libxml_min_version) + + add_global_arguments('-DGLIB_VERSION_MIN_REQUIRED=@0@'.format(glib_min_version_symbol), language: 'c') +-add_global_arguments('-DGLIB_VERSION_MAX_ALLOWED=@0@'.format(glib_min_version_symbol), language: 'c') + + prefix = get_option('prefix') + localedir = join_paths(prefix, get_option('localedir')) diff --git a/mingw-w64-libvirt-glib/001-win.patch b/mingw-w64-libvirt-glib/001-win.patch deleted file mode 100644 index 308d9de6e2..0000000000 --- a/mingw-w64-libvirt-glib/001-win.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./libvirt-gobject/Makefile.am.orig 2016-07-18 10:03:46.534356500 +0200 -+++ ./libvirt-gobject/Makefile.am 2016-07-18 10:06:01.550863500 +0200 -@@ -94,7 +94,8 @@ - $(COVERAGE_CFLAGS:-f%=-Wc,f%) \ - $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \ - -Wl,--version-script=$(srcdir)/libvirt-gobject.sym \ -- -version-info $(LIBVIRT_GLIB_VERSION_INFO) -+ -version-info $(LIBVIRT_GLIB_VERSION_INFO) \ -+ -no-undefined - - libvirt-gobject-enums.c: $(libvirt_gobject_1_0_la_HEADERS) - $(AM_V_GEN)glib-mkenums \ diff --git a/mingw-w64-libvirt-glib/002-disable-stack-protector-windows.patch b/mingw-w64-libvirt-glib/002-disable-stack-protector-windows.patch new file mode 100644 index 0000000000..3993b35233 --- /dev/null +++ b/mingw-w64-libvirt-glib/002-disable-stack-protector-windows.patch @@ -0,0 +1,11 @@ +--- a/meson.build 2021-09-22 11:56:17.941233800 -0700 ++++ b/meson.build 2021-09-22 12:20:40.171597100 -0700 +@@ -381,7 +381,7 @@ + + # on aarch64 error: -fstack-protector not supported for this target + if host_machine.cpu_family() != 'aarch64' +- if host_machine.system() in [ 'linux', 'freebsd', 'windows' ] ++ if host_machine.system() in [ 'linux', 'freebsd' ] + # we prefer -fstack-protector-strong but fallback to -fstack-protector-all + fstack_cflags = cc.first_supported_argument([ + '-fstack-protector-strong', diff --git a/mingw-w64-libvirt-glib/PKGBUILD b/mingw-w64-libvirt-glib/PKGBUILD index 32fd186f45..f599e0f91d 100644 --- a/mingw-w64-libvirt-glib/PKGBUILD +++ b/mingw-w64-libvirt-glib/PKGBUILD @@ -3,59 +3,70 @@ _realname=libvirt-glib pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.0.0 +pkgver=4.0.0 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="libvirt GLib and GObject mapping library (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-glib2" + #"${MINGW_PACKAGE_PREFIX}-libssp" # disabled due to gir issue "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-libvirt") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "gtk-doc" +makedepends=("${MINGW_PACKAGE_PREFIX}-meson" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-pkg-config") -options=('!strip' 'debug' 'staticlibs') +options=('strip' '!debug' 'staticlibs') license=("LGPL 2.1") url="https://www.gnome.org/" #install=${_realname}-${CARCH}.install -source=(https://libvirt.org/sources/glib/${_realname}-${pkgver}.tar.gz - 001-win.patch) -sha256sums=('7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe' - '8f787245ffc5d91f628c1965a45baf0af61eb3afcf4da8642b763e578275c6c9') +source=(https://libvirt.org/sources/glib/${_realname}-${pkgver}.tar.xz{,.asc} + 001-disable-glib-max-version.patch + 002-disable-stack-protector-windows.patch) +sha256sums=('8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd' + 'SKIP' + 'e61628e47a80adc66e215a81c8d4eeac4b556b85c3bc96553a8ab6dc49e8f33b' + '5861775ea76ce66219d0494a726a59ecc8015e89be3f4ec4c3765fe561c76cda') +validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF') # Daniel P. Berrange prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-win.patch - autoreconf -fi + patch -Nbp1 -i "${srcdir}/001-disable-glib-max-version.patch" + # https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/176, + # via https://github.com/mesonbuild/meson/issues/1910. + # Blowing up with -fstack-protector on mingw for the same reasons + patch -Nbp1 -i "${srcdir}/002-disable-stack-protector-windows.patch" } build() { [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} - mkdir -p build-${MINGW_CHOST} - cd build-${MINGW_CHOST} + mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} - mkdir -p docs/libvirt-gconfig/html - cp -rf ../${_realname}-${pkgver}/docs/libvirt-gconfig/html/* docs/libvirt-gconfig/html - mkdir -p docs/libvirt-glib/html - cp -rf ../${_realname}-${pkgver}/docs/libvirt-glib/html/* docs/libvirt-glib/html - mkdir -p docs/libvirt-gobject/html - cp -rf ../${_realname}-${pkgver}/docs/libvirt-gobject/html/* docs/libvirt-gobject/html + declare -a _extra_config + if check_option "debug" "n"; then + _extra_config+=("--buildtype=release") + else + _extra_config+=("--buildtype=debug") + fi - ../${_realname}-${pkgver}/configure \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --build=${MINGW_CHOST} \ - --prefix=${MINGW_PREFIX} \ - --libexecdir=${MINGW_PREFIX}/lib + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/meson.exe \ + --prefix="${MINGW_PREFIX}" \ + "${_extra_config[@]}" \ + --wrap-mode=nodownload \ + --default-library=both \ + --auto-features=enabled \ + -Dgit_werror=disabled \ + "../${_realname}-${pkgver}" - make + ${MINGW_PREFIX}/bin/meson.exe compile } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR=$pkgdir install + + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } From a9a24161637b4f85cfbd3591fe3c4cfce7f4c217 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Wed, 22 Sep 2021 12:35:40 -0700 Subject: [PATCH 51/52] virt-viewer: rebuild for libvirt-glib --- mingw-w64-virt-viewer/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-virt-viewer/PKGBUILD b/mingw-w64-virt-viewer/PKGBUILD index 3f08e8c12e..baa4591cd9 100644 --- a/mingw-w64-virt-viewer/PKGBUILD +++ b/mingw-w64-virt-viewer/PKGBUILD @@ -4,7 +4,7 @@ _realname=virt-viewer pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=9.0 -pkgrel=1 +pkgrel=2 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') pkgdesc="Displaying the graphical console of a virtual machine (mingw-w64)" From 09bcd69373f64bf1d0a9e65cb0167b955836a1b7 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 23 Sep 2021 01:54:25 +0530 Subject: [PATCH 52/52] libvirt: Update to 7.7.0 Add check function and pgp key --- mingw-w64-libvirt/PKGBUILD | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mingw-w64-libvirt/PKGBUILD b/mingw-w64-libvirt/PKGBUILD index 8b2b2bf7c8..c85a4b163a 100644 --- a/mingw-w64-libvirt/PKGBUILD +++ b/mingw-w64-libvirt/PKGBUILD @@ -3,9 +3,9 @@ _realname=libvirt pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -_pkgdev=7.0.0 +_pkgdev=7.7.0 pkgver=${_pkgdev//-/} -pkgrel=2 +pkgrel=1 pkgdesc="Windows libvirt virtualization library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -24,9 +24,7 @@ depends=(${MINGW_PACKAGE_PREFIX}-curl ${MINGW_PACKAGE_PREFIX}-portablexdr ${MINGW_PACKAGE_PREFIX}-readline ${MINGW_PACKAGE_PREFIX}-yajl) -makedepends=(${MINGW_PACKAGE_PREFIX}-gcc - ${MINGW_PACKAGE_PREFIX}-meson - ${MINGW_PACKAGE_PREFIX}-ninja +makedepends=(${MINGW_PACKAGE_PREFIX}-meson ${MINGW_PACKAGE_PREFIX}-pkg-config ${MINGW_PACKAGE_PREFIX}-python ${MINGW_PACKAGE_PREFIX}-python-docutils @@ -34,16 +32,18 @@ makedepends=(${MINGW_PACKAGE_PREFIX}-gcc rpcsvc-proto perl) options=('strip' 'staticlibs') -source=(https://libvirt.org/sources/${_realname}-${_pkgdev}.tar.xz +source=("https://libvirt.org/sources/${_realname}-${_pkgdev}.tar.xz"{,.asc} 001-fix-not-supported-authenticate-method.patch 002-search-path.patch msys-rpcgen-as-portable.patch meson-drop-path-for-python.patch) -sha256sums=('ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89' +sha256sums=('1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2' + 'SKIP' '4635fd04e596879186b74ef9ddbacf64f6058e32bfd8d8376e1b7fa7838f679b' '38ced91a3a7f569ecaa4d738c1fe530604bf96ed26458559be398e30a2fa1829' '54eb6af16a1d001eab81dbc4352ff82a2349242d9f9f3f87eb45f75e8fc8a08d' 'fda18a489451cee114a6f02fd561afe8731e1a30cf70b754bcca6434176859ad') +validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark noextract=(${_realname}-${_pkgdev}.tar.xz) prepare() { @@ -92,12 +92,17 @@ build() { -Dexpensive_tests=disabled \ ../${_realname}-${_pkgdev%-*} - ninja + meson compile +} + +check() { + cd ${srcdir}/build-${MINGW_CHOST} + meson test || true } package() { cd ${srcdir}/build-${MINGW_CHOST} - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" meson install install -Dm644 ${srcdir}/${_realname}-${_pkgdev%-*}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" install -Dm644 ${srcdir}/${_realname}-${_pkgdev%-*}/COPYING.LESSER "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER"