diff --git a/mingw-w64-pyside6/003-skip-remote.patch b/mingw-w64-pyside6/003-skip-remote.patch deleted file mode 100644 index 354a304dce..0000000000 --- a/mingw-w64-pyside6/003-skip-remote.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- pyside-setup-everywhere-src-6.9.0/sources/pyside6/CMakeLists.txt.orig 2025-03-31 12:17:07.000000000 +0200 -+++ pyside-setup-everywhere-src-6.9.0/sources/pyside6/CMakeLists.txt 2025-04-18 19:31:32.274928300 +0200 -@@ -25,9 +25,9 @@ - add_subdirectory(libpysideqml) - endif() - --if(Qt${QT_MAJOR_VERSION}RemoteObjects_FOUND) -- add_subdirectory(libpysideremoteobjects) --endif() -+#if(Qt${QT_MAJOR_VERSION}RemoteObjects_FOUND) -+# add_subdirectory(libpysideremoteobjects) -+#endif() - - if(Qt${QT_MAJOR_VERSION}UiTools_FOUND) - add_subdirectory(plugins/uitools) ---- pyside-setup-everywhere-src-6.9.0/sources/pyside6/cmake/PySideHelpers.cmake.orig 2025-03-31 12:17:07.000000000 +0200 -+++ pyside-setup-everywhere-src-6.9.0/sources/pyside6/cmake/PySideHelpers.cmake 2025-04-18 20:04:30.988060300 +0200 -@@ -105,7 +105,7 @@ - QuickControls2 - QuickTest - QuickWidgets -- RemoteObjects -+# RemoteObjects - Scxml - Sensors - SerialPort diff --git a/mingw-w64-pyside6/PKGBUILD b/mingw-w64-pyside6/PKGBUILD index 9ea8cbe7d3..f00d06c04e 100644 --- a/mingw-w64-pyside6/PKGBUILD +++ b/mingw-w64-pyside6/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=(${MINGW_PACKAGE_PREFIX}-shiboken6 ${MINGW_PACKAGE_PREFIX}-${_realname} ${MINGW_PACKAGE_PREFIX}-${_realname}-tools) -pkgver=6.9.0 +pkgver=6.9.1 pkgrel=1 pkgdesc="Enables the use of Qt6 APIs in Python applications (mingw-w64)" arch=('any') @@ -21,6 +21,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-clang-tools-extra" + "${MINGW_PACKAGE_PREFIX}-llvm" "${MINGW_PACKAGE_PREFIX}-libxslt" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-sphinx" @@ -40,7 +41,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" $([[ ${MSYSTEM} == MINGW64 || ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt6-pdf") "${MINGW_PACKAGE_PREFIX}-qt6-quick3d" "${MINGW_PACKAGE_PREFIX}-qt6-positioning" - "${MINGW_PACKAGE_PREFIX}-qt6-remoteobjects" + #"${MINGW_PACKAGE_PREFIX}-qt6-remoteobjects" "${MINGW_PACKAGE_PREFIX}-qt6-scxml" "${MINGW_PACKAGE_PREFIX}-qt6-sensors" "${MINGW_PACKAGE_PREFIX}-qt6-serialbus" @@ -54,19 +55,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" _pkgfn=pyside-setup-everywhere-src-${pkgver} source=(https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${pkgver}-src/${_pkgfn}.tar.xz 001-fix-building-on-mingw.patch - 002-fix-build-qtexampleicons.patch - 003-skip-remote.patch) -sha256sums=('315b73bb7570d5b9e6793a8d3fafd1d2dd7f43d35eebb01d2b554ea206aad88e' + 002-fix-build-qtexampleicons.patch) +sha256sums=('04c712c5b9234add0d9b5aa3c01a0caede64a55b496127751f5d52a230cff748' '5f71b618e0ad687e9282fa4b8c3815beaf69b78666516bfce57cb039822f4ac6' - 'ad762d906e5e736b87e8fe92efd42045fe51206e6b6845e37d298a15a53ccfa3' - '8fd95fe629efc2e492c0a0351a7aec3716a79804ac3ffe5b9676b23d859c0d7c') + 'ad762d906e5e736b87e8fe92efd42045fe51206e6b6845e37d298a15a53ccfa3') prepare() { cd "${srcdir}"/${_pkgfn} patch -p1 -i "${srcdir}"/001-fix-building-on-mingw.patch patch -p1 -i "${srcdir}"/002-fix-build-qtexampleicons.patch - # https://github.com/msys2/MINGW-packages/pull/23888#issue-2974803968 - patch -p1 -i "${srcdir}"/003-skip-remote.patch } build() { @@ -81,6 +78,8 @@ build() { _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + # Skip RemoteObjects Module + # https://github.com/msys2/MINGW-packages/pull/23888#issue-2974803968 MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -GNinja \ @@ -91,7 +90,7 @@ build() { -DNO_QT_TOOLS="yes" \ -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \ -DNUMPY_INCLUDE_DIR=${MINGW_PREFIX}/include/python${_pyver}/numpy/_core/include \ - -DSKIP_MODULES=DBus \ + -DSKIP_MODULES="DBus;RemoteObjects" \ ../${_pkgfn} PYTHONPATH="${srcdir}"/build-${MSYSTEM}/sources \ @@ -148,7 +147,7 @@ package_pyside6() { "${MINGW_PACKAGE_PREFIX}-qt6-pdf" "${MINGW_PACKAGE_PREFIX}-qt6-quick3d" "${MINGW_PACKAGE_PREFIX}-qt6-positioning" - "${MINGW_PACKAGE_PREFIX}-qt6-remoteobjects" + #"${MINGW_PACKAGE_PREFIX}-qt6-remoteobjects" "${MINGW_PACKAGE_PREFIX}-qt6-scxml" "${MINGW_PACKAGE_PREFIX}-qt6-sensors" "${MINGW_PACKAGE_PREFIX}-qt6-serialbus"