diff --git a/mingw-w64-pyqt-builder/PKGBUILD b/mingw-w64-pyqt-builder/PKGBUILD index eae41e37f7..71066fa931 100644 --- a/mingw-w64-pyqt-builder/PKGBUILD +++ b/mingw-w64-pyqt-builder/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyqt-builder pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.9.1 +pkgver=1.10.0 pkgrel=1 pkgdesc="The PEP 517 compliant PyQt build system (mingw-w64)" arch=('any') @@ -13,10 +13,9 @@ license=('GPL3') url="https://pypi.org/project/PyQt-builder/" depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-setuptools") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=("https://pypi.io/packages/source/P/PyQt-builder/PyQt-builder-${pkgver}.tar.gz" 001-mingw-python.patch) -sha256sums=('8d669fe8fa434a3e47abde3b40d924d91932e8e19d88b20c778a3e1c77621ebc' +sha256sums=('86bd19fde83d92beaefacdeac1e26c6e1918c300ff78d7ec2a19973bf2cf21b5' '39c21631dff9ada9bb5e7ba9c86bae9df461de2397d2cfdf53de20d04fbae548') prepare() { @@ -24,19 +23,19 @@ prepare() { patch -p1 -i "${srcdir}/001-mingw-python.patch" cd "${srcdir}" - rm -rf python-build-${MINGW_CHOST} | true - cp -r "${_realname}-${pkgver}" "python-build-${MINGW_CHOST}" + rm -rf python-build-${MSYSTEM} | true + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" } build() { - cd python-build-${MINGW_CHOST} + cd python-build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python setup.py build } package() { - cd "${srcdir}"/python-build-${MINGW_CHOST} + cd "${srcdir}"/python-build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ --root="${pkgdir}" --optimize=1 --skip-build diff --git a/mingw-w64-sip/001-mingw-python.patch b/mingw-w64-sip/001-mingw-python.patch index a629083fcc..a0960bc7aa 100644 --- a/mingw-w64-sip/001-mingw-python.patch +++ b/mingw-w64-sip/001-mingw-python.patch @@ -9,7 +9,7 @@ diff -Naur sip-5.3.0-orig/sipbuild/buildable.py sip-5.3.0/sipbuild/buildable.py from .exceptions import UserException from .installable import Installable -@@ -142,7 +143,12 @@ +@@ -147,7 +148,12 @@ """ Return the filename extension that a module should have. """ if sys.platform == 'win32': @@ -23,22 +23,6 @@ diff -Naur sip-5.3.0-orig/sipbuild/buildable.py sip-5.3.0/sipbuild/buildable.py suffixes = importlib.machinery.EXTENSION_SUFFIXES -diff -Naur sip-5.3.0-orig/sipbuild/builder.py sip-5.3.0/sipbuild/builder.py ---- sip-5.3.0-orig/sipbuild/builder.py 2020-05-31 14:51:51.000000000 +0300 -+++ sip-5.3.0/sipbuild/builder.py 2020-06-07 20:56:16.482702300 +0300 -@@ -361,8 +361,11 @@ - return - - # Create an installable for the scripts. -+ scripts_dir = os.path.dirname(sys.executable) -+ if sys.platform == 'win32' and "MSYSTEM" in os.environ: -+ scripts_dir = os.popen(' '.join(['cygpath', '--unix', scripts_dir])).readline().strip() - installable = Installable('scripts', -- target_subdir=os.path.dirname(sys.executable)) -+ target_subdir=scripts_dir) - - for ep in scripts: - # Parse the entry point. diff -Naur sip-5.3.0-orig/sipbuild/installable.py sip-5.3.0/sipbuild/installable.py --- sip-5.3.0-orig/sipbuild/installable.py 2020-05-31 14:51:51.000000000 +0300 +++ sip-5.3.0/sipbuild/installable.py 2020-06-07 20:56:16.487690200 +0300 diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index f2e6416f26..a4810cc5f1 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -8,8 +8,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-sip4") replaces=("${MINGW_PACKAGE_PREFIX}-sip4" "${MINGW_PACKAGE_PREFIX}-sip5") -pkgver=6.0.3 -pkgrel=3 +pkgver=6.1.0 +pkgrel=1 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -18,12 +18,11 @@ url="https://riverbankcomputing.com/software/sip" depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-toml" "${MINGW_PACKAGE_PREFIX}-python-packaging") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=(https://pypi.python.org/packages/source/s/sip/sip-${pkgver}.tar.gz 001-mingw-python.patch 002-wrappers.patch) -sha256sums=('929e3515428ea962003ccf6795244a5fe4fa6e2c94dc9ab8cb2c58fcd368c34c' - '3cbe4be5e37c580d657e7f532a1c3f9ff465513ccd6ce495cba505255bf465ca' +sha256sums=('f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e' + '42cd9c032ab09211609dc67af0f11cd9b78dc90ba06f186ad8af209d64ac22a3' '2e46495e5df4eed5384a01db93e75f82e37549a4776ca03d07dfef7801d01d78') install=${_realname}-${MSYSTEM}.install @@ -35,19 +34,19 @@ prepare() { patch -p1 -i "${srcdir}"/002-wrappers.patch cd "${srcdir}" - rm -rf python-build-${MINGW_CHOST} | true - cp -r "${_realname}-${pkgver}" "python-build-${MINGW_CHOST}" + rm -rf python-build-${MSYSTEM} | true + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" } build() { - cd python-build-${MINGW_CHOST} + cd python-build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python setup.py build } package() { - cd "${srcdir}"/python-build-${MINGW_CHOST} + cd "${srcdir}"/python-build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ --root="${pkgdir}" --optimize=1 --skip-build