Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] Qt pyside 5.12.2
@ 2020-12-05 13:27 yopito
  2020-12-05 22:49 ` ericonr
                   ` (46 more replies)
  0 siblings, 47 replies; 48+ messages in thread
From: yopito @ 2020-12-05 13:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

[WIP] Qt pyside 5.12.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 20545 bytes --]

From 4e3a2e6a7d448934332e78323f5c47f1d4f4d98a Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 5 Dec 2020 13:27:00 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

---
 common/shlibs                                 |  2 --
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 .../patches/tests-need-python-modules.patch   | 14 ++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +++----------------
 5 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..7ef968bb6db 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,8 +1695,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..bea4e7fef6b
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,14 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From aa1915b97cb3e03ab4abfd1d7db11ce108682612 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 5 Dec 2020 13:27:02 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages *WIP*

Partial testing: no virtual backend is suited to OpenGL tests.
---
 common/shlibs                                 |  2 -
 srcpkgs/libpyside-python3                     |  1 -
 srcpkgs/python3-pyenet                        |  1 -
 srcpkgs/python3-pyside                        |  1 -
 srcpkgs/python3-pyside-phonon                 |  1 -
 .../patches/tests-correct-build_dir.patch     | 14 +++
 ...tests-find-python-modules-from-build.patch | 22 +++++
 .../patches/tests-python-syntax.patch         | 99 +++++++++++++++++++
 srcpkgs/python3-pyside2/template              | 41 +++-----
 9 files changed, 150 insertions(+), 32 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 7ef968bb6db..eceda33a0e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1696,8 +1696,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..2544293ecbf
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,22 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..4ecd336d381
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,99 @@
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..de98a4a32b0 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,15 @@
 # Template file for 'python3-pyside2'
