Qt 6.7.1 + pyside 6.7.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=75
This commit is contained in:
parent
63efa1bc6f
commit
26d55e6830
@ -1,40 +0,0 @@
|
|||||||
From 6c3759e342efa8b9bcc46e1701eed3a12548db85 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
|
||||||
Date: Mon, 27 May 2024 04:59:20 +0000
|
|
||||||
Subject: [PATCH] shiboken: add missing include
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Amend b829abcc7b2e9fcdb027e653a6a52cdb0706de11 and add missing include
|
|
||||||
to fix:
|
|
||||||
|
|
||||||
| sbkmodule.cpp:459:15: error: ‘Shiboken::Conversions’ has not been declared
|
|
||||||
| Shiboken::Conversions::clearNegativeLazyCache();
|
|
||||||
| ^~~~~~~~~~~
|
|
||||||
|
|
||||||
Pick-to: 6.7
|
|
||||||
Fixes: PYSIDE-2765
|
|
||||||
Task-number: PYSIDE-2749
|
|
||||||
Task-number: PYSIDE-2404
|
|
||||||
Change-Id: I13625848bff3b0e90a53649104d6e5d84553a984
|
|
||||||
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
||||||
---
|
|
||||||
sources/shiboken6/libshiboken/sbkmodule.cpp | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/sources/shiboken6/libshiboken/sbkmodule.cpp b/sources/shiboken6/libshiboken/sbkmodule.cpp
|
|
||||||
index ccc7cc2cd..b7e6bf126 100644
|
|
||||||
--- a/sources/shiboken6/libshiboken/sbkmodule.cpp
|
|
||||||
+++ b/sources/shiboken6/libshiboken/sbkmodule.cpp
|
|
||||||
@@ -7,6 +7,7 @@
|
|
||||||
#include "bindingmanager.h"
|
|
||||||
#include "sbkstring.h"
|
|
||||||
#include "sbkcppstring.h"
|
|
||||||
+#include "sbkconverter_p.h"
|
|
||||||
|
|
||||||
#include <unordered_map>
|
|
||||||
#include <unordered_set>
|
|
||||||
--
|
|
||||||
2.45.1
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd
|
|
||||||
size 14400976
|
|
BIN
pyside-setup-everywhere-src-6.7.2.tar.xz
(Stored with Git LFS)
Normal file
BIN
pyside-setup-everywhere-src-6.7.2.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 19 07:48:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Update to 6.7.2. Check the installed changes-6.7.2 file for the
|
||||||
|
full list of changes
|
||||||
|
- Drop patch, merged upstream:
|
||||||
|
* 0001-shiboken-add-missing-include.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 29 07:28:11 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
|
Wed May 29 07:28:11 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ ExclusiveArch: donotbuild
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: %{mypython}-%{pyside_flavor}
|
Name: %{mypython}-%{pyside_flavor}
|
||||||
Version: 6.7.1
|
Version: 6.7.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Python bindings for Qt 6
|
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
|
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
|
||||||
@ -51,10 +51,8 @@ URL: https://www.qt.io
|
|||||||
Source: https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz
|
Source: https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch0: 0001-Always-link-to-python-libraries.patch
|
Patch0: 0001-Always-link-to-python-libraries.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch1: 0001-shiboken-add-missing-include.patch
|
|
||||||
# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559
|
# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559
|
||||||
Patch2: fix-pytest-qt.patch
|
Patch1: fix-pytest-qt.patch
|
||||||
# SECTION common_dependencies
|
# SECTION common_dependencies
|
||||||
BuildRequires: clang-devel
|
BuildRequires: clang-devel
|
||||||
BuildRequires: %{mypython}-Sphinx
|
BuildRequires: %{mypython}-Sphinx
|
||||||
|
Loading…
Reference in New Issue
Block a user