From 154db152b2a3e79575beecace3a53e3e09091dfd4e9a35c025d216de13c3cb92 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 2 Nov 2021 14:58:36 +0000 Subject: [PATCH] Accepting request 928812 from KDE:Qt:6.2 pyside 6.2.1 OBS-URL: https://build.opensuse.org/request/show/928812 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=4 --- ...ix-hang-in-test-bug_430.py-in-Qt-6.3.patch | 43 ------------------- 0001-shiboken6-Adapt-to-LLVM-12.01.patch | 34 --------------- pyside-setup-opensource-src-6.2.0.tar.xz | 3 -- pyside-setup-opensource-src-6.2.1.tar.xz | 3 ++ python3-pyside6.changes | 9 ++++ python3-pyside6.spec | 6 +-- 6 files changed, 13 insertions(+), 85 deletions(-) delete mode 100644 0001-Fix-hang-in-test-bug_430.py-in-Qt-6.3.patch delete mode 100644 0001-shiboken6-Adapt-to-LLVM-12.01.patch delete mode 100644 pyside-setup-opensource-src-6.2.0.tar.xz create mode 100644 pyside-setup-opensource-src-6.2.1.tar.xz diff --git a/0001-Fix-hang-in-test-bug_430.py-in-Qt-6.3.patch b/0001-Fix-hang-in-test-bug_430.py-in-Qt-6.3.patch deleted file mode 100644 index b907242..0000000 --- a/0001-Fix-hang-in-test-bug_430.py-in-Qt-6.3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 300e33b8fb175f79195b20fb170db4232afb5740 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Fri, 1 Oct 2021 14:53:32 +0200 -Subject: [PATCH] Fix hang in test bug_430.py in Qt 6.3 - -Terminating the application via closing the last window -only works when the window was actually shown. -Add a call to show() and reformat code. - -Task-number: QTBUG-97033 -Change-Id: I1e0a82d1baf1676de5a38c1a8fd2408e104b464a -Reviewed-by: Christian Tismer -(cherry picked from commit 01b31e518ce4fa82c58db6ae89f481be152eb4dc) -Reviewed-by: Qt Cherry-pick Bot ---- - sources/pyside6/tests/QtWidgets/bug_430.py | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/sources/pyside6/tests/QtWidgets/bug_430.py b/sources/pyside6/tests/QtWidgets/bug_430.py -index b6cf492..6ce463b 100644 ---- a/sources/pyside6/tests/QtWidgets/bug_430.py -+++ b/sources/pyside6/tests/QtWidgets/bug_430.py -@@ -44,9 +44,11 @@ class ListModel(QAbstractListModel): - return 0 - - --app = QApplication([]) --model = ListModel() --v = QListView() --v.setModel(model) --QTimer.singleShot(0, v.close) --app.exec() -+if __name__ == '__main__': -+ app = QApplication([]) -+ model = ListModel() -+ v = QListView() -+ v.setModel(model) -+ v.show() -+ QTimer.singleShot(0, v.close) -+ app.exec() --- -2.33.0 - diff --git a/0001-shiboken6-Adapt-to-LLVM-12.01.patch b/0001-shiboken6-Adapt-to-LLVM-12.01.patch deleted file mode 100644 index 518938d..0000000 --- a/0001-shiboken6-Adapt-to-LLVM-12.01.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4a5fa4568473dd63bf04c9bfd115d3cbe3c504e Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Tue, 12 Oct 2021 09:33:53 +0200 -Subject: [PATCH] shiboken6: Adapt to LLVM 12.01 - -The identifier for anonymous enums has been changed, causing -shiboken to no longer recognize them. - -Pick-to: 6.2 5.15 -Task-number: PYSIDE-1686 -Change-Id: I4d463132b8bd3fffa0b57f03be6c58ecbae94a49 ---- - sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp -index 0b6c87f..f34bd8c 100644 ---- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp -+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp -@@ -952,8 +952,10 @@ static QString enumType(const CXCursor &cursor) - // PYSIDE-1228: For "typedef enum { v1, v2 } Foo;", type will return - // "Foo" as expected. Care must be taken to exclude real anonymous enums. - name = getTypeName(clang_getCursorType(cursor)); -- if (name.contains(QLatin1String("(anonymous"))) -+ if (name.contains(u"(unnamed") // Clang 12.0.1 -+ || name.contains(u"(anonymous")) { // earlier - name.clear(); -+ } - } - return name; - } --- -2.33.0 - diff --git a/pyside-setup-opensource-src-6.2.0.tar.xz b/pyside-setup-opensource-src-6.2.0.tar.xz deleted file mode 100644 index fc0bcf4..0000000 --- a/pyside-setup-opensource-src-6.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fed210b662129955332d2609a900b5b8643130134e4682371b26a9ba60740d01 -size 6782676 diff --git a/pyside-setup-opensource-src-6.2.1.tar.xz b/pyside-setup-opensource-src-6.2.1.tar.xz new file mode 100644 index 0000000..416e7b6 --- /dev/null +++ b/pyside-setup-opensource-src-6.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0df6f42ed92e039d44ae9bf7d23cc4ee2fc4722c87adddbeafc6376074c4cd4 +size 6868020 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index 80be780..53442bf 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Oct 30 09:41:32 UTC 2021 - Christophe Giboudeaux + +- Update to 6.2.1 + https://code.qt.io/cgit/pyside/pyside-setup.git/tree/dist/changes-6.2.1 +- Drop upstream changes: + * 0001-Fix-hang-in-test-bug_430.py-in-Qt-6.3.patch + * 0001-shiboken6-Adapt-to-LLVM-12.01.patch + ------------------------------------------------------------------- Tue Oct 12 09:51:22 UTC 2021 - Christophe Giboudeaux diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 15cd4c1..2f2e653 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -30,7 +30,7 @@ ExclusiveArch: do_not_build %endif # Name: python3-%{pyside_flavor} -Version: 6.2.0 +Version: 6.2.1 Release: 0 Summary: Python bindings for Qt 6 License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -40,10 +40,6 @@ Source: https://download.qt.io/official_releases/QtForPython/pyside6/PyS Patch0: 0001-Don-t-install-CMake-files-into-versioned-directories.patch # PATCH-FIX-OPENSUSE Patch1: 0001-Always-link-to-python-libraries.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Fix-hang-in-test-bug_430.py-in-Qt-6.3.patch -# PATCH-FIX-UPSTREAM -Patch3: 0001-shiboken6-Adapt-to-LLVM-12.01.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: fdupes