diff --git a/mingw-w64-pyqt6/001-fix-build-with-Qt-6.6.patch b/mingw-w64-pyqt6/001-fix-build-with-Qt-6.6.patch new file mode 100644 index 0000000000..16b12405d7 --- /dev/null +++ b/mingw-w64-pyqt6/001-fix-build-with-Qt-6.6.patch @@ -0,0 +1,11 @@ +--- a/sip/QtSql/qsqlresult.sip ++++ b/sip/QtSql/qsqlresult.sip +@@ -63,7 +63,7 @@ + QSql::ParamType bindValueType(const QString &placeholder) const; + QSql::ParamType bindValueType(int pos) const; + int boundValueCount() const; +- QList &boundValues() const; ++ QVariantList boundValues() const; + QString executedQuery() const; + QString boundValueName(int pos) const; + void clear(); diff --git a/mingw-w64-pyqt6/PKGBUILD b/mingw-w64-pyqt6/PKGBUILD index 5fc90721c4..ec1478002c 100644 --- a/mingw-w64-pyqt6/PKGBUILD +++ b/mingw-w64-pyqt6/PKGBUILD @@ -3,7 +3,7 @@ _realname=pyqt6 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=6.5.2 +pkgver=6.5.3 pkgrel=1 pkgdesc="Python bindings for the Qt cross platform application toolkit (mingw-w64)" arch=('any') @@ -30,7 +30,8 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-qt6-tools" "${MINGW_PACKAGE_PREFIX}-qt6-websockets" "${MINGW_PACKAGE_PREFIX}-qt6-connectivity" "${MINGW_PACKAGE_PREFIX}-qt6-activeqt") -makedepends=("${MINGW_PACKAGE_PREFIX}-sip" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-sip" "${MINGW_PACKAGE_PREFIX}-pyqt-builder" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-qt6-tools" @@ -46,14 +47,29 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-sip" "${MINGW_PACKAGE_PREFIX}-qt6-webchannel" "${MINGW_PACKAGE_PREFIX}-qt6-websockets" "${MINGW_PACKAGE_PREFIX}-qt6-connectivity" - "${MINGW_PACKAGE_PREFIX}-qt6-activeqt" - "${MINGW_PACKAGE_PREFIX}-cc") -source=(https://pypi.python.org/packages/source/P/PyQt6/PyQt6-${pkgver}.tar.gz) -sha256sums=('1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280') + "${MINGW_PACKAGE_PREFIX}-qt6-activeqt") +source=(https://pypi.python.org/packages/source/P/PyQt6/PyQt6-${pkgver}.tar.gz + 001-fix-build-with-Qt-6.6.patch) +sha256sums=('bcbbf9511b038b4924298ca10999aa36eb37a0a38d0638f895f9bba6025c0a77' + 'a0d54265d10ab25e675d6915ef411bb88d1e81a64bfc5c0eb11d177f6a957944') + +prepare() { + cd PyQt6-${pkgver} + patch -p1 -i "${srcdir}"/001-fix-build-with-Qt-6.6.patch + + cd "${srcdir}" + rm -rf python-build-${MSYSTEM} | true + cp -r PyQt6-${pkgver} python-build-${MSYSTEM} +} build() { - [[ -d python-${MSYSTEM} ]] && rm -rf python-${MSYSTEM} - cp -r PyQt6-${pkgver} python-${MSYSTEM} && cd python-${MSYSTEM} + cd "${srcdir}"/python-build-${MSYSTEM} + + if check_option "debug" "n"; then + _build_type=release + else + _build_type=debug + fi MSYS2_ARG_CONV_EXCL="--api-dir=;" \ ${MINGW_PREFIX}/bin/sip-build \ @@ -61,6 +77,9 @@ build() { --no-make \ --api-dir=${MINGW_PREFIX}/share/qt6/qsci/api/python \ --qmake=${MINGW_PREFIX}/bin/qmake6.exe \ + --qmake-setting "CONFIG += ${_build_type}" \ + --qmake-setting "QMAKE_CXXFLAGS += ${CXXFLAGS} -DQT_NO_INT128" \ + --disable QtBluetooth \ --concatenate 2 \ --verbose @@ -70,12 +89,13 @@ build() { package(){ local _pysite=$(cygpath -u $(${MINGW_PREFIX}/bin/python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")) - cd python-${MSYSTEM}/build + cd "${srcdir}"/python-build-${MSYSTEM}/build # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR MSYS2_ARG_CONV_EXCL="${_pysite}" \ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # compile Python bytecode - ${MINGW_PREFIX}/bin/python -m compileall -d / "$pkgdir"${MINGW_PREFIX}/lib - ${MINGW_PREFIX}/bin/python -O -m compileall -d / "$pkgdir"${MINGW_PREFIX}/lib + ${MINGW_PREFIX}/bin/python -m compileall -o 0 -o 1 -d / "$pkgdir"${MINGW_PREFIX}/lib + + install -Dm644 ../LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }