diff --git a/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 3c896716d8..346e3e9e1b 100644 --- a/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -16,7 +16,7 @@ diff -Naur Python-3.7.0-orig/configure.ac Python-3.7.0/configure.ac +esac + AC_SUBST(SRCDIRS) - SRCDIRS="Parser Objects Python Modules Programs" + SRCDIRS="Parser Objects Python Modules Modules/_io Programs" +case $host in + *-*-mingw*) SRCDIRS="$SRCDIRS PC";; +esac diff --git a/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch index ea6623fc77..e71b2f24d4 100644 --- a/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -11,18 +11,6 @@ diff -Naur Python-3.7.0-orig/Modules/_winapi.c Python-3.7.0/Modules/_winapi.c #include "winreparse.h" #if defined(MS_WIN32) && !defined(MS_WIN64) -diff -Naur Python-3.7.0-orig/Modules/main.c Python-3.7.0/Modules/main.c ---- Python-3.7.0-orig/Modules/main.c 2018-06-27 06:07:35.000000000 +0300 -+++ Python-3.7.0/Modules/main.c 2018-07-12 10:21:21.496753800 +0300 -@@ -18,7 +18,7 @@ - # endif - #endif - --#ifdef _MSC_VER -+#if defined(_WIN32) && defined(Py_DEBUG) - # include - #endif - diff -Naur Python-3.7.0-orig/PC/msvcrtmodule.c Python-3.7.0/PC/msvcrtmodule.c --- Python-3.7.0-orig/PC/msvcrtmodule.c 2018-06-27 06:07:35.000000000 +0300 +++ Python-3.7.0/PC/msvcrtmodule.c 2018-07-12 10:21:21.512353900 +0300 diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python3/0500-add-python-config-sh.patch index 134f874163..af65d877ca 100644 --- a/mingw-w64-python3/0500-add-python-config-sh.patch +++ b/mingw-w64-python3/0500-add-python-config-sh.patch @@ -55,7 +55,7 @@ # locations. Keep prefix & exec_prefix using their original values in case # they are referenced in other configure variables, to prevent double # substitution, issue #22140. -@@ -41,13 +53,17 @@ +@@ -41,12 +53,16 @@ LIBC="@LIBC@" SYSLIBS="$LIBM $LIBC" ABIFLAGS="@ABIFLAGS@" @@ -66,12 +66,10 @@ LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" BASECFLAGS="@BASECFLAGS@" -LDLIBRARY="@LDLIBRARY@" --LINKFORSHARED="@LINKFORSHARED@" OPT="@OPT@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" +LDLIBRARY="@LDLIBRARY@" -+LINKFORSHARED="@LINKFORSHARED@" LIBDEST=${prefix_real}/lib/python${VERSION} LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#") SO="@EXT_SUFFIX@" @@ -121,8 +119,8 @@ if [ "$PY_ENABLE_SHARED" = "0" ] ; then LIBPLUSED="-L$LIBPL" fi -- echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" -+ echo -ne "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED " +- echo "$LIBPLUSED -L$libdir $LIBS" ++ echo -ne "$LIBPLUSED -L$libdir $LIBS " ;; --extension-suffix) - echo "$SO" diff --git a/mingw-w64-python3/2040-make-default-python.patch b/mingw-w64-python3/2040-make-default-python.patch new file mode 100644 index 0000000000..112c198850 --- /dev/null +++ b/mingw-w64-python3/2040-make-default-python.patch @@ -0,0 +1,18 @@ +--- Python-3.7.4/Makefile.pre.in.orig 2019-07-09 11:16:23.393804800 +0300 ++++ Python-3.7.4/Makefile.pre.in 2019-07-09 12:15:23.141089200 +0300 +@@ -1252,12 +1252,15 @@ + else true; \ + fi + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python$(EXE)) + -if test "$(VERSION)" != "$(LDVERSION)"; then \ + rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ + rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ + fi ++ -rm -f $(DESTDIR)$(BINDIR)/python-config ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) + -rm -f $(DESTDIR)$(BINDIR)/python3-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) + -rm -f $(DESTDIR)$(LIBPC)/python3.pc diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index 9c3689012c..aa52fc0b2b 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -17,8 +17,8 @@ _realname=python3 pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" _pybasever=3.7 -pkgver=${_pybasever}.3 -pkgrel=5 +pkgver=${_pybasever}.4 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -28,7 +28,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-libffi" "${MINGW_PACKAGE_PREFIX}-mpdecimal" - "${MINGW_PACKAGE_PREFIX}-pdcurses" + "${MINGW_PACKAGE_PREFIX}-ncurses" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-tcl" "${MINGW_PACKAGE_PREFIX}-tk" @@ -128,6 +128,7 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 2010-configure-have-inet-pton.patch 2020-use-_wcsnicmp-instead-wcsncasecmp.patch 2030-fix-msvc9-import.patch + 2040-make-default-python.patch smoketests.py) # Helper macros to help make tasks easier # @@ -280,7 +281,8 @@ prepare() { 1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch \ 1850-disable-readline.patch \ 1860-fix-isselectable.patch \ - 2020-use-_wcsnicmp-instead-wcsncasecmp.patch + 2020-use-_wcsnicmp-instead-wcsncasecmp.patch \ + 2040-make-default-python.patch apply_patch_with_msg 2000-warnings-fixes.patch @@ -438,7 +440,8 @@ package() { sed -e "s|${MINGW_PREFIX}|${PREFIX_WIN}|" \ -i "${pkgdir}${MINGW_PREFIX}"/bin/python${VERABI}-config \ -i "${pkgdir}${MINGW_PREFIX}"/bin/python${_pybasever}-config \ - -i "${pkgdir}${MINGW_PREFIX}"/bin/python3-config + -i "${pkgdir}${MINGW_PREFIX}"/bin/python3-config \ + -i "${pkgdir}${MINGW_PREFIX}"/bin/python-config # replace paths in sysconfig sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \ @@ -447,7 +450,7 @@ package() { } -sha256sums=('da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318' +sha256sums=('fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f' 'a2e92cf57985b93bb6203b26c84140610378bd1eb57e8ab8f00e0c0f9afb7b75' '8b2c7d6b3d0efec48f44c1e46be25fcfb4ba6711ca49b93cf9fa40fb4f0966b6' 'b2111d31e812b33e5cec85f6505bd730975dd242f8eb138307f71ffe0d7fdf6b' @@ -456,7 +459,7 @@ sha256sums=('da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318' 'cac9b0ec37bd5fb6e21fa6b4708242b160b60de1e7cdfaa7a843b4f5e1a0e498' '3028e28ce3c76e2cde223c39ef903b789015773834b69260b4116adb22b31e7b' 'e05770b5fc8126141ee21ccb252a126d366c4249253ab7a2aeafafbd2e1d4f54' - '2556db898b65b642455161839e9682d07a3910359a8367db6b73b8abd3a02047' + '850052f215e0bcaec7723689233dc0e6dbf4b3dc1d97e02b7727bfaa22378296' '8946c6ee9dab5ed24c083a82e71d74013a3690afc7e98f58d239d2afb1fbef70' 'b026d5fa0eddeda532d4a3352b4d6f5506593cef0aae4c361be791faedd45bd7' '578e395e45ce69445639b0bb1ad9c09934acfa6090d4bca96d0955a4b325ace8' @@ -473,7 +476,7 @@ sha256sums=('da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318' 'c629be9a191948eff146f07dcb09c760ab55acfd08639dfc94dc1bc43160012f' '92d106d0dbc273cb08cb52759ba8467e16e6d61019eeb3464397822b991ed861' '8e2ae92f24ca52b16215612a57fe5076d5b0ea1cc0923d5ab9bd7395b6330816' - 'b21b63eb077c4ed9380034957034d9fc726992e34abd9185d9f57080e088b4e8' + '430340435a7e1ab01c372e88008c45e7fef938fb547f5c95464ca69010184d5c' '4f28511452f8c56aadc79e6e1079531aad94392778f9a62090e9c423487baf4c' 'd555fac5000a86ade7a1c191d3eb09bdb8aa46d0beb73e54e6243731fae35e8f' '4fb0f33a99784b2f397adc013591c64bdbdbb8e7a4f839880a8fc4678ee2b435' @@ -484,7 +487,7 @@ sha256sums=('da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318' 'a14d40567e6bf6d08fab55e95a56495eb6fcdfc9d06d80b959b487df26481190' 'a8b2096f3b4a26d32a325e778ed47cd921d40a1ef481a0387a5ff3592d5d9c77' 'c0fa618b89fd43b27862f4c765926f19cf5679a46e8af3d8eb918a648e33429b' - '4802eceab9a147fc1cddaadf84917839edfca0b3dcd33d3be92e4c2edde3c726' + 'a562224902cb31ffbc31f868c34faf5db05444bebfdf502649fe8a29cd679c2d' 'f0d20525f42387153cf82e2d4a3139a7b7a39a7408833c8b02e9c072a9967674' '8bd4dddfda38e8dae700eca868693cba3b2fb766088b46a52a4ac475e9e6b25e' 'a88ed0a61dcb0a860286ab1d6bf489b272a670625687924943713a58c6068a94' @@ -537,4 +540,5 @@ sha256sums=('da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318' '150dc7a5c59ef82b0bf258a2cd4233f2975fb89818849de39c185ce368a124ab' '2d6605515648ef3ffe53e417719d4d51a7a2a79566e26e920733422dfd3751cb' '6c4b0c469f3c04e5586553b7e4e8e30e8e36163f30d4139605b7c0eddf994347' + '0f6c62a8b11198216e42b88f294e01150d255a6da72fb75c6677f64cc7a4a092' '821402ddaef92140c70041b007bcf15e1cd5fe0fdb9f4f612da868382cc24585')