+# XXX fix tests registry_existence_test
+# XXX tests: update current status
+# XXX tests: disable OpenGL tests ?
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,12 +21,13 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 # needed by shiboken2 runtime
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -39,13 +43,18 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	build_options_default="webengine"
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_check() {
+	# Status: "98% tests passed, 9 tests failed out of 471"
+	# no virtual backends are fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +82,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From e4947abc592a8071a644219282346f00d3babcbf Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 5 Dec 2020 13:27:03 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support *WIP*

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 11 ++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..14299fed554 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,28 @@
 # Template file for 'pyside2-tools'
+# XXX testing status
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.12.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
@ 2020-12-05 22:49 ` ericonr
  2020-12-05 23:18 ` ericonr
                   ` (45 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2020-12-05 22:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-739426628

Comment:
```
[  1%] Running generator for QtCore...
shiboken: "/usr/aarch64-linux-musl/usr/include" does not exist.
Command line: --generator-set=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero /builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/build/PySide2/QtCore_global.h --include-paths=/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2:/usr/aarch64-linux-musl/usr/include/qt5/:/usr/aarch64-linux-musl/usr/include/qt5/:/usr/aarch64-linux-musl/usr/include/qt5/QtCore:/usr/aarch64-linux-musl/usr/../usr/lib/qt5//mkspecs/linux-g++:/usr/aarch64-linux-musl/usr /usr/aarch64-linux-musl/usr/include --typesystem-paths=/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/build/PySide2:/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2:/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2/QtCore --output-directory=/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/build/PySide2/QtCore --license-file=/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2/QtCore/../licensecomment.txt /builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/build/PySide2/QtCore/typesystem_core.xml --api-version=5.15 --drop-type-entries=
make[2]: *** [PySide2/QtCore/CMakeFiles/QtCore_generator.dir/build.make:87: PySide2/QtCore/mjb_rejected_classes.log] Error 1
```

I have no idea what this cross failure means, the directory should 100% exist.

Besides that, looking good! I like the test additions as well :)

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.12.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
  2020-12-05 22:49 ` ericonr
@ 2020-12-05 23:18 ` ericonr
  2020-12-05 23:19 ` ericonr
                   ` (44 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2020-12-05 23:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-739429200

Comment:
```
--include-paths=/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2:/usr/aarch64-linux-musl/usr/include/qt5/:/usr/aarch64-linux-musl/usr/include/qt5/:/usr/aarch64-linux-musl/usr/include/qt5/QtCore:/usr/aarch64-linux-musl/usr/../usr/lib/qt5//mkspecs/linux-g++:/usr/aarch64-linux-musl/usr /usr/aarch64-linux-musl/usr/include
```

It seems to have a whitespace there that perhaps shouldn't exist?

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.12.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
  2020-12-05 22:49 ` ericonr
  2020-12-05 23:18 ` ericonr
@ 2020-12-05 23:19 ` ericonr
  2020-12-06  9:06 ` yopito
                   ` (43 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2020-12-05 23:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-739429200

Comment:
```
--include-paths=/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2:/usr/aarch64-linux-musl/usr/include/qt5/:/usr/aarch64-linux-musl/usr/include/qt5/:/usr/aarch64-linux-musl/usr/include/qt5/QtCore:/usr/aarch64-linux-musl/usr/../usr/lib/qt5//mkspecs/linux-g++:/usr/aarch64-linux-musl/usr /usr/aarch64-linux-musl/usr/include
```

It seems to have a whitespace there at the end that perhaps shouldn't exist?

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.12.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (2 preceding siblings ...)
  2020-12-05 23:19 ` ericonr
@ 2020-12-06  9:06 ` yopito
  2020-12-19 15:48 ` [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2 yopito
                   ` (42 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-06  9:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-739475305

Comment:
nice catch for the whitespace ! Seems weird. still on testing part, I will check crossbuild then.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (3 preceding siblings ...)
  2020-12-06  9:06 ` yopito
@ 2020-12-19 15:48 ` yopito
  2020-12-19 16:18 ` yopito
                   ` (41 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-19 15:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

[WIP] Qt pyside 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 29404 bytes --]

From b9af9137fdbc09a4639fd24f99a4798c19485f7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:08 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 .../patches/tests-need-python-modules.patch   | 14 +++
 .../patches/tests-python-syntax.patch         | 90 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 6 files changed, 107 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index f94a891d6fd..27df9d6f6d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1690,8 +1690,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..bea4e7fef6b
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,14 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..bffaf8420bc
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,90 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From a37cbee6456c0720ec3b5bb0d9699270d0e5d4ac Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:10 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  66 +++++++++++
 ...tests-find-python-modules-from-build.patch |  22 ++++
 .../patches/tests-python-syntax.patch         | 105 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  37 ++----
 11 files changed, 227 insertions(+), 41 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 27df9d6f6d7..a3598cd8591 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1691,8 +1691,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..2fb7da402a3
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,66 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by virtual backend vnc.
+
+Full testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..2544293ecbf
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,22 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..70c365217f8
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,105 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..fc4260764b1 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,12 +18,13 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 # needed by shiboken2 runtime
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -39,13 +40,17 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	build_options_default="webengine"
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +78,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 6b6e535ece20ca2853498d9b5a6da99e073f0419 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:11 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (4 preceding siblings ...)
  2020-12-19 15:48 ` [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2 yopito
@ 2020-12-19 16:18 ` yopito
  2020-12-19 17:53 ` yopito
                   ` (40 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-19 16:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

[WIP] Qt pyside 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 29588 bytes --]

From b9af9137fdbc09a4639fd24f99a4798c19485f7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:08 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 .../patches/tests-need-python-modules.patch   | 14 +++
 .../patches/tests-python-syntax.patch         | 90 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 6 files changed, 107 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index f94a891d6fd..27df9d6f6d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1690,8 +1690,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..bea4e7fef6b
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,14 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..bffaf8420bc
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,90 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From 85d4ef35cfca1825f6ce5fd5b0efc74c3f388bcf Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:10 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  66 +++++++++++
 ...tests-find-python-modules-from-build.patch |  22 ++++
 .../patches/tests-python-syntax.patch         | 105 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  41 +++----
 11 files changed, 230 insertions(+), 42 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 27df9d6f6d7..a3598cd8591 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1691,8 +1691,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..2fb7da402a3
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,66 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by virtual backend vnc.
+
+Full testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..2544293ecbf
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,22 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..70c365217f8
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,105 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..0504fb3b2b9 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,12 +18,13 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 # needed by shiboken2 runtime
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -36,16 +37,22 @@ build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine bindings"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +80,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 2d1bc226479265b964f95afda67e7323668e7723 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:11 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (5 preceding siblings ...)
  2020-12-19 16:18 ` yopito
@ 2020-12-19 17:53 ` yopito
  2020-12-19 17:55 ` yopito
                   ` (39 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-19 17:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-748504499

Comment:
still WIP:
* Another glitch to fix : test "QtWidgets_bug_307" segfaults .... sometimes ?
* GH actions are not that confident, but have to check crossbuild for armv6l and armv7l on my own

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (6 preceding siblings ...)
  2020-12-19 17:53 ` yopito
@ 2020-12-19 17:55 ` yopito
  2020-12-20 10:43 ` [PR PATCH] [Updated] " yopito
                   ` (38 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-19 17:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 500 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-748504499

Comment:
still WIP:
* Another glitch to fix : test "QtWidgets_bug_307" segfaults .... sometimes ?
* GH actions are not that confident, but have to check crossbuild for armv6l and armv7l on my own

Note: GH action build for x86_64-* is failing on test "QtMultimedia_audio_test" ... does not happen with on personal build

Edit: added note regarding x86_64-* builds

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (7 preceding siblings ...)
  2020-12-19 17:55 ` yopito
@ 2020-12-20 10:43 ` yopito
  2020-12-20 12:33 ` yopito
                   ` (37 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-20 10:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

[WIP] Qt pyside 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 29797 bytes --]

From b9af9137fdbc09a4639fd24f99a4798c19485f7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:08 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 .../patches/tests-need-python-modules.patch   | 14 +++
 .../patches/tests-python-syntax.patch         | 90 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 6 files changed, 107 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index f94a891d6fd..27df9d6f6d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1690,8 +1690,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..bea4e7fef6b
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,14 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..bffaf8420bc
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,90 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From 358a44109897cb8e16e5a928b792b3a9f07d8c1c Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:10 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  74 ++++++++++++
 ...tests-find-python-modules-from-build.patch |  22 ++++
 .../patches/tests-python-syntax.patch         | 105 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  41 +++----
 11 files changed, 238 insertions(+), 42 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 27df9d6f6d7..a3598cd8591 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1691,8 +1691,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..14e25e9aaee
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by virtual backend vnc.
+
+Full testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..2544293ecbf
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,22 @@
+tests need python modules that are not installed or not installed yet.
+So point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..70c365217f8
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,105 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..0504fb3b2b9 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,12 +18,13 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 # needed by shiboken2 runtime
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -36,16 +37,22 @@ build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine bindings"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +80,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 1f87cd9bc51668d15d5249c2a7d1b48ebbe9d810 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 19 Dec 2020 16:48:11 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (8 preceding siblings ...)
  2020-12-20 10:43 ` [PR PATCH] [Updated] " yopito
@ 2020-12-20 12:33 ` yopito
  2020-12-20 12:35 ` yopito
                   ` (36 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-20 12:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1482 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-748602016

Comment:
followup regarding GH actions:

1. i686* and x86_64* build fails:
  on testing:  "`408 - QtMultimedia_audio_test (Failed)`"
  No such error when runned in my chroots.
  I guess this is related to container of GH actions and pulseaudio, like missing some low-level interfaces ?
  => I consider these build fails irrelevant

2. armv7l(-glibc) build fails:
  "`/usr/armv7l-linux-gnueabihf/usr/include/gnu/stubs.h:7:11: fatal error: 'gnu/stubs-soft.h' file not found`"
  C macro triage error : should include "`gnu/stubs-hard.h`" instead for armv7l.
  hint: compare content of `cross-arm-linux-gnueabi-libc-0.33_2` for armv5/6 and `cross-armv7l-linux-gnueabihf-libc-0.33_2` for armv7
  => should open a dedicated issue ?

3. armv6l-musl build fails:  
  "`/usr/arm-linux-musleabihf/usr/include/qt5/QtCore/qbasicatomic.h:97:5: error: static_assert failed due to requirement 'bool(QAtomicOpsSupport<8>::IsSupported)' "template parameter is an integral of a size not supported on this platform`"
  looks like a 32/64 bit problem. shiboken2 (64bit) launchs clang (64bit ?) that use armv6 env (32bit) ?
  My personal build for armv7l-musl build (not in GH actions) has not such a problem (if can be compared).
  => specific to armv6l(-musl) ? I'm don't have so much clue

@ericonr : since you follow this PR, do you have comments ?

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (9 preceding siblings ...)
  2020-12-20 12:33 ` yopito
@ 2020-12-20 12:35 ` yopito
  2020-12-26  4:58 ` sgn
                   ` (35 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-20 12:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1519 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-748602016

Comment:
followup regarding GH actions:

1. i686* and x86_64* build fails:
  on testing:  "`408 - QtMultimedia_audio_test (Failed)`"
  No such error when runned in my chroots.
  I guess this is related to container of GH actions and pulseaudio, like missing some low-level interfaces ?
  => I consider these build fails irrelevant

2. armv7l(-glibc) build fails:
  "`/usr/armv7l-linux-gnueabihf/usr/include/gnu/stubs.h:7:11: fatal error: 'gnu/stubs-soft.h' file not found`"
  C macro triage error : should include "`gnu/stubs-hard.h`" instead for armv7l.
  hint: compare content of `cross-arm-linux-gnueabi-libc-0.33_2` for armv5/6 and `cross-armv7l-linux-gnueabihf-libc-0.33_2` for armv7
  => should open a dedicated issue ?

3. armv6l-musl build fails:  
  "`/usr/arm-linux-musleabihf/usr/include/qt5/QtCore/qbasicatomic.h:97:5: error: static_assert failed due to requirement 'bool(QAtomicOpsSupport<8>::IsSupported)' "template parameter is an integral of a size not supported on this platform`"
  looks like a 32/64 bit problem. shiboken2 (64bit) launchs clang (64bit ?) that use armv6 env (32bit) ?
  ~~My personal build for armv7l-musl build (not in GH actions) has not such a problem (if can be compared).~~
  => specific to armv6l(-musl) ? I'm don't have so much clue

@ericonr : since you follow this PR, do you have comments ?

edit: strike false assumption

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (10 preceding siblings ...)
  2020-12-20 12:35 ` yopito
@ 2020-12-26  4:58 ` sgn
  2020-12-26  5:10 ` ericonr
                   ` (34 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2020-12-26  4:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-751318368

Comment:
3. armv6 doesn't have atomic support.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (11 preceding siblings ...)
  2020-12-26  4:58 ` sgn
@ 2020-12-26  5:10 ` ericonr
  2020-12-26 11:13 ` yopito
                   ` (33 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2020-12-26  5:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-751319011

Comment:
For 1, I agree.

For 2, if you are able to check #27412, we can try to determine if the issue is gone, or try to fix it there. I will build the toolchain locally and try to have a look.

For 3, armv6 lacks support for atomic variables with 8 bytes. In most cases we work around that with `libatomic`, but I don't think that's possible here.

I missed your ping, sorry.


^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (12 preceding siblings ...)
  2020-12-26  5:10 ` ericonr
@ 2020-12-26 11:13 ` yopito
  2020-12-26 19:57 ` ericonr
                   ` (32 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2020-12-26 11:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-751345523

Comment:
thanks @sgn and @ericonr for your inputs. have to figure out them.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (13 preceding siblings ...)
  2020-12-26 11:13 ` yopito
@ 2020-12-26 19:57 ` ericonr
  2021-01-16 20:06 ` [PR PATCH] [Updated] " yopito
                   ` (31 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2020-12-26 19:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 934 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-751390575

Comment:
From IRC, about the issue with stubs-soft:

```
16:47 <q66> [q66@/home/q66/.xbps-src/masterdir-ppc64le /]$ clang -target armv7l-linux-gnueabihf -dM -E - < /dev/null|grep ARM_PCS_VFP
16:47 <q66> #define __ARM_PCS_VFP 1
16:47 <q66> bu that should also work by default
16:47 <q66> ohhhh
16:47 <q66> that gives me an idea
16:47 <q66> it's probably running clang, but for host
16:48 <ericonr> oh that would definitely explain it
16:48 <q66> i.e. target triplet is not passed to clang and as a result it does not have arm macros and fails to use the headers properly
```

Regarding armv6l, imo we can just use

```
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
	broken="Requires 8-byte atomics"
fi
```

in the template, and then add the packages that will have to be removed to #23575 

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (14 preceding siblings ...)
  2020-12-26 19:57 ` ericonr
@ 2021-01-16 20:06 ` yopito
  2021-01-16 20:14 ` yopito
                   ` (30 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-16 20:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

[WIP] Qt pyside 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 30524 bytes --]

From 0e5d8cf2b4ad90edad5cc6a12f1c157fe1bb28a7 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 16 Jan 2021 21:05:12 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 .../patches/tests-need-python-modules.patch   | 13 +++
 .../patches/tests-python-syntax.patch         | 91 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 6 files changed, 107 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 5e6a8d0c6ec..8be0a048683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1681,8 +1681,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..24054690b09
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,13 @@
+tests need python modules that are not installed yet: so point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..5151c3cc71a
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,91 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From 895be7ff609a8cce2faceac7d780b24540c15957 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 16 Jan 2021 21:05:13 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

* broken on non-atomic8 platforms
* broken on arvm7l-glibc crossbuild
---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  74 ++++++++++++
 ...tests-find-python-modules-from-build.patch |  21 ++++
 .../patches/tests-python-syntax.patch         | 106 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  62 +++++-----
 11 files changed, 255 insertions(+), 46 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 8be0a048683..92dc5963825 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1682,8 +1682,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..3b9d031145a
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by vnc virtual backend.
+
+Full testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..673998bc049
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,21 @@
+tests need python modules that are not installed yet: point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..2c2e1367907
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,106 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..c7ea90d0a73 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,34 +18,54 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
+
+build_options="webengine"
+desc_option_webengine="Build Qt5 WebEngine bindings"
+
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 # needed by shiboken2 runtime
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	# see https://github.com/void-linux/void-packages/pull/26962
+	broken="Requires 8-byte atomics"
+fi
+
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
-fi
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine bindings"
+	# shiboken2 calls clang without defining target's platform, so it fails for some platform.
+	# related upsteam's bug https://bugreports.qt.io/browse/PYSIDE-1477
+	if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			armv7*) broken="see https://bugreports.qt.io/browse/PYSIDE-1477" ;;
+		esac
+	fi
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
-
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +93,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 2e7104809598dde2b2d48ba0ee59ca97c2b24bc6 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 16 Jan 2021 21:05:15 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (15 preceding siblings ...)
  2021-01-16 20:06 ` [PR PATCH] [Updated] " yopito
@ 2021-01-16 20:14 ` yopito
  2021-01-17  0:33 ` Qt pyside : update to 5.15.2 yopito
                   ` (29 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-16 20:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761625659

Comment:
crossbuild to armv7l-glibc is currently flagged `nocross` : 
* did not find yet a viable workaround to make clang (launched by shiboken2) aware of this particular target.
* tried to patch `shiboken2` with additional option to handle clang option(s), but it's quite overcomplicated
* next possible workaround: generate a `.h` file filled from `clang -target armv7l-linux-gnueabihf -dM -E - < /dev/null` and patch to add its inclusion somewhere. I Will try it later.


^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (16 preceding siblings ...)
  2021-01-16 20:14 ` yopito
@ 2021-01-17  0:33 ` yopito
  2021-01-17  1:27 ` ericonr
                   ` (28 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-17  0:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761704820

Comment:
@ericonr : could you have a look on this PR please ?
failed GH actions are not relevant:
* multmedia tests are failing as usual (already discussed), 
* transient error for armv6l (that is nocross anyway)

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (17 preceding siblings ...)
  2021-01-17  0:33 ` Qt pyside : update to 5.15.2 yopito
@ 2021-01-17  1:27 ` ericonr
  2021-01-17  3:11 ` q66
                   ` (27 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-17  1:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761711236

Comment:
I will look at this tomorrow. If we are removing armv7l (still need to test armv7l-musl) and armv6l support, this will need to be removed from repos for those archs. Since this also removes ppc support, afaik, @q66 might care about the change.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (18 preceding siblings ...)
  2021-01-17  1:27 ` ericonr
@ 2021-01-17  3:11 ` q66
  2021-01-17 10:27 ` yopito
                   ` (26 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: q66 @ 2021-01-17  3:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761723564

Comment:
better thing would be to find what in pyside needs 64-bit atomics and disable those paths where needed

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (19 preceding siblings ...)
  2021-01-17  3:11 ` q66
@ 2021-01-17 10:27 ` yopito
  2021-01-17 19:06 ` [WIP] " ericonr
                   ` (25 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-17 10:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761767464

Comment:
`*-musl` target are fine (except no 64 atomic ones). 
You're right, all these regressions is a kind of pity (compared to 5.15.0).
Please don't merge, I'll give a try on all of these.


^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (20 preceding siblings ...)
  2021-01-17 10:27 ` yopito
@ 2021-01-17 19:06 ` ericonr
  2021-01-17 19:25 ` ericonr
                   ` (24 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-17 19:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761863207

Comment:
About armv7l-glibc, we should be able to fake it by adding a `#define` to either the resultant glibc file or maybe the source files themselves? 

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (21 preceding siblings ...)
  2021-01-17 19:06 ` [WIP] " ericonr
@ 2021-01-17 19:25 ` ericonr
  2021-01-17 19:26 ` ericonr
                   ` (23 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-17 19:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2499 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761865705

Comment:
Well, it would seem the issue is once again that `shiboken` is running `clang` as a compiler for the host... If we switch the armv6l builder to i686, this won't happen, but it will still be doing the wrong thing:

the full error is:

```
/usr/arm-linux-musleabihf/usr/include/qt5/QtCore/qbasicatomic.h:97:5: error: static_assert failed due to requirement 'bool(QAtomicOpsSupport<8
>::IsSupported)' "template parameter is an integral of a size not supported on this platform"
/usr/arm-linux-musleabihf/usr/include/qt5/QtCore/qsemaphore.h:70:39: note: in instantiation of template class 'QBasicAtomicInteger<unsigned lo
ng long>' requested here
```

where in `qsemaphore.h` we have:

```
    union {
        QSemaphorePrivate *d;
        QBasicAtomicInteger<quintptr> u;        // ### Qt6: make 64-bit
    };
```

and `quintptr` is defined to

```
#ifndef __cplusplus
// In C++ mode, we define below using QIntegerForSize template
Q_STATIC_ASSERT_X(sizeof(ptrdiff_t) == sizeof(size_t), "Weird ptrdiff_t and size_t definitions");
typedef ptrdiff_t qptrdiff;
typedef ptrdiff_t qsizetype;
typedef ptrdiff_t qintptr;
typedef size_t quintptr;
#endif
[...]
/*
  quintptr and qptrdiff is guaranteed to be the same size as a pointer, i.e.

      sizeof(void *) == sizeof(quintptr)
      && sizeof(void *) == sizeof(qptrdiff)

  size_t and qsizetype are not guaranteed to be the same size as a pointer, but
  they usually are.
*/
template <int> struct QIntegerForSize;
template <>    struct QIntegerForSize<1> { typedef quint8  Unsigned; typedef qint8  Signed; };
template <>    struct QIntegerForSize<2> { typedef quint16 Unsigned; typedef qint16 Signed; };
template <>    struct QIntegerForSize<4> { typedef quint32 Unsigned; typedef qint32 Signed; };
template <>    struct QIntegerForSize<8> { typedef quint64 Unsigned; typedef qint64 Signed; };
#if defined(Q_CC_GNU) && defined(__SIZEOF_INT128__)
template <>    struct QIntegerForSize<16> { __extension__ typedef unsigned __int128 Unsigned; __extension__ typedef __int128 Signed; };
#endif
template <class T> struct QIntegerForSizeof: QIntegerForSize<sizeof(T)> { };
typedef QIntegerForSize<Q_PROCESSOR_WORDSIZE>::Signed qregisterint;
typedef QIntegerForSize<Q_PROCESSOR_WORDSIZE>::Unsigned qregisteruint;
typedef QIntegerForSizeof<void*>::Unsigned quintptr;
```

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (22 preceding siblings ...)
  2021-01-17 19:25 ` ericonr
@ 2021-01-17 19:26 ` ericonr
  2021-01-17 19:50 ` yopito
                   ` (22 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-17 19:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761865882

Comment:
```
(concurrent) clang_parseTranslationUnit2(0x0, cmd[14]=-isystem/usr/arm-linux-musleabihf/usr/lib/clang/11.0.0/include -fPIC -Wno-constant-logic
al-operand -std=c++14 -I/builddir/pyside-setup-opensource-src-5.15.2/sources/pyside2/PySide2 -I/usr/arm-linux-musleabihf/usr/include/qt5 -I/us
r/arm-linux-musleabihf/usr/include/qt5 -I/usr/arm-linux-musleabihf/usr/include/qt5/QtCore -I/usr/arm-linux-musleabihf/usr/lib/qt5/mkspecs/linu
x-g++ -I/usr/arm-linux-musleabihf/usr -I/usr/arm-linux-musleabihf/usr/include /tmp/QtConcurrent_global_ZLgsBV.hpp "-DQT_ANNOTATE_ACCESS_SPECIF
IER(a)=__attribute__((annotate(#a)))" "-DQT_ANNOTATE_CLASS(type,...)=static_assert(sizeof(#__VA_ARGS__),#type);")
```

we can see it's missing arch args

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (23 preceding siblings ...)
  2021-01-17 19:26 ` ericonr
@ 2021-01-17 19:50 ` yopito
  2021-01-17 20:01 ` ericonr
                   ` (21 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-17 19:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761869202

Comment:
I thinks that shiboken is calling the crossarch clang compiler, thanks to this:
```
$ cat -n srcpkgs/python3-pyside2/template
...
    34	# needed by shiboken2 runtime
    35	export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
```


^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (24 preceding siblings ...)
  2021-01-17 19:50 ` yopito
@ 2021-01-17 20:01 ` ericonr
  2021-01-17 20:04 ` ericonr
                   ` (20 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-17 20:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761870916

Comment:
I think that only makes it set the `-I` flags appropriately. For `clang`, it's a singler executable that can target all archs, so configuring the target works by passing `-march` flags and such (and it defaults to the host if none are passed) and those are what's missing.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (25 preceding siblings ...)
  2021-01-17 20:01 ` ericonr
@ 2021-01-17 20:04 ` ericonr
  2021-01-18  0:27 ` ericonr
                   ` (19 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-17 20:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761870916

Comment:
I think that only makes it set the `-I` flags appropriately. For `clang`, it's a singler executable that can target all archs, so configuring the target works by passing `-march` flags and such (and it defaults to the host if none are passed) and those are what's missing.

Edit: it's `-target <triplet>`, not `-march`.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (26 preceding siblings ...)
  2021-01-17 20:04 ` ericonr
@ 2021-01-18  0:27 ` ericonr
  2021-01-18 19:29 ` yopito
                   ` (18 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-18  0:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2802 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-761908822

Comment:
I've tried working around this by adding this patch to shiboken:

```
diff --git ApiExtractor/clangparser/compilersupport.cpp ApiExtractor/clangparser/compilersupport.cpp
index dac5110..72d6ce2 100644
--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -305,6 +305,12 @@ static QString compilerFromCMake(const QString &defaultCompiler)
 QByteArrayList emulatedCompilerOptions()
 {
     QByteArrayList result;
+
+    QByteArray clang_target_triplet = qgetenv("CLANG_TARGET_TRIPLET");
+    if (!clang_target_triplet.isEmpty()) result.append(clang_target_triplet);
+    QByteArray clang_target_sysroot = qgetenv("CLANG_TARGET_SYSROOT");
+    if (!clang_target_sysroot.isEmpty()) result.append(clang_target_sysroot);
+
 #if defined(Q_CC_MSVC)
     HeaderPaths headerPaths;
     result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
```

and this to the pyside template:

```
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index c7ea90d0a7..d6de74c181 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -34,21 +34,10 @@ subpackages="libpyside2-python3-devel libpyside2-python3"
 # needed by shiboken2 runtime
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	# see https://github.com/void-linux/void-packages/pull/26962
-	broken="Requires 8-byte atomics"
-fi
-
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
-
-	# shiboken2 calls clang without defining target's platform, so it fails for some platform.
-	# related upsteam's bug https://bugreports.qt.io/browse/PYSIDE-1477
-	if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			armv7*) broken="see https://bugreports.qt.io/browse/PYSIDE-1477" ;;
-		esac
-	fi
+	export CLANG_TARGET_TRIPLET="--target=${XBPS_CROSS_TRIPLET}"
+	export CLANG_TARGET_SYSROOT="--sysroot=/usr/${XBPS_CROSS_TRIPLET}"
 fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
```

But now I get a different error, and it still seems to be using the host headers:

```
/../lib/gcc/arm-linux-musleabihf/9.3.0/../../../../include/c++/9.3.0/type_traits:38:10: fatal: 'bits/c++config.h' file not found
```

@q66 suggested making it `nocross` in general, and in the current circumstance I'd agree, since the aarch64 build probably just works out due to luck, not really because it's doing the right thing. This is quite unfortunate, of course, since there could be FreeCAD users on aarch64.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (27 preceding siblings ...)
  2021-01-18  0:27 ` ericonr
@ 2021-01-18 19:29 ` yopito
  2021-01-18 19:33 ` ericonr
                   ` (17 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-18 19:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-762434568

Comment:
nice patch, many thanks for you help.
I'm not sure that `CLANG_TARGET_SYSROOT` is needed, since `CLANG_INSTALL_DIR` already take care of crossbuild. I'm giving a try just in case.


^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (28 preceding siblings ...)
  2021-01-18 19:29 ` yopito
@ 2021-01-18 19:33 ` ericonr
  2021-01-22 18:40 ` yopito
                   ` (16 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-18 19:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-762436152

Comment:
@yopito there were some more suggestions for some include paths, since clang apparently gets them very wrong. I have yet to try and implement them, see:

```
2021-01-17 22:00:11     q66     -isystem /usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/`${XBPS_CROSS_TRIPLET}-gcc -dumpversion`
2021-01-17 22:00:40     q66     to the flags passed to clang
2021-01-17 22:01:00     ericonr does that manage to find c++config.h?
2021-01-17 22:01:08     ericonr it's in a really weird location
2021-01-17 22:01:28     ericonr like /usr/include/c++/9.3/$triplet
2021-01-17 22:02:27     q66     ah, no it won't
2021-01-17 22:02:31     q66     you'll have to add three paths
2021-01-17 22:03:11     q66     particularly /usr/triplet/usr/include/c++/<ver>, and then also its subdirs <triplet>, and backward
2021-01-17 22:03:57     q66     just add them all with -isystem
2021-01-17 22:04:09     q66     probably something like
2021-01-17 22:04:21     q66     local gcc_ver=`${XBPS_CROSS_TRIPLET}-gcc -dumpversion`
2021-01-17 22:04:26     ericonr by backward do you mean literally "backward"?
2021-01-17 22:04:34     q66     local inc_root=/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}
2021-01-17 22:04:35     q66     and then
2021-01-17 22:04:52     q66     -isystem ${inc_root} -isystem ${inc_root}/${XBPS_CROSS_TRIPLET} -isystem ${inc_root}/backward
```

Also, I believe you should still keep sysroot

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (29 preceding siblings ...)
  2021-01-18 19:33 ` ericonr
@ 2021-01-22 18:40 ` yopito
  2021-01-22 18:51 ` yopito
                   ` (15 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-22 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 962 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-765610902

Comment:
Since qt5 is built with gcc, adding `-isystem /usr/armv7l-linux-gnueabihf/usr/include/c++/10.2/armv7l-linux-gnueabihf` to clang make it happy !
manual build once packaging failed as usual:
```
(chroot) $ clang --target=armv7l-linux-gnueabihf --sysroot=/usr/armv7l-linux-gnueabihf \
                          -fPIC -Wno-constant-logical-operand -std=c++14  \
                          -I/usr/armv7l-linux-gnueabihf/usr/include/qt5 \
                          -isystem/usr/armv7l-linux-gnueabihf/usr/include/c++/10.2/armv7l-linux-gnueabihf \
                           /tmp/QtCore_global_XSznox.hpp

=> no error, a .gch file has been generated:

/tmp/QtCore_global_XSznox.hpp
/tmp/QtCore_global_XSznox.hpp.gch
```
Related to gcc internals for C++, its equivalent of clang's systoot I guess ?
Keep on digging


^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (30 preceding siblings ...)
  2021-01-22 18:40 ` yopito
@ 2021-01-22 18:51 ` yopito
  2021-01-23 18:59 ` [PR PATCH] [Updated] " yopito
                   ` (14 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-22 18:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-765610902

Comment:
Since qt5 is built with gcc, adding `-isystem /usr/armv7l-linux-gnueabihf/usr/include/c++/10.2/armv7l-linux-gnueabihf` to clang make it happy !
manual build once packaging failed as usual:
```
(chroot) $ clang --target=armv7l-linux-gnueabihf --sysroot=/usr/armv7l-linux-gnueabihf \
                          -fPIC -Wno-constant-logical-operand -std=c++14  \
                          -I/usr/armv7l-linux-gnueabihf/usr/include/qt5 \
                          -isystem/usr/armv7l-linux-gnueabihf/usr/include/c++/10.2/armv7l-linux-gnueabihf \
                           /tmp/QtCore_global_XSznox.hpp

=> no error, a .gch file has been generated:

/tmp/QtCore_global_XSznox.hpp
/tmp/QtCore_global_XSznox.hpp.gch
```
Related to gcc internals for C++, its equivalent of clang's systoot I guess ?
Keep on digging

Edit: reinvent the wheel that q66 already explained just aboved. At least, this is the same wheel.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (31 preceding siblings ...)
  2021-01-22 18:51 ` yopito
@ 2021-01-23 18:59 ` yopito
  2021-01-23 22:35 ` yopito
                   ` (13 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-23 18:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

[WIP] Qt pyside : update to 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 32092 bytes --]

From 6bf18f9177bed59548795b8db52e07bb0543e992 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:28 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

add SHIBOKEN_CLANG_OPTIONS env variable support to manage crossbuild
---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 ...ng-options-via-environment-variables.patch | 21 +++++
 .../patches/tests-need-python-modules.patch   | 13 +++
 .../patches/tests-python-syntax.patch         | 91 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 7 files changed, 128 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 670be76ec65..6a925ae5900 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1679,8 +1679,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
new file mode 100644
index 00000000000..f8724b96bfb
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
@@ -0,0 +1,21 @@
+Add ability to pass additional options to clang via environnement variable.
+With help from https://github.com/void-linux/void-packages/pull/26962
+
+--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
++++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+@@ -305,6 +305,15 @@
+ QByteArrayList emulatedCompilerOptions()
+ {
+     QByteArrayList result;
++
++    QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS");
++    // split to avoid double quoting drived by space inside it
++    if (!shiboken_clang_options.isEmpty()) {
++      for (const QByteArray &item: shiboken_clang_options.split(' ')) {
++        result.append(item);
++      }
++    }
++
+ #if defined(Q_CC_MSVC)
+     HeaderPaths headerPaths;
+     result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..24054690b09
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,13 @@
+tests need python modules that are not installed yet: so point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..5151c3cc71a
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,91 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From 7681d04ef95b965b7154e4016379137d4c30f637 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:31 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  74 ++++++++++++
 ...tests-find-python-modules-from-build.patch |  21 ++++
 .../patches/tests-python-syntax.patch         | 106 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  67 +++++------
 11 files changed, 259 insertions(+), 47 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index 6a925ae5900..4bc3b8255f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1680,8 +1680,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..ca4894b6fa9
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by vnc virtual backend.
+
+Raw testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..673998bc049
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,21 @@
+tests need python modules that are not installed yet: point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..2c2e1367907
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,106 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..467707fad34 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,34 +18,57 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
+
+build_options="webengine"
+desc_option_webengine="Build Qt5 WebEngine bindings"
+
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 # needed by shiboken2 runtime
-export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
+export CLANG_INSTALL_DIR=/usr
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
-fi
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine bindings"
+	# make clang of shiboken aware of crossbuild
+	SHIBOKEN_CLANG_OPTIONS="--target=${XBPS_CROSS_TRIPLET}"
+	SHIBOKEN_CLANG_OPTIONS+=" --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	# qt5 is built by gcc, so clang of shiboken needs gcc stuff, at least for armv7l
+	if [ "$IN_CHROOT" ]; then
+		local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"
+		local inc_root="/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}"
+
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}"
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/${XBPS_CROSS_TRIPLET}"
+		# XXX uneeded so far
+		#SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/backward"
+	fi
+	export SHIBOKEN_CLANG_OPTIONS
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
+if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
+fi
 
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +96,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 7a74a3eed61b662bab9424dfef5ac3b2ab401f62 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:33 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (32 preceding siblings ...)
  2021-01-23 18:59 ` [PR PATCH] [Updated] " yopito
@ 2021-01-23 22:35 ` yopito
  2021-01-24  8:19 ` yopito
                   ` (12 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-23 22:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-766192828

Comment:
This time, it looks like much better: OK for GH, except usual failing multmedia test.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (33 preceding siblings ...)
  2021-01-23 22:35 ` yopito
@ 2021-01-24  8:19 ` yopito
  2021-01-26 21:22 ` [PR REVIEW] " ericonr
                   ` (11 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-24  8:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#issuecomment-766310080

Comment:
many thanks @ericonr and @q66 for yours valuable help. ready to review.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (34 preceding siblings ...)
  2021-01-24  8:19 ` yopito
@ 2021-01-26 21:22 ` ericonr
  2021-01-26 21:38 ` q66
                   ` (10 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-26 21:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r564841532

Comment:
I don't get why `IN_CHROOT`... No other template uses it, either. Does it need to be inside a conditional?

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (35 preceding siblings ...)
  2021-01-26 21:22 ` [PR REVIEW] " ericonr
@ 2021-01-26 21:38 ` q66
  2021-01-26 22:46 ` yopito
                   ` (9 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: q66 @ 2021-01-26 21:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r564851097

Comment:
should be in `CROSS_BUILD`, no?

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (36 preceding siblings ...)
  2021-01-26 21:38 ` q66
@ 2021-01-26 22:46 ` yopito
  2021-01-26 23:16 ` ericonr
                   ` (8 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-26 22:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r564886628

Comment:
@ericonr  : Because gcc is not available until in chroot, but it can be removed if your prefer.
@q66 : it's within crossbuild condition.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (37 preceding siblings ...)
  2021-01-26 22:46 ` yopito
@ 2021-01-26 23:16 ` ericonr
  2021-01-26 23:43 ` sgn
                   ` (7 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-26 23:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r564903858

Comment:
Ah, I see. Maybe we can update the value from within `pre_configure`, then? I think it'd work better.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (38 preceding siblings ...)
  2021-01-26 23:16 ` ericonr
@ 2021-01-26 23:43 ` sgn
  2021-01-27 19:10 ` [PR PATCH] [Updated] " yopito
                   ` (6 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2021-01-26 23:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r564914759

Comment:
IMO, it should be wrapped inside `pre_configure` and `pre_build` instead of put in global scope, we can remove `$IN_CHROOT` then

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (39 preceding siblings ...)
  2021-01-26 23:43 ` sgn
@ 2021-01-27 19:10 ` yopito
  2021-01-27 19:14 ` [PR REVIEW] " yopito
                   ` (5 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-27 19:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

Qt pyside : update to 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 31990 bytes --]

From dd007c8ff6d7726762323b13b3b1da5322f97f4f Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:28 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

add SHIBOKEN_CLANG_OPTIONS env variable support to manage crossbuild
---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 ...ng-options-via-environment-variables.patch | 21 +++++
 .../patches/tests-need-python-modules.patch   | 13 +++
 .../patches/tests-python-syntax.patch         | 91 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 7 files changed, 128 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index f73bd5d4ed4..c6f930b953a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,8 +1677,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
new file mode 100644
index 00000000000..f8724b96bfb
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
@@ -0,0 +1,21 @@
+Add ability to pass additional options to clang via environnement variable.
+With help from https://github.com/void-linux/void-packages/pull/26962
+
+--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
++++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+@@ -305,6 +305,15 @@
+ QByteArrayList emulatedCompilerOptions()
+ {
+     QByteArrayList result;
++
++    QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS");
++    // split to avoid double quoting drived by space inside it
++    if (!shiboken_clang_options.isEmpty()) {
++      for (const QByteArray &item: shiboken_clang_options.split(' ')) {
++        result.append(item);
++      }
++    }
++
+ #if defined(Q_CC_MSVC)
+     HeaderPaths headerPaths;
+     result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..24054690b09
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,13 @@
+tests need python modules that are not installed yet: so point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..5151c3cc71a
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,91 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From 9b453f80fe56bfd2620ea89275ba54acd4cbad1c Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:31 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  74 ++++++++++++
 ...tests-find-python-modules-from-build.patch |  21 ++++
 .../patches/tests-python-syntax.patch         | 106 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  69 ++++++------
 11 files changed, 261 insertions(+), 47 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index c6f930b953a..48d6076467a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..ca4894b6fa9
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by vnc virtual backend.
+
+Raw testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..673998bc049
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,21 @@
+tests need python modules that are not installed yet: point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..2c2e1367907
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,106 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..14422021e5c 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,34 +18,59 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
+
+build_options="webengine"
+desc_option_webengine="Build Qt5 WebEngine bindings"
+
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 # needed by shiboken2 runtime
-export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
+export CLANG_INSTALL_DIR=/usr
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
 fi
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine bindings"
-
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
-
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_build() {
+	if [ ${CROSS_BUILD} ]; then
+
+		# make clang of shiboken aware of crossbuild
+		SHIBOKEN_CLANG_OPTIONS="--target=${XBPS_CROSS_TRIPLET}"
+		SHIBOKEN_CLANG_OPTIONS+=" --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
+
+		# qt5 is built with gcc, so shiboken's clang needs gcc corresponding headers
+		local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"
+		local inc_root="/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}"
+
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}"
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/${XBPS_CROSS_TRIPLET}"
+
+		export SHIBOKEN_CLANG_OPTIONS
+	fi
+}
+
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +98,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From 1001b77de0c62d8d580be5af2c0dabc56070cedd Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:33 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (40 preceding siblings ...)
  2021-01-27 19:10 ` [PR PATCH] [Updated] " yopito
@ 2021-01-27 19:14 ` yopito
  2021-01-27 22:15 ` ericonr
                   ` (4 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-27 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r565567642

Comment:
ah, thanks @sgn for reminding about pre_ stages.  
I had trouble to export variable `SHIBOKEN_CLANG_OPTIONS`, hence my quirk above ... 
fixed by use of `pre_build`, let's GH actions processing it again.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (41 preceding siblings ...)
  2021-01-27 19:14 ` [PR REVIEW] " yopito
@ 2021-01-27 22:15 ` ericonr
  2021-01-27 22:55 ` [PR PATCH] [Updated] " yopito
                   ` (3 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-27 22:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r565675003

Comment:
Could you add a comment about `backward` so if it breaks we remember to fix?

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Updated] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (42 preceding siblings ...)
  2021-01-27 22:15 ` ericonr
@ 2021-01-27 22:55 ` yopito
  2021-01-27 22:55 ` [PR REVIEW] " yopito
                   ` (2 subsequent siblings)
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-27 22:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages qtpyside.5.15.2
https://github.com/void-linux/void-packages/pull/26962

Qt pyside : update to 5.15.2


A patch file from https://github.com/void-linux/void-packages/pull/26962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtpyside.5.15.2-26962.patch --]
[-- Type: text/x-diff, Size: 32072 bytes --]

From dd007c8ff6d7726762323b13b3b1da5322f97f4f Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:28 +0100
Subject: [PATCH 1/3] shiboken2: update to 5.15.2, testing support, remove
 dummy packages

add SHIBOKEN_CLANG_OPTIONS env variable support to manage crossbuild
---
 common/shlibs                                 |  2 -
 srcpkgs/libshiboken-python3                   |  1 -
 srcpkgs/python3-shiboken                      |  1 -
 ...ng-options-via-environment-variables.patch | 21 +++++
 .../patches/tests-need-python-modules.patch   | 13 +++
 .../patches/tests-python-syntax.patch         | 91 +++++++++++++++++++
 srcpkgs/shiboken2/template                    | 19 +---
 7 files changed, 128 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/libshiboken-python3
 delete mode 120000 srcpkgs/python3-shiboken
 create mode 100644 srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
 create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index f73bd5d4ed4..c6f930b953a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,8 +1677,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
new file mode 100644
index 00000000000..f8724b96bfb
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
@@ -0,0 +1,21 @@
+Add ability to pass additional options to clang via environnement variable.
+With help from https://github.com/void-linux/void-packages/pull/26962
+
+--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
++++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+@@ -305,6 +305,15 @@
+ QByteArrayList emulatedCompilerOptions()
+ {
+     QByteArrayList result;
++
++    QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS");
++    // split to avoid double quoting drived by space inside it
++    if (!shiboken_clang_options.isEmpty()) {
++      for (const QByteArray &item: shiboken_clang_options.split(' ')) {
++        result.append(item);
++      }
++    }
++
+ #if defined(Q_CC_MSVC)
+     HeaderPaths headerPaths;
+     result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..24054690b09
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,13 @@
+tests need python modules that are not installed yet: so point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG	2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt	2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+     list(FIND test_blacklist ${test_name} expect_fail)
+     add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+-    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+     set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+     if (${expect_fail} GREATER -1)
+         set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..5151c3cc71a
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,91 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel"
 makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
  libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 
 python_version=3
 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
 		vmove ${py3_sitelib}
 	}
 }
-
-python3-shiboken_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}
-
-libshiboken-python3_package() {
-	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
-	depends="python3-shiboken2-${version}_${revision}"
-	build_style=meta
-}

From ad7558842023849104aa5bbc6024fe2e11633cb1 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:31 +0100
Subject: [PATCH 2/3] python3-pyside2: update to 5.15.2, testing support,
 remove dummy packages

---
 common/shlibs                                 |   2 -
 srcpkgs/libpyside-python3                     |   1 -
 srcpkgs/python3-pyenet                        |   1 -
 srcpkgs/python3-pyside                        |   1 -
 srcpkgs/python3-pyside-phonon                 |   1 -
 .../patches/crossbuild-for-shiboken2.patch    |  18 +--
 .../patches/tests-correct-build_dir.patch     |  14 +++
 .../patches/tests-disable-invalid-ones.patch  |  74 ++++++++++++
 ...tests-find-python-modules-from-build.patch |  21 ++++
 .../patches/tests-python-syntax.patch         | 106 ++++++++++++++++++
 srcpkgs/python3-pyside2/template              |  71 ++++++------
 11 files changed, 263 insertions(+), 47 deletions(-)
 delete mode 120000 srcpkgs/libpyside-python3
 delete mode 120000 srcpkgs/python3-pyenet
 delete mode 120000 srcpkgs/python3-pyside
 delete mode 120000 srcpkgs/python3-pyside-phonon
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
 create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch

diff --git a/common/shlibs b/common/shlibs
index c6f930b953a..48d6076467a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
 libpyside2.so.5.15 libpyside2-python3-5.15.0_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
 --- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
 +++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
-                         BYPRODUCTS ${${module_SOURCES}}
-                         COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
-                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
--                        --include-paths=${shiboken_include_dirs}
-+                        --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
-                         ${shiboken_framework_include_dirs_option}
-                         --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
-                         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt	2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+ 
+     # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+     # the path to the testbinding module
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+-    get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++    set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+     set(QT_DIR "${_qt5Core_install_prefix}")
+ 
+     macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..ca4894b6fa9
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by vnc virtual backend.
+
+Raw testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+ 
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..673998bc049
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,21 @@
+tests need python modules that are not installed yet: point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py	2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+ 
+     python_dirs = [os.path.join(src_dir, 'util')]  # Helper module
+ 
+-    pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+-    python_dirs.append(pyside_build_dir)   # for PySide2
++    pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++    python_dirs.append(get_build_dir())   # for PySide2
+     lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+ 
+     if testbindings_module:
+-        python_dirs.append(os.path.join(pyside_build_dir,
++        python_dirs.append(os.path.join(get_build_dir(),
+                                         'tests', 'pysidetest'))
+         lib_dirs.append(_get_qt_lib_dir())
+ 
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..2c2e1367907
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,106 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+    "#  Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt                          |  3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py          | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp   |  2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+     darwin py3
+ [QtCore::qfileread_test]
+     darwin
+-#  Nested exception in Python 3
+-[QtCore::qflags_test]
+-    py3
+ [QtCore::qobject_connect_notify_test]
+     linux
+     darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+ 
+ '''Test cases for QFlags'''
+ 
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+     def testWrongType(self):
+         '''Wrong type passed to QFlags binary operators'''
++        for op in operator.or_, operator.and_, operator.xor:
++            for x in '43', 'jabba', QObject, object:
++                self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++                self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++        # making sure this actually does not fail all the time
++        self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+ 
+-        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+-        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+-        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+-        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+     s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+         << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+     s << "#endif\n\n";
++    s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++        << INDENT << "return nullptr;\n" << outdent(INDENT);
+     s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+     s << INDENT << "return ";
+     writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+-- 
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py	2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+         self.assertTrue(not widget.isVisible())
+         widget.setVisible(True)
+         self.assertTrue(widget.isVisible())
+-        self.assertTrue(widget.winId() is not 0)
++        self.assertTrue(widget.winId() != 0)
+         # skip this test on macOS since no native events are received
+         if sys.platform == 'darwin':
+             return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..79014cc1e2e 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
 hostmakedepends="cmake python3 shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,34 +18,61 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
+
+build_options="webengine"
+desc_option_webengine="Build Qt5 WebEngine bindings"
+
+subpackages="libpyside2-python3-devel libpyside2-python3"
 
 # needed by shiboken2 runtime
-export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
+export CLANG_INSTALL_DIR=/usr
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
 fi
 
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine bindings"
-
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
+	if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+		build_options_default="webengine"
+	fi
 fi
 
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
-
 if [ "$build_option_webengine" ]; then
 	subpackages+=" python3-pyside2-webengine"
 fi
 
+pre_build() {
+	if [ ${CROSS_BUILD} ]; then
+
+		# make clang of shiboken aware of crossbuild
+		SHIBOKEN_CLANG_OPTIONS="--target=${XBPS_CROSS_TRIPLET}"
+		SHIBOKEN_CLANG_OPTIONS+=" --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
+
+		# qt5 is built with gcc, so shiboken's clang needs gcc corresponding headers
+		local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"
+		local inc_root="/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}"
+
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}"
+		SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/${XBPS_CROSS_TRIPLET}"
+		# uneeded so far
+		#SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/backward"
+
+		export SHIBOKEN_CLANG_OPTIONS
+	fi
+}
+
+pre_check() {
+	# no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+	export QT_QPA_PLATFORM=vnc
+}
+
 python3-pyside2-webengine_package() {
 	depends="python3-pyside2-${version}_${revision}"
 	short_desc+=" - WebEngine component"
@@ -73,23 +100,3 @@ libpyside2-python3_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-libpyside-python3_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyside-phonon_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}
-
-python3-pyenet_package() {
-	short_desc+=" - transitional dummy package"
-	build_style=meta
-}

From eabfdc2559af48432ff85def5d6ffd5a2b35c182 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:33 +0100
Subject: [PATCH 3/3] pyside2-tools: update to 5.15.2, testing support

---
 .../patches/tests-use-qt5-rcc-and-uic.patch   | 34 +++++++++++++++++++
 srcpkgs/pyside2-tools/template                | 10 ++++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch

diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+                      ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+     add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+-                     ${PYSIDERCC_EXECUTABLE}
++                     ${PYSIDE2RCCBINARY}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+ 
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
 # Template file for 'pyside2-tools'
 pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
 revision=1
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2-tools"
 build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="cmake python3-devel shiboken2"
 makedepends="python3-devel libshiboken2-devel qt5-devel
  libpyside2-python3-devel"
+checkdepends="pkg-config"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
 homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
 distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
 python_version=3
 
 if [ ${CROSS_BUILD} ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (43 preceding siblings ...)
  2021-01-27 22:55 ` [PR PATCH] [Updated] " yopito
@ 2021-01-27 22:55 ` yopito
  2021-01-28  0:15 ` q66
  2021-01-28  3:33 ` [PR PATCH] [Closed]: " ericonr
  46 siblings, 0 replies; 48+ messages in thread
From: yopito @ 2021-01-27 22:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r565695009

Comment:
yes, sure. here it is.

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR REVIEW] Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (44 preceding siblings ...)
  2021-01-27 22:55 ` [PR REVIEW] " yopito
@ 2021-01-28  0:15 ` q66
  2021-01-28  3:33 ` [PR PATCH] [Closed]: " ericonr
  46 siblings, 0 replies; 48+ messages in thread
From: q66 @ 2021-01-28  0:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26962#discussion_r565730729

Comment:
just include backwards always even if it's not needed, it's a standard include so it should be there, it won't hurt anything if it's there

^ permalink raw reply	[flat|nested] 48+ messages in thread

* Re: [PR PATCH] [Closed]: Qt pyside : update to 5.15.2
  2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
                   ` (45 preceding siblings ...)
  2021-01-28  0:15 ` q66
@ 2021-01-28  3:33 ` ericonr
  46 siblings, 0 replies; 48+ messages in thread
From: ericonr @ 2021-01-28  3:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

There's a closed pull request on the void-packages repository

Qt pyside : update to 5.15.2
https://github.com/void-linux/void-packages/pull/26962

Description:


^ permalink raw reply	[flat|nested] 48+ messages in thread

end of thread, other threads:[~2021-01-28  3:33 UTC | newest]

Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-05 13:27 [PR PATCH] [WIP] Qt pyside 5.12.2 yopito
2020-12-05 22:49 ` ericonr
2020-12-05 23:18 ` ericonr
2020-12-05 23:19 ` ericonr
2020-12-06  9:06 ` yopito
2020-12-19 15:48 ` [PR PATCH] [Updated] [WIP] Qt pyside 5.15.2 yopito
2020-12-19 16:18 ` yopito
2020-12-19 17:53 ` yopito
2020-12-19 17:55 ` yopito
2020-12-20 10:43 ` [PR PATCH] [Updated] " yopito
2020-12-20 12:33 ` yopito
2020-12-20 12:35 ` yopito
2020-12-26  4:58 ` sgn
2020-12-26  5:10 ` ericonr
2020-12-26 11:13 ` yopito
2020-12-26 19:57 ` ericonr
2021-01-16 20:06 ` [PR PATCH] [Updated] " yopito
2021-01-16 20:14 ` yopito
2021-01-17  0:33 ` Qt pyside : update to 5.15.2 yopito
2021-01-17  1:27 ` ericonr
2021-01-17  3:11 ` q66
2021-01-17 10:27 ` yopito
2021-01-17 19:06 ` [WIP] " ericonr
2021-01-17 19:25 ` ericonr
2021-01-17 19:26 ` ericonr
2021-01-17 19:50 ` yopito
2021-01-17 20:01 ` ericonr
2021-01-17 20:04 ` ericonr
2021-01-18  0:27 ` ericonr
2021-01-18 19:29 ` yopito
2021-01-18 19:33 ` ericonr
2021-01-22 18:40 ` yopito
2021-01-22 18:51 ` yopito
2021-01-23 18:59 ` [PR PATCH] [Updated] " yopito
2021-01-23 22:35 ` yopito
2021-01-24  8:19 ` yopito
2021-01-26 21:22 ` [PR REVIEW] " ericonr
2021-01-26 21:38 ` q66
2021-01-26 22:46 ` yopito
2021-01-26 23:16 ` ericonr
2021-01-26 23:43 ` sgn
2021-01-27 19:10 ` [PR PATCH] [Updated] " yopito
2021-01-27 19:14 ` [PR REVIEW] " yopito
2021-01-27 22:15 ` ericonr
2021-01-27 22:55 ` [PR PATCH] [Updated] " yopito
2021-01-27 22:55 ` [PR REVIEW] " yopito
2021-01-28  0:15 ` q66
2021-01-28  3:33 ` [PR PATCH] [Closed]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).