From 975704607739bab3ce3cf782e65190880609d626 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 15 Jun 2017 16:40:51 +0200 Subject: [PATCH] python3: Update to 3.6.1 (#2587) * python3: Update to 3.6.1 The patches starting with 16 are new to fix the build. Some no longer relevant patches were dropped, the rest is just refreshed. * Bump pkgrel of all packages containing Python 3 bytecode/extensions. The package list was generated using: pkgfile.exe -R mingw64 -r "cpython.*\\.(py[cod]|dll)" * lensfun: Add cmake to makedepends * numpy: Don't hardcode the Python version * blender: rebuild for new Python * boost: Don't hardcode Python versions; rebuild * pillow: Don't hardcode Python version; rebuild * python-dateutil: Don't hardcode Python versions * sip: Don't hardcode Python versions * pyqt4: Don't hardcode Python versions; rebuild * pyqt5: Don't hardcode Python versions; rebuild * opencv: Update Python3 version in patch --- .../0001-mingw-buildsystem.patch | 2 +- mingw-w64-blender/0001-mingw-cmake.patch | 2 +- mingw-w64-blender/PKGBUILD | 9 +- mingw-w64-boost/PKGBUILD | 9 +- mingw-w64-cython/PKGBUILD | 2 +- mingw-w64-gst-python/PKGBUILD | 2 +- mingw-w64-lensfun/PKGBUILD | 5 +- mingw-w64-meson/PKGBUILD | 2 +- mingw-w64-miniupnpc/PKGBUILD | 2 +- .../0005-opencv-support-python-3.5.patch | 2 +- mingw-w64-opencv/PKGBUILD | 4 +- mingw-w64-pycairo/PKGBUILD | 2 +- mingw-w64-pygobject/PKGBUILD | 2 +- mingw-w64-pygobject2/PKGBUILD | 2 +- mingw-w64-pyqt4/PKGBUILD | 10 +- mingw-w64-pyqt5/PKGBUILD | 10 +- mingw-w64-pyside-qt4/PKGBUILD | 2 +- mingw-w64-pyside-tools-qt4/PKGBUILD | 2 +- mingw-w64-python-appdirs/PKGBUILD | 2 +- mingw-w64-python-babel/PKGBUILD | 2 +- mingw-w64-python-beaker/PKGBUILD | 2 +- mingw-w64-python-beautifulsoup4/PKGBUILD | 2 +- mingw-w64-python-bsddb3/PKGBUILD | 2 +- mingw-w64-python-characteristic/PKGBUILD | 2 +- mingw-w64-python-chardet/PKGBUILD | 2 +- mingw-w64-python-colorama/PKGBUILD | 2 +- mingw-w64-python-coverage/PKGBUILD | 2 +- mingw-w64-python-csssselect/PKGBUILD | 2 +- mingw-w64-python-cvxopt/PKGBUILD | 2 +- mingw-w64-python-cx_Freeze/PKGBUILD | 2 +- mingw-w64-python-cycler/PKGBUILD | 2 +- mingw-w64-python-dateutil/PKGBUILD | 14 ++- mingw-w64-python-decorator/PKGBUILD | 2 +- mingw-w64-python-distutils-extra/PKGBUILD | 2 +- mingw-w64-python-docutils/PKGBUILD | 2 +- mingw-w64-python-et-xmlfile/PKGBUILD | 2 +- mingw-w64-python-funcsigs/PKGBUILD | 2 +- mingw-w64-python-h5py/PKGBUILD | 2 +- mingw-w64-python-html5lib/PKGBUILD | 2 +- mingw-w64-python-httplib2/PKGBUILD | 2 +- mingw-w64-python-icu/PKGBUILD | 2 +- mingw-w64-python-idna/PKGBUILD | 2 +- mingw-w64-python-imagesize/PKGBUILD | 2 +- mingw-w64-python-ipython_genutils/PKGBUILD | 2 +- mingw-w64-python-jdcal/PKGBUILD | 2 +- mingw-w64-python-jinja/PKGBUILD | 2 +- mingw-w64-python-lhafile/PKGBUILD | 2 +- mingw-w64-python-lxml/PKGBUILD | 2 +- mingw-w64-python-mako/PKGBUILD | 2 +- mingw-w64-python-markupsafe/PKGBUILD | 2 +- mingw-w64-python-matplotlib/PKGBUILD | 2 +- mingw-w64-python-mistune/PKGBUILD | 2 +- mingw-w64-python-mock/PKGBUILD | 2 +- mingw-w64-python-networkx/PKGBUILD | 2 +- mingw-w64-python-nose/PKGBUILD | 2 +- mingw-w64-python-nuitka/PKGBUILD | 2 +- mingw-w64-python-numexpr/PKGBUILD | 2 +- mingw-w64-python-numpy/PKGBUILD | 6 +- mingw-w64-python-openmdao/PKGBUILD | 2 +- mingw-w64-python-openpyxl/PKGBUILD | 2 +- mingw-w64-python-packaging/PKGBUILD | 2 +- mingw-w64-python-pandas/PKGBUILD | 2 +- mingw-w64-python-path/PKGBUILD | 2 +- mingw-w64-python-patsy/PKGBUILD | 2 +- mingw-w64-python-pbr/PKGBUILD | 2 +- mingw-w64-python-pdfrw/PKGBUILD | 2 +- mingw-w64-python-pgen2/PKGBUILD | 2 +- mingw-w64-python-pickleshare/PKGBUILD | 2 +- mingw-w64-python-pillow/PKGBUILD | 10 +- mingw-w64-python-pip/PKGBUILD | 2 +- mingw-w64-python-pptx/PKGBUILD | 2 +- mingw-w64-python-pretend/PKGBUILD | 2 +- mingw-w64-python-prompt_toolkit/PKGBUILD | 2 +- mingw-w64-python-psutil/PKGBUILD | 2 +- mingw-w64-python-py/PKGBUILD | 2 +- mingw-w64-python-pyasn1-modules/PKGBUILD | 2 +- mingw-w64-python-pyasn1/PKGBUILD | 2 +- mingw-w64-python-pycparser/PKGBUILD | 2 +- mingw-w64-python-pygments/PKGBUILD | 2 +- mingw-w64-python-pyparsing/PKGBUILD | 2 +- mingw-w64-python-pytest/PKGBUILD | 2 +- mingw-w64-python-pytz/PKGBUILD | 2 +- mingw-w64-python-pyzmq/PKGBUILD | 2 +- mingw-w64-python-reportlab/PKGBUILD | 2 +- mingw-w64-python-requests/PKGBUILD | 2 +- mingw-w64-python-rst2pdf/PKGBUILD | 2 +- mingw-w64-python-scipy/PKGBUILD | 2 +- mingw-w64-python-setuptools/PKGBUILD | 2 +- mingw-w64-python-simplegeneric/PKGBUILD | 2 +- mingw-w64-python-six/PKGBUILD | 2 +- mingw-w64-python-snowballstemmer/PKGBUILD | 2 +- .../PKGBUILD | 2 +- mingw-w64-python-sphinx/PKGBUILD | 2 +- mingw-w64-python-sphinx_rtd_theme/PKGBUILD | 2 +- mingw-w64-python-sqlitedict/PKGBUILD | 2 +- mingw-w64-python-statsmodels/PKGBUILD | 2 +- mingw-w64-python-traitlets/PKGBUILD | 2 +- mingw-w64-python-wcwidth/PKGBUILD | 2 +- mingw-w64-python-webencodings/PKGBUILD | 2 +- mingw-w64-python-win_unicode_console/PKGBUILD | 2 +- mingw-w64-python-xlsxwriter/PKGBUILD | 2 +- mingw-w64-python-yaml/PKGBUILD | 2 +- mingw-w64-python-zope.event/PKGBUILD | 2 +- mingw-w64-python-zope.interface/PKGBUILD | 2 +- .../0100-MINGW-BASE-use-NT-thread-model.patch | 29 +++-- ...gcc-internal-defines-to-python-platf.patch | 11 +- ...0140-MINGW-preset-configure-defaults.patch | 14 +-- ...largefile-support-for-windows-builds.patch | 21 +--- ...GW-add-wincrypt.h-in-Python-random.c.patch | 16 --- ...190-MINGW-detect-REPARSE_DATA_BUFFER.patch | 75 ------------- ...INGW-build-in-windows-modules-winreg.patch | 25 ++--- ...etermine-if-pwdmodule-should-be-used.patch | 12 +-- ...s.path-calculations-for-windows-plat.patch | 53 ++++------ ...-AC_LIBOBJ-replacement-of-fileblocks.patch | 5 +- .../0320-MINGW-implement-exec-prefix.patch | 32 +++--- ...up-_ctypes-module-with-system-libffi.patch | 11 +- ...ead-rename-to-avoid-failure-on-windo.patch | 9 +- .../0490-MINGW-customize-site.patch | 11 +- ...520-py3k-mingw-ntthreads-vs-pthreads.patch | 4 +- .../0550-mingw-regen-use-stddef_h.patch | 26 ----- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 90 +++++++--------- .../0560-mingw-use-posix-getpath.patch | 9 -- ...mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch | 11 -- ...builtin_for_Popen_in_cygwinccompiler.patch | 4 +- ...-msys-convert_path-fix-and-root-hack.patch | 8 +- ...OSS-avoid-ncursesw-include-path-hack.patch | 13 --- mingw-w64-python3/0750-builddir-fixes.patch | 19 ++-- ...place-slashes-used-in-io-redirection.patch | 19 ++-- .../0830-ctypes-python-dll.patch | 10 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 13 ++- ...compat-GetProcAddress-GetTickCount64.patch | 12 +-- ...rocAddress-GetFinalPathNameByHandleW.patch | 13 --- mingw-w64-python3/1010-install-msilib.patch | 11 +- .../1600-fix-disable-blake2-sse.patch | 11 ++ mingw-w64-python3/1610-fix-have-wspawnv.patch | 10 ++ .../1620-fix-signal-module-build.patch | 11 ++ .../1630-build-winconsoleio.patch | 11 ++ .../1640-dont-include-consoleapi-h.patch | 11 ++ mingw-w64-python3/PKGBUILD | 100 ++++++++++-------- mingw-w64-shiboken-qt4/PKGBUILD | 2 +- mingw-w64-sip/PKGBUILD | 14 ++- mingw-w64-waf/PKGBUILD | 2 +- 142 files changed, 447 insertions(+), 578 deletions(-) delete mode 100644 mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch delete mode 100644 mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch delete mode 100644 mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch delete mode 100644 mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch delete mode 100644 mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch create mode 100644 mingw-w64-python3/1600-fix-disable-blake2-sse.patch create mode 100644 mingw-w64-python3/1610-fix-have-wspawnv.patch create mode 100644 mingw-w64-python3/1620-fix-signal-module-build.patch create mode 100644 mingw-w64-python3/1630-build-winconsoleio.patch create mode 100644 mingw-w64-python3/1640-dont-include-consoleapi-h.patch diff --git a/mingw-w64-blender/0001-mingw-buildsystem.patch b/mingw-w64-blender/0001-mingw-buildsystem.patch index 71183eadad..caac630a26 100644 --- a/mingw-w64-blender/0001-mingw-buildsystem.patch +++ b/mingw-w64-blender/0001-mingw-buildsystem.patch @@ -178,7 +178,7 @@ + +if(WITH_PYTHON) + # normally cached but not since we include them with blender -+ set(PYTHON_VERSION 3.5) # CACHE STRING) ++ set(PYTHON_VERSION 3.6) # CACHE STRING) + set(PYTHON_INCLUDE_DIR "${LIBDIR}/include/python${PYTHON_VERSION}m") # CACHE PATH) + set(PYTHON_LIBRARY "${LIBDIR}/lib/libpython${PYTHON_VERSION}m.dll.a") # CACHE FILEPATH) + # uncached vars diff --git a/mingw-w64-blender/0001-mingw-cmake.patch b/mingw-w64-blender/0001-mingw-cmake.patch index 0a4974a742..f6d4e90b42 100644 --- a/mingw-w64-blender/0001-mingw-cmake.patch +++ b/mingw-w64-blender/0001-mingw-cmake.patch @@ -33,7 +33,7 @@ diff -Naur blender-2.77a-orig/CMakeLists.txt blender-2.77a/CMakeLists.txt - + if(MINGW) + # normally cached but not since we include them with blender -+ set(PYTHON_VERSION 3.5) # CACHE STRING) ++ set(PYTHON_VERSION 3.6) # CACHE STRING) + set(PYTHON_INCLUDE_DIR "${LIBDIR}/include/python${PYTHON_VERSION}m") # CACHE PATH) + set(PYTHON_LIBRARY "${LIBDIR}/lib/libpython${PYTHON_VERSION}m.dll.a") # CACHE FILEPATH) + # uncached vars diff --git a/mingw-w64-blender/PKGBUILD b/mingw-w64-blender/PKGBUILD index 7aee8a85a0..99ed81ad05 100644 --- a/mingw-w64-blender/PKGBUILD +++ b/mingw-w64-blender/PKGBUILD @@ -6,7 +6,7 @@ # set "PKG_CONFIG_PATH=%MINGW_PREFIX%/lib/pkgconfig" # set "PATH=%MINGW_PREFIX%/bin;%PATH%" # 2. Specify the following as the CMake arguments: -# -DMINGW_LIBS=%MINGW_PREFIX% -DCMAKE_BUILD_TYPE=Debug -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_OPENJPEG=ON -DWITH_INSTALL_PORTABLE=OFF -DWITH_OPENCOLLADA=ON -DWITH_GAMEENGINE=ON -DWITH_RAYOPTIMIZATION=ON -DWITH_JACK=OFF -DWITH_PLAYER=ON -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON -DWITH_CYCLES=ON -DWITH_CYCLES_CUDA_BINARIES=OFF -DWITH_CYCLES_OSL=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DPYTHON_VERSION=3.5 -DPYTHON_LIBPATH=%MINGW_PREFIX%/lib -DPYTHON_LIBRARY="python3.5m" -DPYTHON_INCLUDE_DIRS=/msys64/mingw64/include/python3.5m -DWITH_PYTHON_INSTALL=OFF -DWITH_PYTHON_INSTALL_NUMPY=OFF -DPYTHON_NUMPY_PATH=%MINGW_PREFIX%/lib/python3.5/site-packages -DCYCLES_OSL=%MINGW_PREFIX% -DWITH_IMAGE_REDCODE=ON -DWITH_OPENMP=ON -DWITH_LLVM=ON -DLLVM_STATIC=ON +# -DMINGW_LIBS=%MINGW_PREFIX% -DCMAKE_BUILD_TYPE=Debug -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_OPENJPEG=ON -DWITH_INSTALL_PORTABLE=OFF -DWITH_OPENCOLLADA=ON -DWITH_GAMEENGINE=ON -DWITH_RAYOPTIMIZATION=ON -DWITH_JACK=OFF -DWITH_PLAYER=ON -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON -DWITH_CYCLES=ON -DWITH_CYCLES_CUDA_BINARIES=OFF -DWITH_CYCLES_OSL=ON -DWITH_FFTW3=ON -DWITH_MOD_OCEANSIM=ON -DPYTHON_VERSION=3.6 -DPYTHON_LIBPATH=%MINGW_PREFIX%/lib -DPYTHON_LIBRARY="python3.6m" -DPYTHON_INCLUDE_DIRS=/msys64/mingw64/include/python3.6m -DWITH_PYTHON_INSTALL=OFF -DWITH_PYTHON_INSTALL_NUMPY=OFF -DPYTHON_NUMPY_PATH=%MINGW_PREFIX%/lib/python3.6/site-packages -DCYCLES_OSL=%MINGW_PREFIX% -DWITH_IMAGE_REDCODE=ON -DWITH_OPENMP=ON -DWITH_LLVM=ON -DLLVM_STATIC=ON _realname=blender pkgbase=mingw-w64-${_realname} @@ -18,8 +18,7 @@ _minorchar=c } || { pkgver=${_basever}.${_minorchar} } -_pyver=3.5 -pkgrel=1 +pkgrel=2 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') license=('GPL') @@ -66,7 +65,7 @@ source=(https://download.blender.org/source/${_realname}-${_basever}${_minorchar 0012-re-enable-SSE-on-mingw-w64-i686.patch 0013-provide-sprintf-for-comutil.patch) sha256sums=('64a98ff30300f79385ddb9ad016aa790a92720ff2feb84ddb1d097e6531dd338' - '92947c73e0582a42f0249f8c6e5730884f45dad15aa7804e73ba814be0e663dc' + 'd58720f4b04835ae4b98b5b196f8ce4e90bd00cb955facc756cb48bd1574f3fd' 'a84d7854fc1a00f4f0cfa1866cedb145a3489c8771df68dbda61d49fb4f0a795' '9ac81ace5d40a860ea6aa72d3212cc1b9096c350835d0ef8c81b8010fbb02a4c' '0cd0fb76502e8325db0400ab1845f91fd0525ff76a22294c3e8031314fb4430f' @@ -120,6 +119,8 @@ build() { _btype=Release fi + _pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index 2ea7de0160..472a578681 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.64.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') url="https://www.boost.org/" @@ -124,8 +124,11 @@ build() { cd "${srcdir}/build-${MINGW_CHOST}" - echo "using python : 2.7 : ${PREFIX_DEPS}/bin/python2.exe : ${PREFIX_DEPS}/include/python2.7 ;" >> ./tools/build/src/user-config.jam - echo "using python : 3.5 : ${PREFIX_DEPS}/bin/python3.exe : ${PREFIX_DEPS}/include/python3.5m : ${PREFIX_DEPS}/lib/python3.5/config-3.5m ;" >> ./tools/build/src/user-config.jam + _py2ver=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + _py3ver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + + echo "using python : ${_py2ver} : ${PREFIX_DEPS}/bin/python2.exe : ${PREFIX_DEPS}/include/python${_py2ver} ;" >> ./tools/build/src/user-config.jam + echo "using python : ${_py3ver} : ${PREFIX_DEPS}/bin/python3.exe : ${PREFIX_DEPS}/include/python${_py3ver}m : ${PREFIX_DEPS}/lib/python${_py3ver}/config-${_py3ver}m ;" >> ./tools/build/src/user-config.jam #echo "using gcc : : ${PREFIX_DEPS}/bin/g++.exe : ${PREFIX_DEPS}/bin/windres.exe ;" >> ./tools/build/src/user-config.jam ./bootstrap.sh --with-icu=${MINGW_PREFIX} --with-python=${MINGW_PREFIX} --with-toolset=gcc diff --git a/mingw-w64-cython/PKGBUILD b/mingw-w64-cython/PKGBUILD index e50fb4895e..4e94af9008 100644 --- a/mingw-w64-cython/PKGBUILD +++ b/mingw-w64-cython/PKGBUILD @@ -5,7 +5,7 @@ _realname=cython pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cython2") pkgver=0.25.2 -pkgrel=1 +pkgrel=2 pkgdesc="C-Extensions for Python (mingw-w64)" arch=('any') url="http://www.cython.org" diff --git a/mingw-w64-gst-python/PKGBUILD b/mingw-w64-gst-python/PKGBUILD index f882766754..e99925a5a0 100644 --- a/mingw-w64-gst-python/PKGBUILD +++ b/mingw-w64-gst-python/PKGBUILD @@ -4,7 +4,7 @@ _realname=gst-python pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer GObject Introspection overrides for Python 3 (mingw-w64)" arch=('any') license=('LGPL') diff --git a/mingw-w64-lensfun/PKGBUILD b/mingw-w64-lensfun/PKGBUILD index 9620deb9c7..a4150026ab 100644 --- a/mingw-w64-lensfun/PKGBUILD +++ b/mingw-w64-lensfun/PKGBUILD @@ -4,14 +4,15 @@ _realname=lensfun pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database (mingw-w64)" arch=('any') url="https://lensfun.sourceforge.io" license=("LGPL3") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-python3") + "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-cmake") depends=("${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libsystre" diff --git a/mingw-w64-meson/PKGBUILD b/mingw-w64-meson/PKGBUILD index 8811b033e9..bc1b599f89 100644 --- a/mingw-w64-meson/PKGBUILD +++ b/mingw-w64-meson/PKGBUILD @@ -4,7 +4,7 @@ _realname=meson pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.40.1 -pkgrel=1 +pkgrel=2 pkgdesc="High-productivity build system (mingw-w64)" arch=('any') url="http://mesonbuild.com/" diff --git a/mingw-w64-miniupnpc/PKGBUILD b/mingw-w64-miniupnpc/PKGBUILD index 1938f828d7..42c6cba790 100644 --- a/mingw-w64-miniupnpc/PKGBUILD +++ b/mingw-w64-miniupnpc/PKGBUILD @@ -4,7 +4,7 @@ _realname=miniupnpc pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices (mingw-w64)" arch=('any') url="http://miniupnp.free.fr" diff --git a/mingw-w64-opencv/0005-opencv-support-python-3.5.patch b/mingw-w64-opencv/0005-opencv-support-python-3.5.patch index 6bc9a53f3b..65689870b1 100644 --- a/mingw-w64-opencv/0005-opencv-support-python-3.5.patch +++ b/mingw-w64-opencv/0005-opencv-support-python-3.5.patch @@ -5,7 +5,7 @@ PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) -find_python(3.4 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR -+find_python(3.5 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR ++find_python(3.6 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND PYTHON3LIBS_VERSION_STRING PYTHON3_LIBRARIES PYTHON3_LIBRARY diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index d276fb52ae..962f073f91 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -4,7 +4,7 @@ _realname=opencv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.2.0 -pkgrel=5 +pkgrel=7 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') url="http://opencv.org/" @@ -55,7 +55,7 @@ sha256sums=('b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35' 'fd4e095c3c879413184fc6b91a7b0a77dbb128612341a8be2c99d804a203e362' '52ebc8875b9ef3ea70897f34509228daeff73d0cab0aa9eb8b931be6a7d32d7f' '47447c78acc810cd0604b641644f1c546c29e925b7b9671a4fa18468ff3ad330' - 'e50f69c6c1fbce255b3e7ef4b489bf1a01ba28cf828a6adb80c73a7f9c08a666' + '837e637d1040b6bc3427d650e26cf1abb0178b322f2fbb43ccb2d5506f7b1c58' '7d2ff25f97c84b59793502786dd64e25c8ca991b0523ffea56b45ce031e80c3f' 'ba227bb88c7e6948c54c5a3c8347daf5e2c930e99fb155047015bc5cfa2b33e5' '434b3bb1f6fd3af31952de5c4af95eb726f4e45b077e98195f8c204732bc9754') diff --git a/mingw-w64-pycairo/PKGBUILD b/mingw-w64-pycairo/PKGBUILD index b066d3bcec..a3f3c75c30 100644 --- a/mingw-w64-pycairo/PKGBUILD +++ b/mingw-w64-pycairo/PKGBUILD @@ -4,7 +4,7 @@ _realname=pycairo pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cairo" "${MINGW_PACKAGE_PREFIX}-python3-cairo") pkgver=1.13.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for the cairo graphics library (mingw-w64)" url="https://pycairo.readthedocs.io" arch=('any') diff --git a/mingw-w64-pygobject/PKGBUILD b/mingw-w64-pygobject/PKGBUILD index 99b1d93b9f..d5754a425e 100644 --- a/mingw-w64-pygobject/PKGBUILD +++ b/mingw-w64-pygobject/PKGBUILD @@ -4,7 +4,7 @@ _realname=pygobject pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject" "${MINGW_PACKAGE_PREFIX}-python3-gobject" "${MINGW_PACKAGE_PREFIX}-pygobject-devel") pkgver=3.24.1 -pkgrel=1 +pkgrel=2 pkgdesc="Allows you to load glade interface files in a program at runtime (mingw-w64)" arch=(any) url="http://www.pygtk.org" diff --git a/mingw-w64-pygobject2/PKGBUILD b/mingw-w64-pygobject2/PKGBUILD index 623915cd65..b1ea916955 100644 --- a/mingw-w64-pygobject2/PKGBUILD +++ b/mingw-w64-pygobject2/PKGBUILD @@ -4,7 +4,7 @@ _realname=pygobject pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject2" "${MINGW_PACKAGE_PREFIX}-python3-gobject2" "${MINGW_PACKAGE_PREFIX}-pygobject2-devel") pkgver=2.28.6 -pkgrel=4 +pkgrel=5 pkgdesc="Allows you to load glade interface files in a program at runtime (mingw-w64)" arch=(any) url="http://www.pygtk.org" diff --git a/mingw-w64-pyqt4/PKGBUILD b/mingw-w64-pyqt4/PKGBUILD index 2a0d570dfc..6a388c506d 100644 --- a/mingw-w64-pyqt4/PKGBUILD +++ b/mingw-w64-pyqt4/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.11.4 -pkgrel=2 +pkgrel=3 pkgdesc="Qt4 bindings for Python (mingw-w64)" arch=('any') license=('GPL') @@ -68,13 +68,15 @@ package_python3-pyqt4(){ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + # Provided by pyqt-common rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate4,pyrcc4}.exe rm -rf "${pkgdir}${MINGW_PREFIX}"/qsci rm -rf "${pkgdir}${MINGW_PREFIX}"/share/qt4/qsci # Remove Python 2 uic port - rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/PyQt4/uic/port_v2 + rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py3basever}/site-packages/PyQt4/uic/port_v2 } package_python2-pyqt4(){ @@ -85,6 +87,8 @@ package_python2-pyqt4(){ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + # Fix conflicts mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyuic4.bat rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate4,pyrcc4}.exe @@ -92,7 +96,7 @@ package_python2-pyqt4(){ rm -rf "${pkgdir}${MINGW_PREFIX}"/share/qt4/qsci # Remove Python 3 uic port - rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python2.7/site-packages/PyQt4/uic/port_v3 + rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py2basever}/site-packages/PyQt4/uic/port_v3 } # Wrappers diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD index 3c640717cb..042f8a6ab7 100644 --- a/mingw-w64-pyqt5/PKGBUILD +++ b/mingw-w64-pyqt5/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=5.8 #_pre_ver=5.8.dev1702091323 -pkgrel=1 +pkgrel=2 pkgdesc="Qt5 bindings for Python (mingw-w64)" arch=('any') license=('GPL') @@ -71,10 +71,12 @@ package_python3-pyqt5(){ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + # Provided by pyqt-common #rm "${pkgdir}${MINGW_PREFIX}"/bin/{pylupdate5,pyrcc5}.exe rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api - rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/PyQt5/uic/port_v2 + rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py3basever}/site-packages/PyQt5/uic/port_v2 } package_python2-pyqt5(){ @@ -87,6 +89,8 @@ package_python2-pyqt5(){ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + # Fix conflicts with python-pyqt5 mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pyuic5.bat mv "${pkgdir}${MINGW_PREFIX}"/bin/{,python2-}pylupdate5.bat @@ -96,7 +100,7 @@ package_python2-pyqt5(){ rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/plugins/designer/pyqt5.dll rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/plugins/PyQt5/pyqt5qmlplugin.dll rm "${pkgdir}${MINGW_PREFIX}"/share/qt5/qsci/api/python/PyQt5.api - rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python2.7/site-packages/PyQt5/uic/port_v3 + rm -rf "${pkgdir}${MINGW_PREFIX}"/lib/python${_py2basever}/site-packages/PyQt5/uic/port_v3 } # Wrappers diff --git a/mingw-w64-pyside-qt4/PKGBUILD b/mingw-w64-pyside-qt4/PKGBUILD index 2d7b215502..63e3ed329d 100644 --- a/mingw-w64-pyside-qt4/PKGBUILD +++ b/mingw-w64-pyside-qt4/PKGBUILD @@ -5,7 +5,7 @@ _realname=pyside pkgbase=mingw-w64-${_realname}-qt4 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4) pkgver=1.2.2 -pkgrel=3 +pkgrel=4 arch=('any') url="https://pyside.github.io/docs/pyside/" license=("LGPL") diff --git a/mingw-w64-pyside-tools-qt4/PKGBUILD b/mingw-w64-pyside-tools-qt4/PKGBUILD index e43bc9a5d8..d79829f57a 100644 --- a/mingw-w64-pyside-tools-qt4/PKGBUILD +++ b/mingw-w64-pyside-tools-qt4/PKGBUILD @@ -5,7 +5,7 @@ _realname=pyside-tools pkgbase=mingw-w64-${_realname}-qt4 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-common-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4) pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for Qt4 (mingw-w64)" arch=('any') url="https://pyside.github.io/docs/pyside/" diff --git a/mingw-w64-python-appdirs/PKGBUILD b/mingw-w64-python-appdirs/PKGBUILD index 1cdec4ae39..ddc17e51bf 100644 --- a/mingw-w64-python-appdirs/PKGBUILD +++ b/mingw-w64-python-appdirs/PKGBUILD @@ -3,7 +3,7 @@ _realname=appdirs pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc='A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir". (mingw-w64)' arch=('any') url="https://github.com/ActiveState/appdirs" diff --git a/mingw-w64-python-babel/PKGBUILD b/mingw-w64-python-babel/PKGBUILD index 0b1ec6da83..a897d8fd5e 100644 --- a/mingw-w64-python-babel/PKGBUILD +++ b/mingw-w64-python-babel/PKGBUILD @@ -5,7 +5,7 @@ _realname=babel pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of tools for internationalizing Python applications" url="http://babel.pocoo.org/" license=("BSD") diff --git a/mingw-w64-python-beaker/PKGBUILD b/mingw-w64-python-beaker/PKGBUILD index c34fcab534..663685c706 100644 --- a/mingw-w64-python-beaker/PKGBUILD +++ b/mingw-w64-python-beaker/PKGBUILD @@ -5,7 +5,7 @@ _realname=beaker pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-beautifulsoup4/PKGBUILD b/mingw-w64-python-beautifulsoup4/PKGBUILD index 8dcae88120..d135e1e192 100644 --- a/mingw-w64-python-beautifulsoup4/PKGBUILD +++ b/mingw-w64-python-beautifulsoup4/PKGBUILD @@ -3,7 +3,7 @@ _realname=beautifulsoup4 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-beautifulsoup4" "${MINGW_PACKAGE_PREFIX}-python2-beautifulsoup4") pkgver=4.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="A Python HTML/XML parser designed for quick turnaround projects like screen-scraping (mingw-w64)" arch=('any') url="http://www.crummy.com/software/BeautifulSoup/index.html" diff --git a/mingw-w64-python-bsddb3/PKGBUILD b/mingw-w64-python-bsddb3/PKGBUILD index 4c2d60d184..3377dc6497 100644 --- a/mingw-w64-python-bsddb3/PKGBUILD +++ b/mingw-w64-python-bsddb3/PKGBUILD @@ -4,7 +4,7 @@ _realname=bsddb3 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=6.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for Oracle Berkeley DB (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-characteristic/PKGBUILD b/mingw-w64-python-characteristic/PKGBUILD index 06e453b574..baec1001f0 100644 --- a/mingw-w64-python-characteristic/PKGBUILD +++ b/mingw-w64-python-characteristic/PKGBUILD @@ -4,7 +4,7 @@ _realname=characteristic pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=14.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='Python attributes without boilerplate (mingw-w64)' url='https://characteristic.readthedocs.org/' license=('MIT') diff --git a/mingw-w64-python-chardet/PKGBUILD b/mingw-w64-python-chardet/PKGBUILD index ee88def716..3441c32d2a 100644 --- a/mingw-w64-python-chardet/PKGBUILD +++ b/mingw-w64-python-chardet/PKGBUILD @@ -3,7 +3,7 @@ _realname=chardet pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-chardet" "${MINGW_PACKAGE_PREFIX}-python2-chardet") pkgver=2.3.0 -pkgrel=1 +pkgrel=2 arch=('any') url="https://github.com/chardet/chardet" license=('LGPL') diff --git a/mingw-w64-python-colorama/PKGBUILD b/mingw-w64-python-colorama/PKGBUILD index 00db047888..3f79c00133 100644 --- a/mingw-w64-python-colorama/PKGBUILD +++ b/mingw-w64-python-colorama/PKGBUILD @@ -5,7 +5,7 @@ _realname=colorama pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.3.9 -pkgrel=1 +pkgrel=2 pkgdesc="Python API for cross-platform colored terminal text (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-coverage/PKGBUILD b/mingw-w64-python-coverage/PKGBUILD index e6d273a99f..a181f42bf3 100644 --- a/mingw-w64-python-coverage/PKGBUILD +++ b/mingw-w64-python-coverage/PKGBUILD @@ -4,7 +4,7 @@ _realname=coverage pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.3.4 -pkgrel=1 +pkgrel=2 pkgdesc='Code coverage measurement for Python (mingw-w64)' url='https://coverage.readthedocs.org/' license=('Apache 2.0') diff --git a/mingw-w64-python-csssselect/PKGBUILD b/mingw-w64-python-csssselect/PKGBUILD index 6428ba3735..07d84c74c1 100644 --- a/mingw-w64-python-csssselect/PKGBUILD +++ b/mingw-w64-python-csssselect/PKGBUILD @@ -4,7 +4,7 @@ _realname=cssselect pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-cvxopt/PKGBUILD b/mingw-w64-python-cvxopt/PKGBUILD index cfe77eeaa4..a23659568f 100644 --- a/mingw-w64-python-cvxopt/PKGBUILD +++ b/mingw-w64-python-cvxopt/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="Convex optimization based on the Python programming language (mingw-w64)" arch=('any') url='http://cvxopt.org' diff --git a/mingw-w64-python-cx_Freeze/PKGBUILD b/mingw-w64-python-cx_Freeze/PKGBUILD index 638a5ed808..9cd07c4ea4 100644 --- a/mingw-w64-python-cx_Freeze/PKGBUILD +++ b/mingw-w64-python-cx_Freeze/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-cx_Freeze" "${MINGW_PACKAGE_PREFIX}-python3-cx_Freeze") pkgver=4.3.3 -pkgrel=7 +pkgrel=8 pkgdesc="Python package for freezing scripts into executables (mingw-w64)" arch=('any') license=('PSF') diff --git a/mingw-w64-python-cycler/PKGBUILD b/mingw-w64-python-cycler/PKGBUILD index 3bee0e1602..20f43900c7 100644 --- a/mingw-w64-python-cycler/PKGBUILD +++ b/mingw-w64-python-cycler/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=0.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Composable style cycles" arch=('any') license=('BSD') diff --git a/mingw-w64-python-dateutil/PKGBUILD b/mingw-w64-python-dateutil/PKGBUILD index dd2acd751f..53424e2970 100644 --- a/mingw-w64-python-dateutil/PKGBUILD +++ b/mingw-w64-python-dateutil/PKGBUILD @@ -5,7 +5,7 @@ _pyname=python-dateutil pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=2.6.0 -pkgrel=1 +pkgrel=3 pkgdesc="Provides powerful extensions to the standard datetime module (mingw-w64)" arch=('any') license=('custom:PYTHON') @@ -54,11 +54,13 @@ package_python3-dateutil() { ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ --root=${pkgdir} --optimize=1 --skip-build + local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE - chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python3.5/ + chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python${_py3basever}/ # Remove data files - #rm ${pkgdir}${MINGW_PREFIX}/lib/python3.5/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz + #rm ${pkgdir}${MINGW_PREFIX}/lib/python${_py3basever}/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz } package_python2-dateutil() { @@ -70,11 +72,13 @@ package_python2-dateutil() { ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ --root=${pkgdir} --optimize=1 --skip-build + local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE - chmod -R a+r ${pkgdir}/${MINGW_PREFIX}/lib/python2.7/ + chmod -R a+r ${pkgdir}/${MINGW_PREFIX}/lib/python${_py2basever}/ # Remove data files - #rm ${pkgdir}${MINGW_PREFIX}/lib/python2.7/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz + #rm ${pkgdir}${MINGW_PREFIX}/lib/python${_py2basever}/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz } package_mingw-w64-i686-python2-dateutil() { diff --git a/mingw-w64-python-decorator/PKGBUILD b/mingw-w64-python-decorator/PKGBUILD index 081600f715..b1e5ff87b3 100644 --- a/mingw-w64-python-decorator/PKGBUILD +++ b/mingw-w64-python-decorator/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=4.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Better living through Python with decorators (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-distutils-extra/PKGBUILD b/mingw-w64-python-distutils-extra/PKGBUILD index d29c5362b4..680c5efe59 100644 --- a/mingw-w64-python-distutils-extra/PKGBUILD +++ b/mingw-w64-python-distutils-extra/PKGBUILD @@ -4,7 +4,7 @@ _realname=python-distutils-extra pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra" "${MINGW_PACKAGE_PREFIX}-python2-distutils-extra") pkgver=2.39 -pkgrel=2 +pkgrel=3 pkgdesc="Enhancements to the Python build system (mingw-w64)" arch=('any') license=('GPL') diff --git a/mingw-w64-python-docutils/PKGBUILD b/mingw-w64-python-docutils/PKGBUILD index d7c081f10f..af1aa8425d 100644 --- a/mingw-w64-python-docutils/PKGBUILD +++ b/mingw-w64-python-docutils/PKGBUILD @@ -5,7 +5,7 @@ _realname=docutils pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.12 -pkgrel=5 +pkgrel=6 pkgdesc="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-et-xmlfile/PKGBUILD b/mingw-w64-python-et-xmlfile/PKGBUILD index 044c99daee..f2440669c8 100644 --- a/mingw-w64-python-et-xmlfile/PKGBUILD +++ b/mingw-w64-python-et-xmlfile/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A low memory library for creating large XML files (mingw-w64)" url="https://et-xmlfile.readthedocs.org/" arch=('any') diff --git a/mingw-w64-python-funcsigs/PKGBUILD b/mingw-w64-python-funcsigs/PKGBUILD index 34e32ef11d..04e19be85d 100644 --- a/mingw-w64-python-funcsigs/PKGBUILD +++ b/mingw-w64-python-funcsigs/PKGBUILD @@ -4,7 +4,7 @@ _realname=funcsigs pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc='Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+' arch=('any') url='https://github.com/testing-cabal/funcsigs' diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD index 75ab664be1..65de0db799 100644 --- a/mingw-w64-python-h5py/PKGBUILD +++ b/mingw-w64-python-h5py/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=2.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)" arch=('any') url="http://www.h5py.org" diff --git a/mingw-w64-python-html5lib/PKGBUILD b/mingw-w64-python-html5lib/PKGBUILD index c800c84833..e968aa05ad 100644 --- a/mingw-w64-python-html5lib/PKGBUILD +++ b/mingw-w64-python-html5lib/PKGBUILD @@ -4,7 +4,7 @@ _realname=html5lib pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.999999999 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec (mingw-w64)" url="https://github.com/html5lib" diff --git a/mingw-w64-python-httplib2/PKGBUILD b/mingw-w64-python-httplib2/PKGBUILD index 1c573bd2b2..919a69444a 100644 --- a/mingw-w64-python-httplib2/PKGBUILD +++ b/mingw-w64-python-httplib2/PKGBUILD @@ -5,7 +5,7 @@ _realname=httplib2 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="Comprehensive HTTP client library, supporting many features (mingw-w64)" arch=('any') license=('MIT') diff --git a/mingw-w64-python-icu/PKGBUILD b/mingw-w64-python-icu/PKGBUILD index 0140582f40..eb0a454ef6 100644 --- a/mingw-w64-python-icu/PKGBUILD +++ b/mingw-w64-python-icu/PKGBUILD @@ -4,7 +4,7 @@ _realname=PyICU pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-icu" "${MINGW_PACKAGE_PREFIX}-python3-icu") pkgver=1.9.7 -pkgrel=1 +pkgrel=2 pkgdesc="Python extension wrapping the ICU C++ API (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-idna/PKGBUILD b/mingw-w64-python-idna/PKGBUILD index 6c2bebbecf..f3de20a53f 100644 --- a/mingw-w64-python-idna/PKGBUILD +++ b/mingw-w64-python-idna/PKGBUILD @@ -4,7 +4,7 @@ _realname=idna pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Internationalized Domain Names in Applications (mingw-w64)' url='https://github.com/kjd/idna' license=('BSD-like') diff --git a/mingw-w64-python-imagesize/PKGBUILD b/mingw-w64-python-imagesize/PKGBUILD index 1b93822106..cca98f742b 100644 --- a/mingw-w64-python-imagesize/PKGBUILD +++ b/mingw-w64-python-imagesize/PKGBUILD @@ -4,7 +4,7 @@ _realname=imagesize pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Getting image size from png/jpeg/jpeg2000/gif file (mingw-w64)" url='https://github.com/shibukawa/imagesize_py' license=('MIT') diff --git a/mingw-w64-python-ipython_genutils/PKGBUILD b/mingw-w64-python-ipython_genutils/PKGBUILD index 8d91389764..745ade027f 100644 --- a/mingw-w64-python-ipython_genutils/PKGBUILD +++ b/mingw-w64-python-ipython_genutils/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="IPython vestigial utilities (mingw-w64)" url="https://github.com/ipython/ipython_genutils" arch=('any') diff --git a/mingw-w64-python-jdcal/PKGBUILD b/mingw-w64-python-jdcal/PKGBUILD index 9fba731ff3..cc2e7fc825 100644 --- a/mingw-w64-python-jdcal/PKGBUILD +++ b/mingw-w64-python-jdcal/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Julian dates, from proleptic Gregorian and Julian calendars (mingw-w64)" url="https://github.com/phn/jdcal" arch=('any') diff --git a/mingw-w64-python-jinja/PKGBUILD b/mingw-w64-python-jinja/PKGBUILD index 2620cc39b9..4258f737bf 100644 --- a/mingw-w64-python-jinja/PKGBUILD +++ b/mingw-w64-python-jinja/PKGBUILD @@ -4,7 +4,7 @@ _realname=jinja pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.8 -pkgrel=1 +pkgrel=2 pkgdesc="A simple pythonic template language written in Python (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-lhafile/PKGBUILD b/mingw-w64-python-lhafile/PKGBUILD index d290d27ec0..0db8b4db9e 100644 --- a/mingw-w64-python-lhafile/PKGBUILD +++ b/mingw-w64-python-lhafile/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-lhafile" "${MINGW_PACKAGE_PREFIX}-python3-lhafile") pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="LHA module for Python (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-lxml/PKGBUILD b/mingw-w64-python-lxml/PKGBUILD index 35ce48b83f..eaf26ba024 100644 --- a/mingw-w64-python-lxml/PKGBUILD +++ b/mingw-w64-python-lxml/PKGBUILD @@ -7,7 +7,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}-docs") pkgver=3.7.3 -pkgrel=1 +pkgrel=2 arch=('any') license=('BSD' 'custom') url="http://lxml.de/" diff --git a/mingw-w64-python-mako/PKGBUILD b/mingw-w64-python-mako/PKGBUILD index 462fc82ab3..485b16f368 100644 --- a/mingw-w64-python-mako/PKGBUILD +++ b/mingw-w64-python-mako/PKGBUILD @@ -5,7 +5,7 @@ _realname=mako pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-markupsafe/PKGBUILD b/mingw-w64-python-markupsafe/PKGBUILD index be296bdbef..962c7d19f6 100644 --- a/mingw-w64-python-markupsafe/PKGBUILD +++ b/mingw-w64-python-markupsafe/PKGBUILD @@ -4,7 +4,7 @@ _realname=markupsafe pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD index 82e2610190..2be6424c0f 100644 --- a/mingw-w64-python-matplotlib/PKGBUILD +++ b/mingw-w64-python-matplotlib/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python3-${_realname}" ) pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)" arch=('any') url='http://matplotlib.org' diff --git a/mingw-w64-python-mistune/PKGBUILD b/mingw-w64-python-mistune/PKGBUILD index 2eef2423a3..f6251a9a92 100644 --- a/mingw-w64-python-mistune/PKGBUILD +++ b/mingw-w64-python-mistune/PKGBUILD @@ -4,7 +4,7 @@ _realname=mistune pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="The fastest markdown parser in pure Python with renderer feature (mingw-w64)" arch=('any') url="https://github.com/lepture/mistune" diff --git a/mingw-w64-python-mock/PKGBUILD b/mingw-w64-python-mock/PKGBUILD index d38852f2d3..6b60c8ff23 100644 --- a/mingw-w64-python-mock/PKGBUILD +++ b/mingw-w64-python-mock/PKGBUILD @@ -4,7 +4,7 @@ _realname=mock pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='Rolling backport of unittest.mock for all Pythons (mingw-w64)' arch=('any') url='https://github.com/testing-cabal/mock' diff --git a/mingw-w64-python-networkx/PKGBUILD b/mingw-w64-python-networkx/PKGBUILD index 41e0b7d42f..4967712a0f 100644 --- a/mingw-w64-python-networkx/PKGBUILD +++ b/mingw-w64-python-networkx/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="High-productivity software for complex networks (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-nose/PKGBUILD b/mingw-w64-python-nose/PKGBUILD index b9b9ec1426..7146912e81 100644 --- a/mingw-w64-python-nose/PKGBUILD +++ b/mingw-w64-python-nose/PKGBUILD @@ -5,7 +5,7 @@ _realname=nose pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.3.7 -pkgrel=4 +pkgrel=5 pkgdesc="A discovery-based unittest extension (mingw-w64)" arch=('any') license=('LGPL-2.1') diff --git a/mingw-w64-python-nuitka/PKGBUILD b/mingw-w64-python-nuitka/PKGBUILD index d745c452ec..9cd4cee346 100644 --- a/mingw-w64-python-nuitka/PKGBUILD +++ b/mingw-w64-python-nuitka/PKGBUILD @@ -4,7 +4,7 @@ _realname=nuitka pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.5.14.3 -pkgrel=3 +pkgrel=4 pkgdesc="Python to native compiler (mingw-w64)" arch=('any') license=('APACHE') diff --git a/mingw-w64-python-numexpr/PKGBUILD b/mingw-w64-python-numexpr/PKGBUILD index 907c104936..7fae4a2990 100644 --- a/mingw-w64-python-numexpr/PKGBUILD +++ b/mingw-w64-python-numexpr/PKGBUILD @@ -4,7 +4,7 @@ _realname=numexpr pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=2.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas. (mingw-w64)" arch=('any') url="https://github.com/pydata/numexpr" diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD index 3d3cb494ab..3a1ee4ccd6 100644 --- a/mingw-w64-python-numpy/PKGBUILD +++ b/mingw-w64-python-numpy/PKGBUILD @@ -6,7 +6,7 @@ _realname=numpy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="Scientific tools for Python (mingw-w64)" arch=('any') license=('BSD') @@ -77,7 +77,7 @@ package_python2-numpy() { depends=("${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-python2") optdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose: testsuite") - _pyver=2.7 + _pyver=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") export ATLAS=None export LDFLAGS="$LDFLAGS -shared" @@ -103,7 +103,7 @@ package_python3-numpy() { depends=("${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-python3") optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: testsuite") - _pyver=3.5 + _pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") _pyinc=${_pyver}m export ATLAS=None diff --git a/mingw-w64-python-openmdao/PKGBUILD b/mingw-w64-python-openmdao/PKGBUILD index 85ea126c78..7e75cbb9f2 100644 --- a/mingw-w64-python-openmdao/PKGBUILD +++ b/mingw-w64-python-openmdao/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source MDAO framework written in Python. (mingw-w64)" arch=('any') license=('apache') diff --git a/mingw-w64-python-openpyxl/PKGBUILD b/mingw-w64-python-openpyxl/PKGBUILD index 44b19e11cb..cdf9eb76cf 100644 --- a/mingw-w64-python-openpyxl/PKGBUILD +++ b/mingw-w64-python-openpyxl/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=2.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="A python library to read/write Excel 2007 xlsx/xlsm file (mingw-w64)" url="http://openpyxl.readthedocs.org/" arch=('any') diff --git a/mingw-w64-python-packaging/PKGBUILD b/mingw-w64-python-packaging/PKGBUILD index 6a7a39b322..6ab21eb6c5 100644 --- a/mingw-w64-python-packaging/PKGBUILD +++ b/mingw-w64-python-packaging/PKGBUILD @@ -4,7 +4,7 @@ _realname=packaging pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=16.8 -pkgrel=1 +pkgrel=2 pkgdesc="Core utilities for Python packages (mingw-w64)" arch=('any') url="https://github.com/pypa/packaging" diff --git a/mingw-w64-python-pandas/PKGBUILD b/mingw-w64-python-pandas/PKGBUILD index b170ce20d2..a5a7ee0d4d 100644 --- a/mingw-w64-python-pandas/PKGBUILD +++ b/mingw-w64-python-pandas/PKGBUILD @@ -4,7 +4,7 @@ _realname=pandas pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.19.1 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-section and time series data analysis toolkit (mingw-w64)" arch=('any') url="http://pandas.pydata.org/" diff --git a/mingw-w64-python-path/PKGBUILD b/mingw-w64-python-path/PKGBUILD index 35bff771a9..daf69f3a44 100644 --- a/mingw-w64-python-path/PKGBUILD +++ b/mingw-w64-python-path/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-path" "${MINGW_PACKAGE_PREFIX}-python2-path") pkgver=10.1 -pkgrel=1 +pkgrel=2 pkgdesc="File system based database that uses python pickles (mingw-w64)" url="https://github.com/jaraco/path.py" arch=('any') diff --git a/mingw-w64-python-patsy/PKGBUILD b/mingw-w64-python-patsy/PKGBUILD index 585df8326b..833d7b2c7d 100644 --- a/mingw-w64-python-patsy/PKGBUILD +++ b/mingw-w64-python-patsy/PKGBUILD @@ -4,7 +4,7 @@ _realname=patsy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Python package for describing statistical models and for building design matrices (mingw-w64)" arch=('any') url="https://github.com/pydata/patsy" diff --git a/mingw-w64-python-pbr/PKGBUILD b/mingw-w64-python-pbr/PKGBUILD index 47f1da0292..34f0649bcb 100644 --- a/mingw-w64-python-pbr/PKGBUILD +++ b/mingw-w64-python-pbr/PKGBUILD @@ -4,7 +4,7 @@ _realname=pbr pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python Build Reasonableness (mingw-w64)" url="https://launchpad.net/pbr" license=("Apache License, Version 2.0") diff --git a/mingw-w64-python-pdfrw/PKGBUILD b/mingw-w64-python-pdfrw/PKGBUILD index 3f058ed560..77da3b7168 100644 --- a/mingw-w64-python-pdfrw/PKGBUILD +++ b/mingw-w64-python-pdfrw/PKGBUILD @@ -5,7 +5,7 @@ _realname=pdfrw pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Convert restructured text to PDF via reportlab (mingw-w64)" arch=('any') url='https://github.com/pmaupin/${_realname}' diff --git a/mingw-w64-python-pgen2/PKGBUILD b/mingw-w64-python-pgen2/PKGBUILD index c18df43fa0..80a1da167c 100644 --- a/mingw-w64-python-pgen2/PKGBUILD +++ b/mingw-w64-python-pgen2/PKGBUILD @@ -7,7 +7,7 @@ _realname=pgen2 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Pure Python implementation of pgen, the Python parser generator (mingw-w64)" arch=('any') url='https://github.com/mythonlang/pgen2/' diff --git a/mingw-w64-python-pickleshare/PKGBUILD b/mingw-w64-python-pickleshare/PKGBUILD index a1ad4e0eb7..3425a78305 100644 --- a/mingw-w64-python-pickleshare/PKGBUILD +++ b/mingw-w64-python-pickleshare/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=0.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="File system based database that uses python pickles (mingw-w64)" url="https://github.com/pickleshare/pickleshare" arch=('any') diff --git a/mingw-w64-python-pillow/PKGBUILD b/mingw-w64-python-pillow/PKGBUILD index 033c98bf33..d618932c5c 100644 --- a/mingw-w64-python-pillow/PKGBUILD +++ b/mingw-w64-python-pillow/PKGBUILD @@ -4,9 +4,7 @@ _realname=Pillow pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pillow" "${MINGW_PACKAGE_PREFIX}-python3-pillow") pkgver=4.0.0 -_py2basever=2.7 -_py3basever=3.5m -pkgrel=1 +pkgrel=3 arch=('any') license=('custom') url="https://github.com/python-pillow/Pillow/" @@ -43,14 +41,15 @@ package_python3-pillow() { optdepends=("${MINGW_PACKAGE_PREFIX}-tk: for the ImageTK module") local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) + local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") cd "${srcdir}/python3-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}/" --optimize=0 install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE" - install -dm755 "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}/" - install -m644 -t "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}/" libImaging/*.h + install -dm755 "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}m/" + install -m644 -t "${pkgdir}${MINGW_PREFIX}/include/python${_py3basever}m/" libImaging/*.h # clean up bins cd "${pkgdir}${MINGW_PREFIX}/bin" @@ -69,6 +68,7 @@ package_python2-pillow() { optdepends=("${MINGW_PACKAGE_PREFIX}-tk: for the ImageTK module") local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) + local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") cd "${srcdir}/python2-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ diff --git a/mingw-w64-python-pip/PKGBUILD b/mingw-w64-python-pip/PKGBUILD index 733471ad1e..82baca7b7a 100644 --- a/mingw-w64-python-pip/PKGBUILD +++ b/mingw-w64-python-pip/PKGBUILD @@ -4,7 +4,7 @@ _realname=pip pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=9.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An easy_install replacement for installing pypi python packages (mingw-w64)" arch=('any') license=('MIT') diff --git a/mingw-w64-python-pptx/PKGBUILD b/mingw-w64-python-pptx/PKGBUILD index 17f27d3f6c..24b1fd9c88 100644 --- a/mingw-w64-python-pptx/PKGBUILD +++ b/mingw-w64-python-pptx/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Create Open XML PowerPoint documents in Python (mingw-w64)" url="https://github.com/scanny/python-pptx" arch=('any') diff --git a/mingw-w64-python-pretend/PKGBUILD b/mingw-w64-python-pretend/PKGBUILD index 38041ba698..f4d68b4470 100644 --- a/mingw-w64-python-pretend/PKGBUILD +++ b/mingw-w64-python-pretend/PKGBUILD @@ -4,7 +4,7 @@ _realname=pretend pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A library for stubbing in Python (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-prompt_toolkit/PKGBUILD b/mingw-w64-python-prompt_toolkit/PKGBUILD index 355bb512e8..9b191fad8c 100644 --- a/mingw-w64-python-prompt_toolkit/PKGBUILD +++ b/mingw-w64-python-prompt_toolkit/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=1.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Library for building powerful interactive command lines in Python" url="https://github.com/jonathanslenders/python-prompt-toolkit" arch=('any') diff --git a/mingw-w64-python-psutil/PKGBUILD b/mingw-w64-python-psutil/PKGBUILD index e00fe33a2f..ab8444bf89 100644 --- a/mingw-w64-python-psutil/PKGBUILD +++ b/mingw-w64-python-psutil/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform process and system utilities module for Python (mingw-w64)" arch=('any') url="https://github.com/giampaolo/" diff --git a/mingw-w64-python-py/PKGBUILD b/mingw-w64-python-py/PKGBUILD index 90e7dc73f3..1eb33b2316 100644 --- a/mingw-w64-python-py/PKGBUILD +++ b/mingw-w64-python-py/PKGBUILD @@ -5,7 +5,7 @@ _realname=py pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.4.33 -pkgrel=1 +pkgrel=2 pkgdesc='library with cross-python path, ini-parsing, io, code, log facilities (mingw-w64)' arch=('any') url='https://pylib.readthedocs.org/' diff --git a/mingw-w64-python-pyasn1-modules/PKGBUILD b/mingw-w64-python-pyasn1-modules/PKGBUILD index 91ca8877de..bd9a6ab890 100644 --- a/mingw-w64-python-pyasn1-modules/PKGBUILD +++ b/mingw-w64-python-pyasn1-modules/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyasn1-modules pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.0.8 -pkgrel=1 +pkgrel=2 pkgdesc='A collection of ASN.1-based protocols modules (mingw-w64)' url='https://sourceforge.net/projects/pyasn1/' license=('BSD') diff --git a/mingw-w64-python-pyasn1/PKGBUILD b/mingw-w64-python-pyasn1/PKGBUILD index f85252a016..db822fe4e8 100644 --- a/mingw-w64-python-pyasn1/PKGBUILD +++ b/mingw-w64-python-pyasn1/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyasn1 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.1.9 -pkgrel=1 +pkgrel=2 pkgdesc='ASN.1 types and codecs (mingw-w64)' url='https://sourceforge.net/projects/pyasn1/' license=('BSD') diff --git a/mingw-w64-python-pycparser/PKGBUILD b/mingw-w64-python-pycparser/PKGBUILD index a2aa106dcf..eb52061c55 100644 --- a/mingw-w64-python-pycparser/PKGBUILD +++ b/mingw-w64-python-pycparser/PKGBUILD @@ -4,7 +4,7 @@ _realname=pycparser pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.14 -pkgrel=1 +pkgrel=2 pkgdesc='Complete parser of the C language, written in pure Python (mingw-w64)' arch=('any') url='https://github.com/eliben/pycparser' diff --git a/mingw-w64-python-pygments/PKGBUILD b/mingw-w64-python-pygments/PKGBUILD index 800b54730e..ca0c7912e6 100644 --- a/mingw-w64-python-pygments/PKGBUILD +++ b/mingw-w64-python-pygments/PKGBUILD @@ -6,7 +6,7 @@ _realname=pygments pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python syntax highlighter (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-pyparsing/PKGBUILD b/mingw-w64-python-pyparsing/PKGBUILD index 4afa9f2fb0..c7b4a9d59d 100644 --- a/mingw-w64-python-pyparsing/PKGBUILD +++ b/mingw-w64-python-pyparsing/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyparsing pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='General parsing module for Python (mingw-w64)' arch=('any') url='http://pyparsing.wikispaces.com' diff --git a/mingw-w64-python-pytest/PKGBUILD b/mingw-w64-python-pytest/PKGBUILD index 1c80704c21..6a892c93d7 100644 --- a/mingw-w64-python-pytest/PKGBUILD +++ b/mingw-w64-python-pytest/PKGBUILD @@ -4,7 +4,7 @@ _realname=pytest pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.0.7 -pkgrel=1 +pkgrel=2 pkgdesc='simple powerful testing with Python (mingw-w64)' url='http://pytest.org' license=('MIT') diff --git a/mingw-w64-python-pytz/PKGBUILD b/mingw-w64-python-pytz/PKGBUILD index ae1ffe20b5..57304c4646 100644 --- a/mingw-w64-python-pytz/PKGBUILD +++ b/mingw-w64-python-pytz/PKGBUILD @@ -4,7 +4,7 @@ _realname=pytz pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2016.10 -pkgrel=1 +pkgrel=2 pkgdesc="Cross platform time zone library for Python (mingw-w64)" arch=('any') url="https://pypi.python.org/pypi/pytz" diff --git a/mingw-w64-python-pyzmq/PKGBUILD b/mingw-w64-python-pyzmq/PKGBUILD index 3d6912cc1a..fe3c32bfd1 100644 --- a/mingw-w64-python-pyzmq/PKGBUILD +++ b/mingw-w64-python-pyzmq/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=mingw-w64-python-pyzmq pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pyzmq" "${MINGW_PACKAGE_PREFIX}-python3-pyzmq") pkgver=15.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for zeromq, written in Cython (mingw-w64)" arch=('any') url="http://www.zeromq.org/bindings:python" diff --git a/mingw-w64-python-reportlab/PKGBUILD b/mingw-w64-python-reportlab/PKGBUILD index 7c9010fd5f..7cc4b55d95 100644 --- a/mingw-w64-python-reportlab/PKGBUILD +++ b/mingw-w64-python-reportlab/PKGBUILD @@ -5,7 +5,7 @@ _realname=reportlab pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.0 -pkgrel=4 +pkgrel=5 pkgdesc="A proven industry-strength PDF generating solution (mingw-w64)" arch=('any') license=('custom') diff --git a/mingw-w64-python-requests/PKGBUILD b/mingw-w64-python-requests/PKGBUILD index ea268eb34f..f81ff51157 100644 --- a/mingw-w64-python-requests/PKGBUILD +++ b/mingw-w64-python-requests/PKGBUILD @@ -4,7 +4,7 @@ _realname=requests pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.13.0 -pkgrel=1 +pkgrel=2 pkgdesc="Requests is the only Non-GMO HTTP library for Python, safe for human consumption. (mingw-w64)" arch=('any') license=('Apache') diff --git a/mingw-w64-python-rst2pdf/PKGBUILD b/mingw-w64-python-rst2pdf/PKGBUILD index ab9ab99236..30598b1099 100644 --- a/mingw-w64-python-rst2pdf/PKGBUILD +++ b/mingw-w64-python-rst2pdf/PKGBUILD @@ -3,7 +3,7 @@ _realname=rst2pdf pkgbase=mingw-w64-python2-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.93 -pkgrel=2 +pkgrel=3 pkgdesc="Create PDFs from simple text markup, no LaTeX required (mingw-w64)" arch=('any') url='https://github.com/ralsina/rst2pdf' diff --git a/mingw-w64-python-scipy/PKGBUILD b/mingw-w64-python-scipy/PKGBUILD index ab1744b6f1..9f92ab471e 100644 --- a/mingw-w64-python-scipy/PKGBUILD +++ b/mingw-w64-python-scipy/PKGBUILD @@ -4,7 +4,7 @@ _realname=scipy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.18.1 -pkgrel=1 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering. (mingw-w64)" arch=('any') url="http://www.scipy.org/" diff --git a/mingw-w64-python-setuptools/PKGBUILD b/mingw-w64-python-setuptools/PKGBUILD index 72d1aaffb1..01e10c5a7f 100644 --- a/mingw-w64-python-setuptools/PKGBUILD +++ b/mingw-w64-python-setuptools/PKGBUILD @@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-p _py3_base=3.5 _py2_base=2.7 pkgver=31.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)" arch=('any') license=('PSF') diff --git a/mingw-w64-python-simplegeneric/PKGBUILD b/mingw-w64-python-simplegeneric/PKGBUILD index e84106804c..84b6b8912d 100644 --- a/mingw-w64-python-simplegeneric/PKGBUILD +++ b/mingw-w64-python-simplegeneric/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-simplegeneric" ) pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="File system based database that uses python pickles (mingw-w64)" url="https://github.com/jaraco/simplegeneric.py" arch=('any') diff --git a/mingw-w64-python-six/PKGBUILD b/mingw-w64-python-six/PKGBUILD index 45e2707763..b1da2f4a29 100644 --- a/mingw-w64-python-six/PKGBUILD +++ b/mingw-w64-python-six/PKGBUILD @@ -4,7 +4,7 @@ _realname=six pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)" arch=('any') url="https://pypi.python.org/pypi/six/" diff --git a/mingw-w64-python-snowballstemmer/PKGBUILD b/mingw-w64-python-snowballstemmer/PKGBUILD index 3eb72bb412..c0c667997e 100644 --- a/mingw-w64-python-snowballstemmer/PKGBUILD +++ b/mingw-w64-python-snowballstemmer/PKGBUILD @@ -4,7 +4,7 @@ _realname=snowballstemmer pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Snowball stemming library collection for Python (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD index 90af817e7f..319d483021 100644 --- a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD +++ b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD @@ -5,7 +5,7 @@ _pyname=alabaster pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="Modified Kr Sphinx doc theme (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-sphinx/PKGBUILD b/mingw-w64-python-sphinx/PKGBUILD index 4683e973bb..dfc4031a3c 100644 --- a/mingw-w64-python-sphinx/PKGBUILD +++ b/mingw-w64-python-sphinx/PKGBUILD @@ -6,7 +6,7 @@ _realname=sphinx pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python documentation generator (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD index 27008ff5e0..1da25472c1 100644 --- a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD +++ b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD @@ -4,7 +4,7 @@ _realname=sphinx_rtd_theme pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="Python Sphinx Read The Docs Theme (mingw-w64)" arch=('any') license=('MIT') diff --git a/mingw-w64-python-sqlitedict/PKGBUILD b/mingw-w64-python-sqlitedict/PKGBUILD index c9f4a3ae9a..d7b840fd75 100644 --- a/mingw-w64-python-sqlitedict/PKGBUILD +++ b/mingw-w64-python-sqlitedict/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Persistent dict, backed by sqlite3 and pickle, multithread-safe (mingw-w64)" arch=('any') license=('BSD') diff --git a/mingw-w64-python-statsmodels/PKGBUILD b/mingw-w64-python-statsmodels/PKGBUILD index 961222a1cc..179ff5323e 100644 --- a/mingw-w64-python-statsmodels/PKGBUILD +++ b/mingw-w64-python-statsmodels/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") pkgver=0.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Statistical computations and models for use with SciPy (mingw-w64)" arch=('any') url="https://statsmodels.sourceforge.io/" diff --git a/mingw-w64-python-traitlets/PKGBUILD b/mingw-w64-python-traitlets/PKGBUILD index 5140ce990f..25ffd0b810 100644 --- a/mingw-w64-python-traitlets/PKGBUILD +++ b/mingw-w64-python-traitlets/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=4.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight Traits like module (mingw-w64)" url="https://github.com/ipython/traitlets" arch=('any') diff --git a/mingw-w64-python-wcwidth/PKGBUILD b/mingw-w64-python-wcwidth/PKGBUILD index 85449e970e..014d0fe754 100644 --- a/mingw-w64-python-wcwidth/PKGBUILD +++ b/mingw-w64-python-wcwidth/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=0.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="Measures number of Terminal column cells of wide-character codes (mingw-w64)" url="https://github.com/jquast/wcwidth" arch=('any') diff --git a/mingw-w64-python-webencodings/PKGBUILD b/mingw-w64-python-webencodings/PKGBUILD index 3b04f923fb..b2509ca595 100644 --- a/mingw-w64-python-webencodings/PKGBUILD +++ b/mingw-w64-python-webencodings/PKGBUILD @@ -4,7 +4,7 @@ _realname=webencodings pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.5.1 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="This is a Python implementation of the WHATWG Encoding standard. (mingw-w64)" url="https://github.com/gsnedders/python-webencodings" diff --git a/mingw-w64-python-win_unicode_console/PKGBUILD b/mingw-w64-python-win_unicode_console/PKGBUILD index 62b11893c1..f25b1f2f6e 100644 --- a/mingw-w64-python-win_unicode_console/PKGBUILD +++ b/mingw-w64-python-win_unicode_console/PKGBUILD @@ -7,7 +7,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" ) pkgver=0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Measures number of Terminal column cells of wide-character codes" url="https://github.com/Drekin/win-unicode-console" arch=('any') diff --git a/mingw-w64-python-xlsxwriter/PKGBUILD b/mingw-w64-python-xlsxwriter/PKGBUILD index 63240ac486..209fc79875 100644 --- a/mingw-w64-python-xlsxwriter/PKGBUILD +++ b/mingw-w64-python-xlsxwriter/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}") pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A Python module for creating Excel XLSL files (mingw-w64)" url="https://github.com/jmcnamara/XlsxWriter" arch=('any') diff --git a/mingw-w64-python-yaml/PKGBUILD b/mingw-w64-python-yaml/PKGBUILD index c72dbffdde..7036252856 100644 --- a/mingw-w64-python-yaml/PKGBUILD +++ b/mingw-w64-python-yaml/PKGBUILD @@ -7,7 +7,7 @@ _realname=yaml pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.12 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for YAML, using fast libYAML library (mingw-w64)" arch=('any') url='https://pyyaml.org/' diff --git a/mingw-w64-python-zope.event/PKGBUILD b/mingw-w64-python-zope.event/PKGBUILD index a9f9f0cafe..1a0ddcd210 100644 --- a/mingw-w64-python-zope.event/PKGBUILD +++ b/mingw-w64-python-zope.event/PKGBUILD @@ -4,7 +4,7 @@ _realname=zope.event pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Very basic event publishing system (mingw-w64)' url='https://pypi.python.org/pypi/zope.event' license=('ZPL 2.1') diff --git a/mingw-w64-python-zope.interface/PKGBUILD b/mingw-w64-python-zope.interface/PKGBUILD index 414a0b2bcc..35cdabe9b6 100644 --- a/mingw-w64-python-zope.interface/PKGBUILD +++ b/mingw-w64-python-zope.interface/PKGBUILD @@ -4,7 +4,7 @@ _realname=zope.interface pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.1.3 -pkgrel=1 +pkgrel=2 pkgdesc='Interfaces for Python (mingw-w64)' url=' https://github.com/zopefoundation/zope.interface' license=('ZPL 2.1') diff --git a/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch b/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch index ef4f70ad0f..3956b7c52d 100644 --- a/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch +++ b/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch @@ -1,7 +1,6 @@ -diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-06-26 00:38:39.000000000 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:20:33.114800700 +0300 -@@ -1701,6 +1701,37 @@ +--- Python-3.6.1/configure.ac.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/configure.ac 2017-06-13 17:33:35.533664900 +0200 +@@ -1855,6 +1855,37 @@ BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -39,7 +38,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac # 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). -@@ -1728,6 +1759,7 @@ +@@ -1882,6 +1913,7 @@ ],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no]) ]) AC_MSG_RESULT($ac_cv_pthread_is_default) @@ -47,7 +46,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac if test $ac_cv_pthread_is_default = yes -@@ -1819,6 +1851,9 @@ +@@ -1973,6 +2005,9 @@ AC_MSG_RESULT($ac_cv_pthread) fi @@ -57,7 +56,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. ac_cv_cxx_thread=no -@@ -1839,6 +1874,10 @@ +@@ -1993,6 +2028,10 @@ then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -68,7 +67,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac fi if test $ac_cv_cxx_thread = yes -@@ -1868,6 +1907,11 @@ +@@ -2022,6 +2061,11 @@ dnl AC_MSG_RESULT($cpp_type) # checks for header files @@ -80,7 +79,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ -@@ -2137,9 +2181,14 @@ +@@ -2247,9 +2291,14 @@ AC_MSG_CHECKING(for pthread_t) have_pthread_t=no @@ -95,8 +94,8 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac AC_MSG_RESULT($have_pthread_t) if test "$have_pthread_t" = yes ; then AC_CHECK_SIZEOF(pthread_t, [], [ -@@ -2556,11 +2605,16 @@ - [Define if the libcrypto has RAND_egd])) +@@ -2665,11 +2714,16 @@ + AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # only check for sem_init if thread support is requested +if test $ac_cv_ntthread = yes ; then @@ -112,7 +111,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac # check if we need libintl for locale functions AC_CHECK_LIB(intl, textdomain, -@@ -2840,6 +2894,13 @@ +@@ -2945,6 +2999,13 @@ AC_DEFINE(WITH_THREAD) posix_threads=yes THREADOBJ="Python/thread.o" @@ -126,7 +125,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac else if test ! -z "$with_threads" -a -d "$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads" -@@ -3269,6 +3330,15 @@ +@@ -3392,6 +3453,15 @@ fi # checks for library functions @@ -142,7 +141,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \ fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \ -@@ -4271,6 +4341,10 @@ +@@ -4438,6 +4508,10 @@ # 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. @@ -153,7 +152,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -4304,6 +4378,14 @@ +@@ -4471,6 +4545,14 @@ # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) diff --git a/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 471a7d19fd..4cd9cb0db8 100644 --- a/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,9 +1,8 @@ -diff -Naur Python-3.5.2-orig/Include/pyport.h Python-3.5.2/Include/pyport.h ---- Python-3.5.2-orig/Include/pyport.h 2016-06-26 00:38:35.000000000 +0300 -+++ Python-3.5.2/Include/pyport.h 2016-07-12 14:20:35.072800700 +0300 -@@ -13,6 +13,21 @@ - #include - #endif +--- Python-3.6.1/Include/pyport.h.orig 2017-06-13 17:39:57.300500800 +0200 ++++ Python-3.6.1/Include/pyport.h 2017-06-13 17:40:55.502829700 +0200 +@@ -5,6 +5,21 @@ + + #include +#ifdef __MINGW32__ +/* Translate GCC[mingw*] platform specific defines to those diff --git a/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch b/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch index c096cbe712..295cc98176 100644 --- a/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch @@ -1,9 +1,8 @@ -diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:38.518800700 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:20:38.790800700 +0300 -@@ -898,6 +898,27 @@ - AC_SUBST(PLATDIR) - AC_SUBST(PLATFORM_TRIPLET) +--- Python-3.6.1/configure.ac.orig 2017-06-13 17:42:33.096411800 +0200 ++++ Python-3.6.1/configure.ac 2017-06-13 17:44:43.059845300 +0200 +@@ -919,6 +919,28 @@ + fi + AC_SUBST(MULTIARCH_CPPFLAGS) +# initialize default configuration +py_config= @@ -26,9 +25,10 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac + . "$srcdir/Misc/cross_$py_config" + fi +fi - ++ AC_MSG_CHECKING([for -Wl,--no-as-needed]) save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,--no-as-needed" diff -Naur Python-3.5.2-orig/Misc/config_mingw Python-3.5.2/Misc/config_mingw --- Python-3.5.2-orig/Misc/config_mingw 1970-01-01 03:00:00.000000000 +0300 +++ Python-3.5.2/Misc/config_mingw 2016-07-12 14:20:38.832800700 +0300 diff --git a/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch index f7c0b70a23..4009de0760 100644 --- a/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,13 +1,10 @@ -diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:40.364800700 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:20:40.673300700 +0300 -@@ -2186,10 +2186,22 @@ +--- Python-3.6.1/configure.ac.orig 2017-06-13 10:13:37.391777600 +0200 ++++ Python-3.6.1/configure.ac 2017-06-13 12:08:23.122618900 +0200 +@@ -2301,8 +2301,20 @@ ]) AC_MSG_CHECKING(whether to enable large file support) +have_largefile_support=no - if test "$have_long_long" = yes - then if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then + have_largefile_support=yes @@ -19,18 +16,8 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac + ;; + esac +fi -+fi ++ +if test $have_largefile_support = yes ; then AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1, [Defined to enable large file support when an off_t is bigger than a long and long long is available and at least as big as an off_t. You may need -@@ -2199,9 +2211,6 @@ - else - AC_MSG_RESULT(no) - fi --else -- AC_MSG_RESULT(no) --fi - - AC_CHECK_SIZEOF(time_t, [], [ - #ifdef HAVE_SYS_TYPES_H diff --git a/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch b/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch deleted file mode 100644 index ba72a79e68..0000000000 --- a/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur Python-3.5.2-orig/Python/random.c Python-3.5.2/Python/random.c ---- Python-3.5.2-orig/Python/random.c 2016-06-26 00:38:38.000000000 +0300 -+++ Python-3.5.2/Python/random.c 2016-07-12 14:20:42.514300700 +0300 -@@ -1,6 +1,12 @@ - #include "Python.h" - #ifdef MS_WINDOWS - # include -+#ifdef __MINGW32__ -+/* NOTE: All sample MSDN wincrypt programs include header below as it -+ * is required to ensure that application could be build properly in -+ * all cases. */ -+# include -+#endif - #else - # include - # ifdef HAVE_SYS_STAT_H diff --git a/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch b/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch deleted file mode 100644 index c9316bfe2e..0000000000 --- a/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:47.973300700 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:20:48.333800700 +0300 -@@ -3940,6 +3940,27 @@ - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)]) - fi - -+case $host in -+ *-*-mingw*) -+ dnl See Modules/posixmodule.c for details. -+ dnl Also check below distinguish wingw and mingw-w64 -+ AC_MSG_CHECKING([for REPARSE_DATA_BUFFER]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -+#include -+#include -+], [ -+ REPARSE_DATA_BUFFER rdb -+])], -+ [py_reparse_data_buffer=yes], -+ [py_reparse_data_buffer=no] -+ ) -+ AC_MSG_RESULT([$py_reparse_data_buffer]) -+ if test yes = $py_reparse_data_buffer; then -+ AC_DEFINE([HAVE_REPARSE_DATA_BUFFER],[1],[Define to 1 if you have the 'REPARSE_DATA_BUFFER' structure.]) -+ fi -+ ;; -+esac -+ - # checks for compiler characteristics - - AC_C_CHAR_UNSIGNED -diff -Naur Python-3.5.2-orig/Modules/winreparse.h Python-3.5.2/Modules/winreparse.h ---- Python-3.5.2-orig/Modules/winreparse.h 2016-06-26 00:38:38.000000000 +0300 -+++ Python-3.5.2/Modules/winreparse.h 2016-07-12 14:20:48.344300700 +0300 -@@ -12,6 +12,15 @@ - http://msdn.microsoft.com/en-us/library/ff552012.aspx as the required - include doesn't seem to be present in the Windows SDK (at least as included - with Visual Studio Express). */ -+#ifndef HAVE_REPARSE_DATA_BUFFER -+/* -+ * REPARSE_DATA_BUFFER is defined in on mingw.org w32api -+ * instead as is documented in . The mingw-w64 API define -+ * it in but we can not include as header like -+ * is required instead , i.e. to use mingw-w64 -+ * headers user must specify explicitly path to ddk :(. -+ * So lest check at configure time and use MSC hack if not found. -+ */ - typedef struct _REPARSE_DATA_BUFFER { - ULONG ReparseTag; - USHORT ReparseDataLength; -@@ -42,7 +51,11 @@ - - #define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER,\ - GenericReparseBuffer) -+#ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE - #define MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 ) -+#endif -+ -+#endif /*ndef HAVE_REPARSE_DATA_BUFFER*/ - - #ifdef __cplusplus - } -diff -Naur Python-3.5.2-orig/pyconfig.h.in Python-3.5.2/pyconfig.h.in ---- Python-3.5.2-orig/pyconfig.h.in 2016-07-12 14:20:34.795800700 +0300 -+++ Python-3.5.2/pyconfig.h.in 2016-07-12 14:20:48.350300700 +0300 -@@ -717,6 +717,9 @@ - /* Define if readline supports append_history */ - #undef HAVE_RL_APPEND_HISTORY - -+/* Define to 1 if you have the 'REPARSE_DATA_BUFFER' structure. */ -+#undef HAVE_REPARSE_DATA_BUFFER -+ - /* Define if you have readline 2.1 */ - #undef HAVE_RL_CALLBACK - diff --git a/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch index cce8c69376..ce4b17b3a4 100644 --- a/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch @@ -1,7 +1,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:49.960800700 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:20:50.311300700 +0300 -@@ -2867,6 +2867,14 @@ +--- Python-3.6.1/configure.ac.orig 2017-06-13 12:46:54.007793900 +0200 ++++ Python-3.6.1/configure.ac 2017-06-13 12:48:29.585260700 +0200 +@@ -2995,6 +2995,14 @@ fi]) AC_MSG_RESULT($with_dbmliborder) @@ -13,22 +13,19 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac + *-*-mingw*) USE_WIN32_MODULE=;; +esac + - # Determine if signalmodule should be used. - AC_SUBST(USE_SIGNAL_MODULE) - AC_SUBST(SIGNAL_OBJS) + # This is used to generate Setup.config + AC_SUBST(USE_THREAD_MODULE) + USE_THREAD_MODULE="" diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in ---- Python-3.5.2-orig/Modules/Setup.config.in 2016-07-12 14:20:48.038800700 +0300 -+++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:20:50.320300700 +0300 -@@ -10,7 +10,10 @@ +--- Python-3.6.1/Modules/Setup.config.in.orig 2017-06-13 12:22:21.218555200 +0200 ++++ Python-3.6.1/Modules/Setup.config.in 2017-06-13 12:51:10.275451600 +0200 +@@ -9,5 +9,8 @@ + # Threading @USE_THREAD_MODULE@_thread _threadmodule.c - # The signal module --@USE_SIGNAL_MODULE@_signal signalmodule.c -+@USE_SIGNAL_MODULE@_signal signalmodule.c -lws2_32 -+ +# build-in modules for windows platform: +@USE_WIN32_MODULE@winreg ../PC/winreg.c - ++ # The rest of the modules previously listed in this file are built # by the setup.py script in Python 2.1 and later. diff -Naur Python-3.5.2-orig/PC/winreg.c Python-3.5.2/PC/winreg.c diff --git a/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch index 631fd6689c..b42078a8cf 100644 --- a/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,7 +1,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-07-12 14:20:52.008800700 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:20:52.326800700 +0300 -@@ -2875,6 +2875,13 @@ +--- Python-3.6.1/configure.ac.orig 2017-06-13 12:52:21.586530400 +0200 ++++ Python-3.6.1/configure.ac 2017-06-13 12:53:23.795088500 +0200 +@@ -3003,6 +3003,13 @@ *-*-mingw*) USE_WIN32_MODULE=;; esac @@ -12,9 +12,9 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac + *-*-mingw*) USE_PWD_MODULE='#';; +esac + - # Determine if signalmodule should be used. - AC_SUBST(USE_SIGNAL_MODULE) - AC_SUBST(SIGNAL_OBJS) + # This is used to generate Setup.config + AC_SUBST(USE_THREAD_MODULE) + USE_THREAD_MODULE="" diff -Naur Python-3.5.2-orig/Modules/Setup.config.in Python-3.5.2/Modules/Setup.config.in --- Python-3.5.2-orig/Modules/Setup.config.in 2016-07-12 14:20:52.015300700 +0300 +++ Python-3.5.2/Modules/Setup.config.in 2016-07-12 14:20:52.344800700 +0300 diff --git a/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch b/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch index 285b438f57..fb41b16547 100644 --- a/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch +++ b/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch @@ -23,10 +23,9 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac AC_MSG_CHECKING(for build directories) for dir in $SRCDIRS; do if test ! -d $dir; then -diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in ---- Python-3.5.2-orig/Makefile.pre.in 2016-06-26 00:38:37.000000000 +0300 -+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:20:54.272800700 +0300 -@@ -249,7 +249,7 @@ +--- Python-3.6.1/Makefile.pre.in.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/Makefile.pre.in 2017-06-13 17:46:52.785265100 +0200 +@@ -255,7 +255,7 @@ # Modules MODULE_OBJS= \ Modules/config.o \ @@ -35,15 +34,15 @@ diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in Modules/main.o \ Modules/gcmodule.o -@@ -747,6 +747,7 @@ - -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ +@@ -745,6 +745,7 @@ + -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \ -o $@ $(srcdir)/Modules/getbuildinfo.c +# default sys.path calculations for posix platforms Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ -DPREFIX='"$(prefix)"' \ -@@ -755,6 +756,13 @@ +@@ -753,6 +754,13 @@ -DVPATH='"$(VPATH)"' \ -o $@ $(srcdir)/Modules/getpath.c @@ -57,10 +56,9 @@ diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in Programs/python.o: $(srcdir)/Programs/python.c $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c -diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c ---- Python-3.5.2-orig/PC/getpathp.c 2016-06-26 00:38:38.000000000 +0300 -+++ Python-3.5.2/PC/getpathp.c 2016-07-12 14:20:54.300800700 +0300 -@@ -87,10 +87,26 @@ +--- Python-3.6.1/PC/getpathp.c.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/PC/getpathp.c 2017-06-13 17:51:56.533638500 +0200 +@@ -112,10 +112,26 @@ * with a semicolon separated path prior to calling Py_Initialize. */ @@ -87,8 +85,8 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c static wchar_t prefix[MAXPATHLEN+1]; static wchar_t progpath[MAXPATHLEN+1]; static wchar_t dllpath[MAXPATHLEN+1]; -@@ -183,6 +199,69 @@ - Py_FatalError("buffer overflow in getpathp.c's join()"); +@@ -241,6 +257,69 @@ + } } +#ifdef USE_POSIX_PREFIX @@ -157,7 +155,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c /* gotlandmark only called by search_for_prefix, which ensures 'prefix' is null terminated in bounds. join() ensures 'landmark' can not overflow prefix if too long. -@@ -491,6 +570,9 @@ +@@ -631,6 +710,9 @@ size_t bufsz; wchar_t *pythonhome = Py_GetPythonHome(); wchar_t *envpath = NULL; @@ -165,11 +163,11 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c + int pfound; +#endif - #ifdef MS_WINDOWS int skiphome, skipdefault; -@@ -563,6 +645,16 @@ - } - } + wchar_t *machinepath = NULL; +@@ -696,6 +778,16 @@ + /* Calculate zip archive path from DLL or exe path */ + change_ext(zip_path, dllpath[0] ? dllpath : progpath, L".zip"); +#ifdef USE_POSIX_PREFIX + pfound = search_for_posix_prefix(argv0_path, pythonhome, NULL); @@ -182,9 +180,9 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c + reduce(prefix); +#else if (pythonhome == NULL || *pythonhome == '\0') { - if (search_for_prefix(argv0_path, LANDMARK)) - pythonhome = prefix; -@@ -571,11 +663,11 @@ + if (zip_path[0] && exists(zip_path)) { + wcscpy_s(prefix, MAXPATHLEN+1, zip_path); +@@ -708,6 +800,7 @@ } else wcscpy_s(prefix, MAXPATHLEN+1, pythonhome); @@ -192,12 +190,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c if (envpath && *envpath == '\0') envpath = NULL; - -- - #ifdef MS_WINDOWS - /* Calculate zip archive path from DLL or exe path */ - if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath)) -@@ -627,6 +719,9 @@ +@@ -748,6 +841,9 @@ } else bufsz = 0; @@ -206,8 +199,8 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c +#endif bufsz += wcslen(PYTHONPATH) + 1; bufsz += wcslen(argv0_path) + 1; - #ifdef MS_WINDOWS -@@ -671,6 +766,11 @@ + if (userpath) +@@ -787,6 +883,11 @@ buf = wcschr(buf, L'\0'); *buf++ = DELIM; } @@ -219,7 +212,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c if (userpath) { if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath)) Py_FatalError("buffer overflow in getpathp.c's calculate_path()"); -@@ -739,6 +839,12 @@ +@@ -847,6 +948,12 @@ on the path, and that our 'prefix' directory is the parent of that. */ diff --git a/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch b/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch index 963eed641a..31081dc96e 100644 --- a/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch +++ b/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch @@ -1,6 +1,5 @@ -diff -Naur Python-3.5.2-orig/Python-3.5.0/Python/fileblocks.c Python-3.5.2/Python-3.5.0/Python/fileblocks.c ---- Python-3.5.2-orig/Python-3.5.0/Python/fileblocks.c 1970-01-01 03:00:00.000000000 +0300 -+++ Python-3.5.2/Python-3.5.0/Python/fileblocks.c 2016-07-12 14:20:56.221800700 +0300 +--- Python-3.5.2-orig/Python/fileblocks.c 1970-01-01 03:00:00.000000000 +0300 ++++ Python-3.5.2/Python/fileblocks.c 2016-07-12 14:20:56.221800700 +0300 @@ -0,0 +1,17 @@ +/* +-- Macro: AC_STRUCT_ST_BLOCKS diff --git a/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch b/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch index ff32503a9a..7f9625904a 100644 --- a/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch +++ b/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch @@ -1,7 +1,6 @@ -diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c ---- Python-3.5.2-orig/PC/getpathp.c 2016-07-12 14:20:55.989800700 +0300 -+++ Python-3.5.2/PC/getpathp.c 2016-07-12 14:21:11.286800700 +0300 -@@ -104,10 +104,17 @@ +--- Python-3.6.1/PC/getpathp.c.orig 2017-06-13 18:34:39.009203800 +0200 ++++ Python-3.6.1/PC/getpathp.c 2017-06-13 18:36:41.448206900 +0200 +@@ -129,10 +129,17 @@ # define USE_POSIX_PREFIX @@ -19,7 +18,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c static wchar_t progpath[MAXPATHLEN+1]; static wchar_t dllpath[MAXPATHLEN+1]; static wchar_t *module_search_path = NULL; -@@ -299,6 +306,82 @@ +@@ -356,6 +363,82 @@ /* a string loaded from the DLL at startup.*/ extern const char *PyWin_DLLVersionString; @@ -102,7 +101,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c /* Load a PYTHONPATH value from the registry. Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER. -@@ -573,6 +656,9 @@ +@@ -713,6 +796,9 @@ #ifdef USE_POSIX_PREFIX int pfound; #endif @@ -110,9 +109,9 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c + int efound; +#endif - #ifdef MS_WINDOWS int skiphome, skipdefault; -@@ -668,6 +754,16 @@ + wchar_t *machinepath = NULL; +@@ -805,6 +891,15 @@ if (envpath && *envpath == '\0') envpath = NULL; @@ -125,11 +124,10 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c + join(exec_prefix, L"lib-dynload"); + } +#endif -+ - #ifdef MS_WINDOWS - /* Calculate zip archive path from DLL or exe path */ - if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath)) -@@ -722,6 +818,9 @@ + + skiphome = pythonhome==NULL ? 0 : 1; + #ifdef Py_ENABLE_SHARED +@@ -844,6 +939,9 @@ #ifdef USE_POSIX_PREFIX bufsz += wcslen(prefix) + 1; #endif @@ -138,8 +136,8 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c +#endif bufsz += wcslen(PYTHONPATH) + 1; bufsz += wcslen(argv0_path) + 1; - #ifdef MS_WINDOWS -@@ -771,6 +870,11 @@ + if (userpath) +@@ -888,6 +986,11 @@ buf = wcschr(buf, L'\0'); *buf++ = DELIM; #endif @@ -151,7 +149,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c if (userpath) { if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath)) Py_FatalError("buffer overflow in getpathp.c's calculate_path()"); -@@ -844,6 +948,17 @@ +@@ -953,6 +1056,17 @@ reduce(prefix); reduce(prefix); } @@ -169,7 +167,7 @@ diff -Naur Python-3.5.2-orig/PC/getpathp.c Python-3.5.2/PC/getpathp.c #endif if (*prefix==L'\0') { wchar_t lookBuf[MAXPATHLEN+1]; -@@ -913,7 +1028,13 @@ +@@ -1022,7 +1136,13 @@ wchar_t * Py_GetExecPrefix(void) { diff --git a/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch index 6e3daa6e77..dbca081d9c 100644 --- a/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -59,10 +59,9 @@ diff -Naur Python-3.5.2-orig/Modules/_ctypes/callproc.c Python-3.5.2/Modules/_ct #endif if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred()) return -1; -diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py ---- Python-3.5.2-orig/setup.py 2016-07-12 14:21:20.319800700 +0300 -+++ Python-3.5.2/setup.py 2016-07-12 14:21:20.629800700 +0300 -@@ -1989,6 +1989,8 @@ +--- Python-3.6.1/setup.py.orig 2017-06-13 18:39:22.632426100 +0200 ++++ Python-3.6.1/setup.py 2017-06-13 18:40:10.272150900 +0200 +@@ -2019,6 +2019,8 @@ ext_test = Extension('_ctypes_test', sources=['_ctypes/_ctypes_test.c'], libraries=math_libs) @@ -70,8 +69,8 @@ diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py + ext_test.libraries.extend(['oleaut32']) self.extensions.extend([ext, ext_test]) - if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): -@@ -2022,6 +2024,8 @@ + if host_platform == 'darwin': +@@ -2055,6 +2057,8 @@ if ffi_inc and ffi_lib: ext.include_dirs.extend(ffi_inc) ext.libraries.append(ffi_lib) diff --git a/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch index 4911023eb2..01ceb3561a 100644 --- a/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,10 +1,9 @@ -diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py ---- Python-3.5.2-orig/setup.py 2016-07-12 14:21:35.548300700 +0300 -+++ Python-3.5.2/setup.py 2016-07-12 14:21:39.523300700 +0300 -@@ -2268,7 +2268,7 @@ +--- Python-3.6.1/setup.py.orig 2017-06-13 13:01:14.879033000 +0200 ++++ Python-3.6.1/setup.py 2017-06-13 13:01:54.864320000 +0200 +@@ -2292,7 +2292,7 @@ else: newfilename = filename + minoronly - log.info('renaming {} to {}'.format(filename, newfilename)) + log.info('renaming %s to %s', filename, newfilename) - os.rename(filename, newfilename) + os.replace(filename, newfilename) newoutfiles.append(newfilename) diff --git a/mingw-w64-python3/0490-MINGW-customize-site.patch b/mingw-w64-python3/0490-MINGW-customize-site.patch index 6ad07442ac..9d03a6e56f 100644 --- a/mingw-w64-python3/0490-MINGW-customize-site.patch +++ b/mingw-w64-python3/0490-MINGW-customize-site.patch @@ -1,7 +1,6 @@ -diff -Naur Python-3.5.2-orig/Lib/site.py Python-3.5.2/Lib/site.py ---- Python-3.5.2-orig/Lib/site.py 2016-06-26 00:38:36.000000000 +0300 -+++ Python-3.5.2/Lib/site.py 2016-07-12 14:21:44.968800700 +0300 -@@ -267,6 +267,12 @@ +--- Python-3.6.1/Lib/site.py.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/Lib/site.py 2017-06-13 18:43:05.740187100 +0200 +@@ -268,6 +268,12 @@ USER_SITE = get_path('purelib', 'osx_framework_user') return USER_SITE @@ -14,7 +13,7 @@ diff -Naur Python-3.5.2-orig/Lib/site.py Python-3.5.2/Lib/site.py USER_SITE = get_path('purelib', '%s_user' % os.name) return USER_SITE -@@ -297,12 +303,13 @@ +@@ -298,12 +304,13 @@ if prefixes is None: prefixes = PREFIXES @@ -27,5 +26,5 @@ diff -Naur Python-3.5.2-orig/Lib/site.py Python-3.5.2/Lib/site.py - if os.sep == '/': + if _POSIX_BUILD: sitepackages.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], + "python%d.%d" % sys.version_info[:2], "site-packages")) diff --git a/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch b/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch index a466d7382c..fcc38f595c 100644 --- a/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch +++ b/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch @@ -1,13 +1,13 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac --- Python-3.5.2-orig/configure.ac 2016-07-12 14:21:50.147800700 +0300 +++ Python-3.5.2/configure.ac 2016-07-12 14:21:50.471800700 +0300 -@@ -2021,7 +2021,7 @@ +@@ -2175,7 +2175,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ -ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \ +ieeefp.h io.h langinfo.h libintl.h process.h \ - sched.h shadow.h signal.h stdint.h stropts.h termios.h \ + sched.h shadow.h signal.h stropts.h termios.h \ unistd.h utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ @@ -2734,9 +2734,11 @@ diff --git a/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch b/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch deleted file mode 100644 index b8f2f0be5e..0000000000 --- a/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur Python-3.5.2-orig/Lib/plat-generic/regen Python-3.5.2/Lib/plat-generic/regen ---- Python-3.5.2-orig/Lib/plat-generic/regen 2016-06-26 00:38:36.000000000 +0300 -+++ Python-3.5.2/Lib/plat-generic/regen 2016-07-12 14:21:56.200300700 +0300 -@@ -1,3 +1,9 @@ - #! /bin/sh - set -v --eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" /usr/include/netinet/in.h -+if [ -n "$1" ]; then -+ CCINSTALL=$($1 -print-search-dirs | head -1 | cut -d' ' -f2) -+ REGENHEADER=${CCINSTALL//\\//}/include/stddef.h -+else -+ REGENHEADER=/usr/include/netinet/in.h -+fi -+eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $REGENHEADER -diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in ---- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:55.874300700 +0300 -+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:21:56.214800700 +0300 -@@ -1363,7 +1363,7 @@ - else \ - PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \ - fi; \ -- cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen -+ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen "$(CC)" - - python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - # Substitution happens here, as the completely-expanded BINDIR diff --git a/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 64ffe3f654..3912ad7b10 100644 --- a/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -15,9 +15,9 @@ diff -Naur Python-3.5.2-orig/Include/pylifecycle.h Python-3.5.2/Include/pylifecy PyAPI_FUNC(wchar_t *) Py_GetProgramName(void); diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py ---- Python-3.5.2-orig/Lib/ntpath.py 2016-06-26 00:38:36.000000000 +0300 -+++ Python-3.5.2/Lib/ntpath.py 2016-07-12 14:21:58.198800700 +0300 -@@ -24,9 +24,15 @@ +--- Python-3.6.1/Lib/ntpath.py.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/Lib/ntpath.py 2017-06-13 13:23:15.799585300 +0200 +@@ -24,17 +24,41 @@ curdir = '.' pardir = '..' extsep = '.' @@ -33,9 +33,7 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py pathsep = ';' -altsep = '/' defpath = '.;C:\\bin' - if 'ce' in sys.builtin_module_names: - defpath = '\\Windows' -@@ -34,9 +40,27 @@ + devnull = 'nul' def _get_bothseps(path): if isinstance(path, bytes): @@ -65,8 +63,8 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py # Normalize the case of a pathname and map slashes to backslashes. # Other normalizations (such as optimizing '../' away) are not done -@@ -48,9 +72,9 @@ - Makes all characters lowercase and all slashes into backslashes.""" +@@ -47,9 +71,9 @@ + s = os.fspath(s) try: if isinstance(s, bytes): - return s.replace(b'/', b'\\').lower() @@ -77,10 +75,10 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py except (TypeError, AttributeError): if not isinstance(s, (bytes, str)): raise TypeError("normcase() argument must be str or bytes, " -@@ -72,14 +96,9 @@ - +@@ -73,14 +97,9 @@ # Join two (or more) paths. def join(path, *paths): + path = os.fspath(path) - if isinstance(path, bytes): - sep = b'\\' - seps = b'\\/' @@ -95,9 +93,9 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py try: if not paths: path[:0] + sep #23780: Ensure compatible data type even if p is null. -@@ -137,14 +156,9 @@ - +@@ -139,14 +158,9 @@ """ + p = os.fspath(p) if len(p) >= 2: - if isinstance(p, bytes): - sep = b'\\' @@ -113,9 +111,9 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py normp = p.replace(altsep, sep) if (normp[0:2] == sep*2) and (normp[2:3] != sep): # is a UNC path: -@@ -219,9 +233,9 @@ - +@@ -222,9 +236,9 @@ def splitext(p): + p = os.fspath(p) if isinstance(p, bytes): - return genericpath._splitext(p, b'\\', b'/', b'.') + return genericpath._splitext(p, bsep, baltsep, b'.') @@ -125,10 +123,10 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py splitext.__doc__ = genericpath._splitext.__doc__ -@@ -464,15 +478,13 @@ - +@@ -471,15 +485,13 @@ def normpath(path): """Normalize path, eliminating double slashes, etc.""" + path = os.fspath(path) + sep = _get_sep(path) + altsep = _get_altsep(path) if isinstance(path, bytes): @@ -143,10 +141,10 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py curdir = '.' pardir = '..' special_prefixes = ('\\\\.\\', '\\\\?\\') -@@ -549,12 +561,11 @@ - +@@ -559,12 +571,11 @@ def relpath(path, start=None): """Return a relative version of a path""" + path = os.fspath(path) + sep = _get_sep(path) if isinstance(path, bytes): - sep = b'\\' @@ -157,12 +155,12 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py curdir = '.' pardir = '..' -@@ -607,13 +618,11 @@ - if not paths: +@@ -619,13 +630,11 @@ raise ValueError('commonpath() arg is an empty sequence') -+ sep = _get_sep(path) -+ altsep = _get_altsep(path) + paths = tuple(map(os.fspath, paths)) ++ sep = _get_sep(paths[0]) ++ altsep = _get_altsep(paths[0]) if isinstance(paths[0], bytes): - sep = b'\\' - altsep = b'/' @@ -173,9 +171,8 @@ diff -Naur Python-3.5.2-orig/Lib/ntpath.py Python-3.5.2/Lib/ntpath.py curdir = '.' try: -diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c ---- Python-3.5.2-orig/Modules/getpath.c 2016-06-26 00:38:38.000000000 +0300 -+++ Python-3.5.2/Modules/getpath.c 2016-07-12 14:21:58.209800700 +0300 +--- Python-3.6.1/Modules/getpath.c.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/Modules/getpath.c 2017-06-13 18:45:55.948922500 +0200 @@ -135,7 +135,7 @@ reduce(wchar_t *dir) { @@ -231,9 +228,9 @@ diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c @@ -461,7 +461,7 @@ extern wchar_t *Py_GetProgramName(void); - static wchar_t delimiter[2] = {DELIM, '\0'}; -- static wchar_t separator[2] = {SEP, '\0'}; -+ wchar_t separator[2] = {Py_GetSepW(NULL), '\0'}; + static const wchar_t delimiter[2] = {DELIM, '\0'}; +- static const wchar_t separator[2] = {SEP, '\0'}; ++ const wchar_t separator[2] = {Py_GetSepW(NULL), '\0'}; char *_rtpypath = Py_GETENV("PYTHONPATH"); /* XXX use wide version on Windows */ wchar_t *rtpypath = NULL; wchar_t *home = Py_GetPythonHome(); @@ -285,12 +282,12 @@ diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c - if (defpath[0] != SEP) { + if (defpath[0] != separator[0] && defpath[0] != '\0' && defpath[1] != L':') { wcscat(buf, prefix); - wcscat(buf, separator); - } + if (prefixsz >= 2 && prefix[prefixsz - 2] != SEP && + defpath[0] != (delim ? DELIM : L'\0')) { /* not empty */ diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmodule.c ---- Python-3.5.2-orig/Modules/posixmodule.c 2016-07-12 14:20:48.017800700 +0300 -+++ Python-3.5.2/Modules/posixmodule.c 2016-07-12 14:21:58.223300700 +0300 -@@ -3320,6 +3320,7 @@ +--- Python-3.6.1/Modules/posixmodule.c.orig 2017-06-13 13:12:03.902155000 +0200 ++++ Python-3.6.1/Modules/posixmodule.c 2017-06-13 13:15:07.480655000 +0200 +@@ -3237,6 +3237,7 @@ PyMem_RawFree(wbuf2); return PyErr_SetFromWindowsErr(0); } @@ -298,26 +295,15 @@ diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmod resobj = PyUnicode_FromWideChar(wbuf2, len); if (wbuf2 != wbuf) PyMem_RawFree(wbuf2); -@@ -3798,7 +3799,10 @@ - result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp); - } - if (result) -+ { -+ Py_NormalizeSepsW(woutbufp); - v = PyUnicode_FromWideChar(woutbufp, wcslen(woutbufp)); -+ } - else - v = win32_error_object("GetFullPathNameW", path->object); - if (woutbufp != woutbuf) -@@ -3814,6 +3818,7 @@ - win32_error_object("GetFullPathName", path->object); - return NULL; - } -+ Py_NormalizeSepsA(outbuf); - return PyBytes_FromString(outbuf); +@@ -3666,6 +3667,7 @@ + result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp); } - } -@@ -3875,6 +3880,7 @@ + if (result) { ++ Py_NormalizeSepsW(woutbufp); + v = PyUnicode_FromWideChar(woutbufp, wcslen(woutbufp)); + if (path->narrow) + Py_SETREF(v, PyUnicode_EncodeFSDefault(v)); +@@ -3733,6 +3735,7 @@ if(!CloseHandle(hFile)) return win32_error_object("CloseHandle", path); diff --git a/mingw-w64-python3/0560-mingw-use-posix-getpath.patch b/mingw-w64-python3/0560-mingw-use-posix-getpath.patch index f05ae4297f..4eca7aef30 100644 --- a/mingw-w64-python3/0560-mingw-use-posix-getpath.patch +++ b/mingw-w64-python3/0560-mingw-use-posix-getpath.patch @@ -138,15 +138,6 @@ diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmodule.c --- Python-3.5.2-orig/Modules/posixmodule.c 2016-07-12 14:21:59.946800700 +0300 +++ Python-3.5.2/Modules/posixmodule.c 2016-07-12 14:22:00.338300700 +0300 -@@ -3550,7 +3550,7 @@ - Py_END_ALLOW_THREADS - /* FindNextFile sets error to ERROR_NO_MORE_FILES if - it got to the end of the directory. */ -- if (!result && GetLastError() != ERROR_NO_MORE_FILES) { -+ if (!result && GetLastError() != 0 && GetLastError() != ERROR_NO_MORE_FILES) { - Py_DECREF(list); - list = path_error(path); - goto exit; @@ -3605,7 +3605,7 @@ Py_END_ALLOW_THREADS /* FindNextFile sets error to ERROR_NO_MORE_FILES if diff --git a/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch b/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch deleted file mode 100644 index f403fa83fc..0000000000 --- a/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in ---- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:21:57.813300700 +0300 -+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:22:05.917300700 +0300 -@@ -1128,6 +1128,7 @@ - if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ - if test -n "$(DLLLIBRARY)" ; then \ - $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ -+ mkdir -p $(DESTDIR)$(LIBPL); $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBPL); \ - else \ - $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \ - if test $(LDLIBRARY) != $(INSTSONAME); then \ diff --git a/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch b/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch index 84486efdc7..1ada0835b0 100644 --- a/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch +++ b/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch @@ -13,8 +13,8 @@ diff -Naur Python-3.5.2-orig/Lib/distutils/cygwinccompiler.py Python-3.5.2/Lib/d return (CONFIG_H_UNCERTAIN, "couldn't read '%s': %s" % (fn, exc.strerror)) --RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)') -+RE_VERSION = re.compile(b'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*$') +-RE_VERSION = re.compile(br'(\d+\.\d+(\.\d+)*)') ++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/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch index 97192952a8..d080fcb2a7 100644 --- a/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch @@ -78,16 +78,16 @@ diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods -@@ -1468,9 +1474,9 @@ +@@ -1457,9 +1463,9 @@ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ - --root=$(DESTDIR)/ -- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py +- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py - -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ + --root=$(DESTDIRFINAL) -+ -rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata.py -+ -rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__ ++ -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 diff --git a/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch b/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch deleted file mode 100644 index 3b26fb239d..0000000000 --- a/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac ---- Python-3.5.2-orig/configure.ac 2016-07-12 14:22:09.502800700 +0300 -+++ Python-3.5.2/configure.ac 2016-07-12 14:22:22.695800700 +0300 -@@ -5099,7 +5099,9 @@ - - # first curses header check - ac_save_cppflags="$CPPFLAGS" -+if test yes != "$cross_compiling"; then - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+fi - - AC_CHECK_HEADERS(curses.h ncurses.h) - diff --git a/mingw-w64-python3/0750-builddir-fixes.patch b/mingw-w64-python3/0750-builddir-fixes.patch index 853345a68a..b7e499a49d 100644 --- a/mingw-w64-python3/0750-builddir-fixes.patch +++ b/mingw-w64-python3/0750-builddir-fixes.patch @@ -1,7 +1,6 @@ -diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in ---- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:22:20.694800700 +0300 -+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:22:31.389800700 +0300 -@@ -723,15 +723,15 @@ +--- Python-3.6.1/Makefile.pre.in.orig 2017-06-13 18:47:49.722430000 +0200 ++++ Python-3.6.1/Makefile.pre.in 2017-06-13 18:48:21.888269700 +0200 +@@ -726,15 +726,15 @@ Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile @@ -9,28 +8,28 @@ diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in +Programs/_freeze_importlib$(EXE): Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) --Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib +-Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib Python/marshal.c - ./Programs/_freeze_importlib \ -+Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib$(EXE) ++Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib$(EXE) Python/marshal.c + ./Programs/_freeze_importlib$(EXE) \ $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h --Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib +-Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib Python/marshal.c - ./Programs/_freeze_importlib \ -+Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib$(EXE) ++Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib$(EXE) Python/marshal.c + ./Programs/_freeze_importlib$(EXE) \ $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h -@@ -1637,7 +1637,7 @@ +@@ -1626,7 +1626,7 @@ find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle - -rm -f Programs/_testembed Programs/_freeze_importlib + -rm -f Programs/_testembed Programs/_freeze_importlib$(EXE) -find build -type f -a ! -name '*.gc??' -exec rm -f {} ';' + -rm -f Include/pydtrace_probes.h - profile-removal: diff -Naur Python-3.5.2-orig/Programs/_freeze_importlib.c Python-3.5.2/Programs/_freeze_importlib.c --- Python-3.5.2-orig/Programs/_freeze_importlib.c 2016-06-26 00:38:38.000000000 +0300 +++ Python-3.5.2/Programs/_freeze_importlib.c 2016-07-12 14:22:31.403800700 +0300 diff --git a/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch index 10c8a4b69a..fe4c020e5b 100644 --- a/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch @@ -1,7 +1,6 @@ -diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py ---- Python-3.5.2-orig/setup.py 2016-07-12 14:22:34.521800700 +0300 -+++ Python-3.5.2/setup.py 2016-07-12 14:22:34.746300700 +0300 -@@ -420,7 +420,7 @@ +--- Python-3.6.1/setup.py.orig 2017-06-13 18:50:07.965337000 +0200 ++++ Python-3.6.1/setup.py 2017-06-13 18:51:04.486569800 +0200 +@@ -419,7 +419,7 @@ # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec cc = sysconfig.get_config_var('CC') @@ -10,7 +9,7 @@ diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system( -@@ -445,7 +445,7 @@ +@@ -444,7 +444,7 @@ opt = '' if cross_compiling: opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') @@ -19,7 +18,7 @@ diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system( -@@ -464,7 +464,7 @@ +@@ -463,7 +463,7 @@ def add_gcc_paths(self): gcc = sysconfig.get_config_var('CC') @@ -28,7 +27,7 @@ diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -@@ -744,7 +744,7 @@ +@@ -747,7 +747,7 @@ readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -37,7 +36,7 @@ diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # Determine if readline is already linked against curses or tinfo. -@@ -889,7 +889,7 @@ +@@ -892,7 +892,7 @@ opensslv_h = find_file('openssl/opensslv.h', [], inc_dirs + search_for_ssl_incs_in) if opensslv_h: @@ -46,9 +45,9 @@ diff -Naur Python-3.5.2-orig/setup.py Python-3.5.2/setup.py if host_platform == 'darwin' and is_macosx_sdk_path(name): name = os.path.join(macosx_sdk_root(), name[1:]) try: -@@ -1768,16 +1768,16 @@ +@@ -1795,16 +1795,16 @@ cflags = sysconfig.get_config_vars('CFLAGS')[0] - archs = re.findall('-arch\s+(\w+)', cflags) + archs = re.findall(r'-arch\s+(\w+)', cflags) - tmpfile = os.path.join(self.build_temp, 'tk.arch') + tmpfile = os.path.join(self.build_temp, 'tk.arch').replace('\\','/') diff --git a/mingw-w64-python3/0830-ctypes-python-dll.patch b/mingw-w64-python3/0830-ctypes-python-dll.patch index f6825805e3..9166883dbe 100644 --- a/mingw-w64-python3/0830-ctypes-python-dll.patch +++ b/mingw-w64-python3/0830-ctypes-python-dll.patch @@ -1,14 +1,14 @@ diff -Naur Python-3.5.2-orig/Lib/ctypes/__init__.py Python-3.5.2/Lib/ctypes/__init__.py ---- Python-3.5.2-orig/Lib/ctypes/__init__.py 2016-06-26 00:38:35.000000000 +0300 -+++ Python-3.5.2/Lib/ctypes/__init__.py 2016-07-12 14:22:43.305800700 +0300 -@@ -427,7 +427,9 @@ +--- Python-3.6.1/Lib/ctypes/__init__.py.orig 2017-06-13 13:44:21.354970900 +0200 ++++ Python-3.6.1/Lib/ctypes/__init__.py 2017-06-13 13:45:42.749626400 +0200 +@@ -428,7 +428,9 @@ cdll = LibraryLoader(CDLL) pydll = LibraryLoader(PyDLL) --if _os.name in ("nt", "ce"): +-if _os.name == "nt": +if _os.name == "nt" and _sys.version.find('GCC') >= 0: + pythonapi = PyDLL("libpython%d.%d%s.dll" % (_sys.version_info[:2] + (_sys.abiflags,)), None) -+elif _os.name in ("nt", "ce"): ++elif _os.name == "nt": pythonapi = PyDLL("python dll", None, _sys.dllhandle) elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) diff --git a/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch index adaab0aad3..4cd8002728 100644 --- a/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,16 +1,15 @@ -diff -Naur Python-3.5.2-orig/Lib/ssl.py Python-3.5.2/Lib/ssl.py ---- Python-3.5.2-orig/Lib/ssl.py 2016-06-26 00:38:36.000000000 +0300 -+++ Python-3.5.2/Lib/ssl.py 2016-07-12 14:22:50.005300700 +0300 -@@ -138,7 +138,7 @@ - except NameError: - _SSLv2_IF_EXISTS = None +--- Python-3.6.1/Lib/ssl.py.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/Lib/ssl.py 2017-06-13 18:53:10.237762400 +0200 +@@ -156,7 +156,7 @@ + _SSLv2_IF_EXISTS = getattr(_SSLMethod, 'PROTOCOL_SSLv2', None) + -if sys.platform == "win32": +if sys.platform == "win32" and sys.version.find("GCC") == -1: from _ssl import enum_certificates, enum_crls from socket import socket, AF_INET, SOCK_STREAM, create_connection -@@ -421,7 +421,7 @@ +@@ -445,7 +445,7 @@ def load_default_certs(self, purpose=Purpose.SERVER_AUTH): if not isinstance(purpose, _ASN1Object): raise TypeError(purpose) diff --git a/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch b/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch index 77c43636ef..e5e6faa8c4 100644 --- a/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch +++ b/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch @@ -1,7 +1,6 @@ -diff -Naur Python-3.5.2-orig/Python/pytime.c Python-3.5.2/Python/pytime.c ---- Python-3.5.2-orig/Python/pytime.c 2016-06-26 00:38:38.000000000 +0300 -+++ Python-3.5.2/Python/pytime.c 2016-07-12 14:23:01.904300700 +0300 -@@ -463,7 +463,7 @@ +--- Python-3.6.1/Python/pytime.c.orig 2017-03-21 07:32:38.000000000 +0100 ++++ Python-3.6.1/Python/pytime.c 2017-06-13 13:48:14.662315300 +0200 +@@ -536,7 +536,7 @@ /* 11,644,473,600,000,000,000: number of nanoseconds between the 1st january 1601 and the 1st january 1970 (369 years + 89 leap days). */ @@ -10,7 +9,7 @@ diff -Naur Python-3.5.2-orig/Python/pytime.c Python-3.5.2/Python/pytime.c if (info) { DWORD timeAdjustment, timeIncrement; BOOL isTimeAdjustmentDisabled, ok; -@@ -557,6 +557,34 @@ +@@ -630,6 +630,35 @@ return pygettimeofday(t, info, 1); } @@ -42,6 +41,7 @@ diff -Naur Python-3.5.2-orig/Python/pytime.c Python-3.5.2/Python/pytime.c + return ((ULONGLONG)n_overflow << 32LL) + (ULONGLONG)GetTickCount(); +} +#endif - ++ static int pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise) + { diff --git a/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch b/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch index 9271793a90..2c4bc1980f 100644 --- a/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch +++ b/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch @@ -53,19 +53,6 @@ diff -Naur Python-3.5.2-orig/Modules/posixmodule.c Python-3.5.2/Modules/posixmod buf, buf_size, VOLUME_NAME_DOS); if(!result_length) { -@@ -1516,6 +1541,12 @@ - wchar_t *target_path; - const char *dot; - -+ if(!check_GetFinalPathNameByHandle()) { -+ /* If the OS doesn't have GetFinalPathNameByHandle, don't -+ traverse reparse point. */ -+ traverse = FALSE; -+ } -+ - hFile = CreateFileA( - path, - FILE_READ_ATTRIBUTES, /* desired access */ @@ -1606,6 +1637,12 @@ wchar_t *target_path; const wchar_t *dot; diff --git a/mingw-w64-python3/1010-install-msilib.patch b/mingw-w64-python3/1010-install-msilib.patch index daff86211e..8ea7755a44 100644 --- a/mingw-w64-python3/1010-install-msilib.patch +++ b/mingw-w64-python3/1010-install-msilib.patch @@ -1,11 +1,10 @@ -diff -Naur Python-3.5.2-orig/Makefile.pre.in Python-3.5.2/Makefile.pre.in ---- Python-3.5.2-orig/Makefile.pre.in 2016-07-12 14:22:32.838800700 +0300 -+++ Python-3.5.2/Makefile.pre.in 2016-07-12 14:23:07.018300700 +0300 -@@ -1260,6 +1260,7 @@ - test/test_importlib/extension test/test_importlib/frozen \ +--- Python-3.6.1/Makefile.pre.in.orig 2017-06-13 18:54:47.196308100 +0200 ++++ Python-3.6.1/Makefile.pre.in 2017-06-13 18:55:21.584275000 +0200 +@@ -1264,6 +1264,7 @@ test/test_importlib/import_ test/test_importlib/source \ + test/test_tools test/test_warnings test/test_warnings/data \ turtledemo \ + msilib \ multiprocessing multiprocessing/dummy \ unittest unittest/test unittest/test/testmock \ - venv venv/scripts venv/scripts/posix \ + venv venv/scripts venv/scripts/common venv/scripts/posix \ diff --git a/mingw-w64-python3/1600-fix-disable-blake2-sse.patch b/mingw-w64-python3/1600-fix-disable-blake2-sse.patch new file mode 100644 index 0000000000..e483f477f1 --- /dev/null +++ b/mingw-w64-python3/1600-fix-disable-blake2-sse.patch @@ -0,0 +1,11 @@ +--- Python-3.6.1/setup.py.orig 2017-06-13 16:41:16.611128800 +0200 ++++ Python-3.6.1/setup.py 2017-06-13 16:42:21.729853400 +0200 +@@ -942,7 +942,7 @@ + blake2_deps.append('hashlib.h') + + blake2_macros = [] +- if not cross_compiling and os.uname().machine == "x86_64": ++ if not cross_compiling and not host_platform.startswith(('mingw', 'win')): + # Every x86_64 machine has at least SSE2. + blake2_macros.append(('BLAKE2_USE_SSE', '1')) + diff --git a/mingw-w64-python3/1610-fix-have-wspawnv.patch b/mingw-w64-python3/1610-fix-have-wspawnv.patch new file mode 100644 index 0000000000..4afa99ece3 --- /dev/null +++ b/mingw-w64-python3/1610-fix-have-wspawnv.patch @@ -0,0 +1,10 @@ +--- Python-3.6.1/Modules/posixmodule.c.orig 2017-06-13 16:38:37.397022300 +0200 ++++ Python-3.6.1/Modules/posixmodule.c 2017-06-13 16:39:08.751815700 +0200 +@@ -178,6 +178,7 @@ + #define HAVE_GETPPID 1 + #define HAVE_GETLOGIN 1 + #define HAVE_SPAWNV 1 ++#define HAVE_WSPAWNV 1 + /*#define HAVE_EXECV 1 - detected by configure*/ + #define HAVE_PIPE 1 + #define HAVE_POPEN 1 diff --git a/mingw-w64-python3/1620-fix-signal-module-build.patch b/mingw-w64-python3/1620-fix-signal-module-build.patch new file mode 100644 index 0000000000..41a606c054 --- /dev/null +++ b/mingw-w64-python3/1620-fix-signal-module-build.patch @@ -0,0 +1,11 @@ +--- Python-3.6.1/Modules/Setup.dist.orig 2017-06-13 14:20:17.448292400 +0200 ++++ Python-3.6.1/Modules/Setup.dist 2017-06-13 14:20:33.833229600 +0200 +@@ -114,7 +114,7 @@ + _collections _collectionsmodule.c # Container types + itertools itertoolsmodule.c # Functions creating iterators for efficient looping + atexit atexitmodule.c # Register functions to be run at interpreter-shutdown +-_signal signalmodule.c ++_signal signalmodule.c -lws2_32 + _stat _stat.c # stat.h interface + time timemodule.c # -lm # time operations and variables + diff --git a/mingw-w64-python3/1630-build-winconsoleio.patch b/mingw-w64-python3/1630-build-winconsoleio.patch new file mode 100644 index 0000000000..75a6c97a48 --- /dev/null +++ b/mingw-w64-python3/1630-build-winconsoleio.patch @@ -0,0 +1,11 @@ +--- Python-3.6.1/Modules/Setup.dist.orig 2017-06-13 16:46:17.581343400 +0200 ++++ Python-3.6.1/Modules/Setup.dist 2017-06-13 14:26:00.352905400 +0200 +@@ -122,7 +122,7 @@ + _locale _localemodule.c # -lintl + + # Standard I/O baseline +-_io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c ++_io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c _io/winconsoleio.c + + # The zipimport module is always imported at startup. Having it as a + # builtin module avoids some bootstrapping problems and reduces overhead. diff --git a/mingw-w64-python3/1640-dont-include-consoleapi-h.patch b/mingw-w64-python3/1640-dont-include-consoleapi-h.patch new file mode 100644 index 0000000000..9e304996cc --- /dev/null +++ b/mingw-w64-python3/1640-dont-include-consoleapi-h.patch @@ -0,0 +1,11 @@ +--- Python-3.6.1/Modules/_io/_iomodule.c.orig 2017-06-13 17:05:39.099778400 +0200 ++++ Python-3.6.1/Modules/_io/_iomodule.c 2017-06-13 17:05:11.212183300 +0200 +@@ -20,7 +20,7 @@ + #include + #endif /* HAVE_SYS_STAT_H */ + +-#ifdef MS_WINDOWS ++#if defined(MS_WINDOWS) && !defined(__MINGW32__) + #include + #endif + diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index 573063d131..475ca59d3b 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -16,9 +16,9 @@ _realname=python3 pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_pybasever=3.5 -pkgver=${_pybasever}.3 -pkgrel=2 +_pybasever=3.6 +pkgver=${_pybasever}.1 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -35,6 +35,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-tk" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-xz" + "${MINGW_PACKAGE_PREFIX}-sqlite3" ) makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('!makeflags') # '!strip' 'debug') @@ -46,10 +47,8 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0130-MINGW-configure-MACHDEP-and-platform-for-build.patch 0140-MINGW-preset-configure-defaults.patch 0150-MINGW-configure-largefile-support-for-windows-builds.patch - 0160-MINGW-add-wincrypt.h-in-Python-random.c.patch 0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch 0180-MINGW-init-system-calls.patch - 0190-MINGW-detect-REPARSE_DATA_BUFFER.patch 0200-MINGW-build-in-windows-modules-winreg.patch 0210-MINGW-determine-if-pwdmodule-should-be-used.patch 0220-MINGW-default-sys.path-calculations-for-windows-plat.patch @@ -85,7 +84,6 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0520-py3k-mingw-ntthreads-vs-pthreads.patch 0530-mingw-system-libffi.patch 0540-mingw-semicolon-DELIM.patch - 0550-mingw-regen-use-stddef_h.patch 0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch 0560-mingw-use-posix-getpath.patch 0565-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -98,7 +96,6 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0660-mingw-use-backslashes-in-compileall-py.patch 0670-msys-convert_path-fix-and-root-hack.patch 0690-allow-static-tcltk.patch - 0700-CROSS-avoid-ncursesw-include-path-hack.patch 0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch 0720-mingw-pdcurses_ISPAD.patch 0730-mingw-fix-ncurses-module.patch @@ -127,32 +124,35 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0980-mingw-readline-features-skip.patch 0990-MINGW-link-with-additional-library.patch 1010-install-msilib.patch - 1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch) + 1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch + 1600-fix-disable-blake2-sse.patch + 1610-fix-have-wspawnv.patch + 1620-fix-signal-module-build.patch + 1630-build-winconsoleio.patch + 1640-dont-include-consoleapi-h.patch) prepare() { cd "${srcdir}/Python-${pkgver}" - # these are created by patches - rm -f Misc/config_mingw Misc/cross_mingw32 Python/fileblocks.c - plain "Apply Ray Donnelly's should-be-upstreamed patches" patch -Np1 -i "${srcdir}"/0000-make-_sysconfigdata.py-relocatable.patch patch -Np1 -i "${srcdir}"/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch plain "Apply Roumen Petrov's core patches (14)" patch -Np1 -i "${srcdir}"/0100-MINGW-BASE-use-NT-thread-model.patch + # these are created by the next patch + rm -f Misc/config_mingw Misc/cross_mingw32 patch -Np1 -i "${srcdir}"/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch patch -Np1 -i "${srcdir}"/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch patch -Np1 -i "${srcdir}"/0140-MINGW-preset-configure-defaults.patch patch -Np1 -i "${srcdir}"/0150-MINGW-configure-largefile-support-for-windows-builds.patch - patch -Np1 -i "${srcdir}"/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch patch -Np1 -i "${srcdir}"/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch patch -Np1 -i "${srcdir}"/0180-MINGW-init-system-calls.patch - patch -Np1 -i "${srcdir}"/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch patch -Np1 -i "${srcdir}"/0200-MINGW-build-in-windows-modules-winreg.patch patch -Np1 -i "${srcdir}"/0210-MINGW-determine-if-pwdmodule-should-be-used.patch patch -Np1 -i "${srcdir}"/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch - rm -rf Python-3.5.0/Python/fileblocks.c || true 2>> /dev/nul + # these are created by the next patch + rm -f Python/fileblocks.c patch -Np1 -i "${srcdir}"/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch patch -Np1 -i "${srcdir}"/0240-MINGW-use-main-to-start-execution.patch @@ -191,7 +191,6 @@ prepare() { patch -Np1 -i "${srcdir}"/0520-py3k-mingw-ntthreads-vs-pthreads.patch patch -Np1 -i "${srcdir}"/0530-mingw-system-libffi.patch patch -Np1 -i "${srcdir}"/0540-mingw-semicolon-DELIM.patch - patch -Np1 -i "${srcdir}"/0550-mingw-regen-use-stddef_h.patch patch -Np1 -i "${srcdir}"/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch patch -Np1 -i "${srcdir}"/0560-mingw-use-posix-getpath.patch patch -Np1 -i "${srcdir}"/0565-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -206,7 +205,6 @@ prepare() { patch -Np1 -i "${srcdir}"/0660-mingw-use-backslashes-in-compileall-py.patch patch -Np1 -i "${srcdir}"/0670-msys-convert_path-fix-and-root-hack.patch patch -Np1 -i "${srcdir}"/0690-allow-static-tcltk.patch - patch -Np1 -i "${srcdir}"/0700-CROSS-avoid-ncursesw-include-path-hack.patch patch -Np1 -i "${srcdir}"/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch patch -Np1 -i "${srcdir}"/0720-mingw-pdcurses_ISPAD.patch patch -Np1 -i "${srcdir}"/0730-mingw-fix-ncurses-module.patch @@ -240,6 +238,13 @@ prepare() { plain "Apply patch contributed by Frode Solheim from FS-UAE project (1)" patch -Np1 -i "${srcdir}"/1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch + plain "New patches added for the update from 3.5.3 to 3.6.1" + patch -Np1 -i "${srcdir}"/1600-fix-disable-blake2-sse.patch + patch -Np1 -i "${srcdir}"/1610-fix-have-wspawnv.patch + patch -Np1 -i "${srcdir}"/1620-fix-signal-module-build.patch + patch -Np1 -i "${srcdir}"/1630-build-winconsoleio.patch + patch -Np1 -i "${srcdir}"/1640-dont-include-consoleapi-h.patch + autoreconf -vfi # Temporary workaround for FS#22322 @@ -370,7 +375,7 @@ package() { # replace paths in sysconfig sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \ - "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/_sysconfigdata.py \ + "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/lib-dynload/_sysconfigdata*.py \ "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/smtpd.py # Create python executable with windows subsystem @@ -390,22 +395,20 @@ package() { mv "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}_exe "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}.exe } -sha256sums=('eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0' +sha256sums=('a01810ddfcec216bcdb357a84bfaafdfaa0ca42bbdaa4cb7ff74f5a9961e4041' '4cc654f8caef73b385a57278d4a57578941ec48a5a69bcf7f100f85a5c9e5ac0' '166e45a247f440df92c97d3e4392daf67c79d086b3de8ff4f4698d113bad4172' - '010639b0e250a5aa8ece1f44a30c29e4a8d2e38bc48345c53a2f1f216bac668f' - '249ae89279ecace5c522279f613a9f5edbb76fe89811e376a195df51c2dc263e' + '9e23bd69d37db124a9765afab1c9b1809af9841f4771a352ac2412031f84975c' + 'fa83b3370b377da5df7704a9e1d764a7f173c768af3471106c4a5f7b015a8ff8' 'f63b7213ef0c360969ce84bb4e91f95f98a360451688f1193b30cd8a2073dbd1' - '04798443a7b121d3098684e05a815e9a6f501106b02f8a21e4dc043d7a297678' - '2d70d39c557f455d3a4d96272886fa1c8b1fadf2da3ece72f76e53a751d23661' - 'aa8f63c82a39f6bf4dc3b1c74e6dab999f38b978de690fcd5bef43bc2a582025' + '96524a4465b526fa8e9e04af9332eb472ec0d13e0768556aff5ba2e949594ab4' + '24a6835240033427d25e88ed475fde30e2aacd07dc98458c29f17c6b0a4b4c52' '889bb9291457f6fcab8e27793cf4abd6ceae59898594580174e26287a0118237' '3394c37ea4182786095216092c49bfd3d4418fb5c1598686c93d8515624b5cbd' - '32b1a3a6ffa3eda9840c67a29fd6098caba530a92f19d56128fa61aaa83a4f6a' - '6c367976c39dba142323f005841843cba52475cc99bfc741843f0faaa6cc86e9' - '711b45588efa31313564e2d784b1eeddcfc2468da7b7dd14583a0f45ff2060fb' - '3aca98254267c1fa48297e231c4efaf038a2cfa29cb555af623ca6c67fdb2b74' - '4157c6ac294b49d34f1c122cd4ecd3afe78573615986d175b2234af5e801db0c' + '4930cc4e97912cb155f70fe690603d8209a05c6946da43cd55383f4a83e866c7' + 'de963ede383f43dc34bbf985d5eb1bdf6418610dfb9d4490e4ec967a9bb73eb8' + 'e4b39a2429449ce4ae3f49301259047368524b8c7f9792cb90375808e781ebde' + 'fc4ee143dc90bb7f93893417ea8f11616f0714054e0b69fda0f0775a8283f105' '83bf053e9bbea0f5cc116ebc478e92948df4019a4ab7241ff2aa6c880770af72' '6250565f6f1a1e907a1778f1fdc033f78cca0770d4ff0451aa5de10e32f9297d' '360980a89a2fcc7b13ac1a6ce8425bb37fefe768a89de6cdc8aa91aa17d16942' @@ -413,12 +416,12 @@ sha256sums=('eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0' '060bf30d475522dbb3d40d20da9bf1e3dfa0806c8d436cdc8a73480c5900963d' 'af51615b98a7f96ca4639cbc80e9c3725fcbbbe2cd9951fafa7ad523ee173228' '74087a1c409ab24403079d7989efe887f04b1072fd1cfa834d5815067e11fea3' - 'a91e12c6cb1be70355f2108388291f56ce5e1ac22fde92a2c1cb2c2cb1f1fe2e' + '6d146ccc4d583c2aeb5b1131c745483988e7a75cd74f47bce3d0f5859d62190c' 'd4ae0fdf5ba2c0d1994e2c2b5377d423854033243e874649e1eba6a2ab9f679d' 'd62ed216701bf082b91a673f0ed354e6af8fd2b88ff9f568e98a1199bef51635' '1bf3e3f0d0cfa4b711570e01d4f5720caa050fcfff0f41b023604db0bfcc00ae' 'e5015d0dc5983a56ce3deb08b75c78210cfe207077f8e470fa70c0c33b352c95' - '530f69c113aeb0c9931c409a55083726d6ad48b7cce5535b762121b894a15312' + '0c2b211afe49286bef4288566f852c6868f942f7cbdbaf214e15d51cc87b3afe' '7d24d510b5a8ef980cb44cdd0ef8bb838f3e73d2b4c41017b2f5b7802c2e72d0' '8557962bf70d3c913495d07a22b801fed075b5ecbb487261b26a4214247356de' '4f3e05d6e0524fcb165ff7992075bc7da90fbe345a1ef3310f0b7b529026dbbc' @@ -428,55 +431,58 @@ sha256sums=('eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0' '85a2da84ceabc8093f927377514f3823c1c9a6b54dfd5a6a11ce95dbf1c67324' 'b51406cb38f70b4e812c3b015d7102a6b11255e302d57da7c4198dffe875d07e' '64f9b871b980a43f302d2b225b4ce08530b2d734c9199185563e100b1a7fb7bc' - 'ec6a51890d51da924544f26f055e01040111e9847b0c40448a7e4e017493e9a0' + '0443a0732b8c0e49aa1c8a155ab2b1e276c0cac953c99b95a43db501a739b3b7' '78dc2ac8eaaccf19fc42551e784f01f2f147785814bfc68d891957ba35b5d866' '5c181aaa52d1cbe42d7538af85f08362bca969678c2c83cd1855fdaf1bb401fd' - 'fb874e1a19b2c8f9498896796d20cc472e2e93bdc6ad8c9c2af2b0367a7d160f' + 'dea5bfbf623002d3a28067bded2a3b7e1630aef97b12bbc4990186ab68a51b26' 'fd5a7ae2860b98086875d3a61ced283333b47b1d64765624fb75167718ad5b33' '1bcc89ed500f114be330721ad0dbb9a213a2f959ab942375ddecb08f142a196c' - 'fe4a73c72e29dc508ecdc8467778392f751504b68be8217c8ce95c898db5ab77' + '2201e336997af02cd42dd7f052d0fd05009a1a307066e15a7d38615c8d9c0ad7' 'ab6d2450495212d7c402bd5a9a4fc64527ee54a9509825ba62312f13e1252a8a' '7ab2a3a15148a4f90d45f4dbc8181f2433e0354f25b7a0de87e4cdfc06a3ed83' - '93e051997b9fe8417628ffb3c2b90a4e8aa7e38aa5f397a0f93922ff0888d760' - 'a04d79ede2d44eed7ab524b3792348536bd8ef6bf9758fca8e41637cdd2be8c1' - '5a70e1dbf5c976635b35576544a33d2e69037c225c4548d51d61077f58228b18' + '73db4478cc06e9944a5cb99a5091647fc6c2fc87b0ba65adee263c503d3e1457' + 'c372b651b95b5a743d9299563f79c99569a6546ac07f1c77e0c80c3d887dcf88' 'faa3389ddc8d927eb08b447066e3cc21486376e517ccad4a5e2f0300daa9f15a' '32c28c540d641d2d796582352507fc8377b8b757a794a293cc961148c2412bb1' '863c702bb201c38241738758dcbe94b989d043917956e8af38035210da1a47b3' '23dbf79f9c0780d175f5c23bdc2d6d891ab354f4432dee14a2806c3cd546a90a' - '6f8c7dd8f690de30f7219b23823bcf7a1289e8163e174c1cd135f70d746eb2d1' + 'f14631fbfc54f9754d115a8003a661796cc7fab627dca7762c922138b4da8960' '2c7ecd5eb38cef54e64d5cf5e34d61451f0ed437d776a978b7a4a4c2f88eb206' 'ac10b20ffcf652e26575c376825ee41d94dae1c9ea36fd9e0106122e6ebc3f4f' '315c357dcd91fb1f34dcaf1c6d4cf2a23e7101931e55f4cb0793936bf7dbb606' - 'b69f4c5e0c6e12463f7f378e482279c58e5b6a75a2652f546754652691554c64' + '521b56d10b2d744d86e54cb7b56a1bb7676c8df45964a7c8d0ca3b3a545bebb2' 'a4053159e3b64517c1006ec0ecc43588e8d28111e8251b9b7348cf696dbc1afa' - '66db319cdba1ee487e3f402c0cd47491dc4935f2386d612f755ef0718003b2ac' 'f643831842e9c2c15f1ecb3ec96022f6f32af2a88e0e4501e56b20d86905995d' 'faf18878d93b71c9b3034b2e0be7e75d0a105734726872f1353e2afa8664e7aa' '8e1a66af0edb1207a27af05c8e4250bc3b02a6dc39bae2c36a313b48fae3c4e6' '81a88720512c311515107607447d2c8faa8a7158ebc28232a8d19fe27b905836' - '47f39bfac2348727b0173ae6cb0c90d69a688d746ebf594418b48e1fcb239ef8' + '706e7cd6490bd292fa52dc6bda14003913c86fd2689e0501007c6586beda5b75' 'ceea443a47860778d096a4b1c644467f61f3afb135b20c9a8019242d1fc6c175' - '70db4d3c3c05926d2460b6cb671f0f39819fa1a2e3af7a17fb58df00156872e1' + 'ad73f017cd61183ce8a06699940233ea66cd2d58444ebe9f0f147a16a57ed1f1' '389872855584a1a912f3833c99a318bd924bee25ed806f5769c0b1c7feda1cf9' '10ec6c64fa8ce81f61990de03ed1dcdae8d2ddd116a394fc8ff87f6dca2e0173' '043568001a1717cb4e16e318001e2f707a6814b4ca223ce4bfeaccea4a565f73' 'a56d05880a32025f9a1fc93e2b56086ff0faf7555a98d1ff80c3b641c0d65d22' - 'ef7032bc5051152e423abdb71fb26f4a33001f2167989387935af854e85e4942' + '84e80e98ca8b2b92d6647799449bb5cf403b846b1414083bce11d54d051d1430' '2ac3a4f2b6ffafb11514f7595fd9283df2cfe201abceb527baaf210bdceeafb7' '15c3a30def78c79ef89c611ae367e3fc2ad6d42db14275ddc897580aa0b06886' '3505bf06fb1ea3ef587195e01eecac8aaef803713b261066f00727dfe078b673' - '64402d30c686d84be75800ee295c7fe37523d741403ee0cb0df5058aeab6dfa5' + '0e41d7d2e38ce184b60de167172ac7e79211858f0247cac684b9d44daa953c0a' 'a6334a512fd4060d534a23e9c92b9b548117832fb551ec2a4a5727e3d3fcebdd' 'fb1d4be936d2def610a30f7a3eaeb06ef93d7734b26190ab28adee5bec81d549' '0e79afe46fa6f2b6f225ae06c9e849722b598946af60a62b071260458f693077' '2d5a5a8096854c8a568d909a93894d715b35cf16e2ec97660d24f18492d567bc' '0131e1e874052db20704cb20a96cd3c8bc2e6486bdf6ef1ffcff8a114ea8547e' '3e4fdbb1542d5afc60093b6b8b44d5e602123b0010563d4b4edbc57627e62be1' - '26fc34f914a6b580c99007a5591fa95c04020909693df0a8f1693e8147eb5bc2' - '517001708adbde15fa95ed85f38b09d45bcfe3674081d0d3897356342b202145' + 'dcf41f79574a48086dbb87a581bd00d612e64402490a0d10955b90524ba4b10f' + 'f28fda678459ab7b825fc5c59d675caebef8bc4b62753e816c4522171d7522d2' '3cd8deca90db93a1087d551e37954bd7698f56e9b9b4845faa62142639327f09' '307aed5ea8525b41eccc15afef839519930b6d4231c1d31118ae9cceba81df95' '5f07778f93dc2ed98b4bb10102a0fffc6670c8b264abd9d86bca01e8e1a074c8' - '0a37c3bd9542f85b3a5e946b2c5928c3334faafa374b50bc9016a26c192a7f33' - '66219146773e44967c1971cd6631f8f76ed2ed13c527a610c398b506d2256fa7') + '20f4a0c3d14c179cf0f14e9cfbb6b5274ddf61e59966185492161643af87e9b4' + '66219146773e44967c1971cd6631f8f76ed2ed13c527a610c398b506d2256fa7' + '26fa0d034ce276269d64b89dfda112fbcc050dbcd5a4beb4e67676795a11f7db' + '1e8382fb438775cef36a0264ea31b76892e90725228657327eadeeec286193fd' + 'f9c46db891caad30656fa1ffda81838977616f4946a6a95ddb95f91501160815' + '8896f4e11c17498c666251cef1c89ee0d78886814c8f227ee46807bedb4b1ad3' + '597c1c13c7f4debea71de4de3325eeb66cb9c1dc064c4961a6f27de8f07c1992') diff --git a/mingw-w64-shiboken-qt4/PKGBUILD b/mingw-w64-shiboken-qt4/PKGBUILD index 5f6e5c403b..461a16e6d8 100644 --- a/mingw-w64-shiboken-qt4/PKGBUILD +++ b/mingw-w64-shiboken-qt4/PKGBUILD @@ -5,7 +5,7 @@ _realname=shiboken pkgbase=mingw-w64-${_realname}-qt4 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-qt4 ${MINGW_PACKAGE_PREFIX}-python{2,3}-${_realname}-qt4) pkgver=1.2.2 -pkgrel=3 +pkgrel=4 arch=('any') url="https://pyside.github.io/docs/pyside/" license=("LGPL") diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index 9d89e07bfe..f9230f55d9 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.19.1 #_pre_ver=4.19.1.dev1702081834 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to create Python bindings for C and C++ libraries (mingw-w64)" arch=('any') license=('GPL') @@ -56,8 +56,10 @@ package_python3-sip() { cd python3-${MINGW_CHOST} make DESTDIR="${pkgdir}" install -C siplib - install -Dm644 sipconfig.py "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}${MINGW_PREFIX}"/lib/python3.5/site-packages/sipdistutils.py + local _py3basever=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + + install -Dm644 sipconfig.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_py3basever}/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_py3basever}/site-packages/sipdistutils.py install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-sip/LICENSE" } @@ -69,8 +71,10 @@ package_python2-sip() { cd python2-${MINGW_CHOST} make DESTDIR="${pkgdir}" install -C siplib - install -Dm644 sipconfig.py "${pkgdir}${MINGW_PREFIX}"/lib/python2.7/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}${MINGW_PREFIX}"/lib/python2.7/site-packages/sipdistutils.py + local _py2basever=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + + install -Dm644 sipconfig.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_py2basever}/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_py2basever}/site-packages/sipdistutils.py install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-sip/LICENSE" } diff --git a/mingw-w64-waf/PKGBUILD b/mingw-w64-waf/PKGBUILD index ab2f6ae9a3..fc785dbce4 100644 --- a/mingw-w64-waf/PKGBUILD +++ b/mingw-w64-waf/PKGBUILD @@ -4,7 +4,7 @@ _realname=waf pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.9.6 -pkgrel=1 +pkgrel=2 pkgdesc="General-purpose build system modelled after Scons (mingw-w64)" arch=('any') license=('BSD')