pool/python3-pyside2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 809842 from KDE:Qt5

Browse Source 
- Update to 5.15.0
  * [PYSIDE-487] Add API of Qt 5.15
  * [PYSIDE-487] Add support for QSerialPort
  * [PYSIDE-487] Add QtQuickControls2
  * [PYSIDE-841] example: add systray example
  * [PYSIDE-841] doc: add more videos from Qt events
  * [PYSIDE-841] doc: add tutorial for using qrc files
  * [PYSIDE-904] libpyside: Remove deprecated API
  * [PYSIDE-904] Add support for template type aliases
  * [PYSIDE-957] Add a tool to dump meta objects of QObject-derived classes
  * [PYSIDE-1280] Enable injecting raw code for setattro/getattro
  * [PYSIDE-1309] Rename and update some snippets
  * [PYSIDE-454] shiboken: Add a way of specifying system includes to be parsed
  * [PYSIDE-454] shiboken: Handle smart pointers with const pointees
  * [PYSIDE-904] libshiboken: Remove deprecated API
  * [PYSIDE-957] shiboken: Fix refcounts of sbkenum
  * [PYSIDE-990] shiboken: Handle inline namespaces
  * [PYSIDE-1024] shiboken: Make it possible to specify smartpointer instantiations
  * [PYSIDE-1074] shiboken: Fix classes in hidden namespaces
  * [PYSIDE-1188] shiboken: Fix shared pointer return value in virtual function
  * [PYSIDE-1265] shiboken: Introduce a separate logging category for documentation generation
  * [PYSIDE-1265] shiboken: Change debug messages to use qCInfo and remove some messages
  * [PYSIDE-1267] shiboken: Allow for parsing headers under system include paths
  * [PYSIDE-1296] shiboken: Support non-type template parameters in functions
- Drop 0001-shiboken-Support-Clang-version-10.patch. Fixed upstream
- Rebase 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
- Rebase lib64.patch (forwarded request 809668 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/809842
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside2?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2020-06-02 12:34:39 +00:00 committed by Git OBS Bridge
commit cd7021902f
7 changed files with 62 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
View File

@ -1,7 +1,7 @@
From 69d6c32805c57e9b1c2428567ee968bff33781be Mon Sep 17 00:00:00 2001
From 06f2d7c11dece8a6e7328cf4f8ade48ce75874b0 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 30 Dec 2019 11:24:23 +0100
Subject: [PATCH 1/2] Don't try to install or use uic/rcc/designer copies.
Subject: [PATCH] Don't try to install or use uic/rcc/designer copies.
These executables are installed by qtbase and qttools. Making copies
is not needed.
@ -13,7 +13,7 @@ pyside2-tools wrongly assumed the executables were in /usr/bin on Linux.
2 files changed, 1 insertion(+), 64 deletions(-)
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index abca942..f5b2760 100644
index b842510..fd2f71c 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -134,24 +134,9 @@ def prepare_packages_posix(self, vars):
@ -30,8 +30,8 @@ index abca942..f5b2760 100644
- executables.extend(copydir(
- "{install_dir}/bin/Designer.app",
- "{st_build_dir}/{st_package_name}/Designer.app",
- filter=None,
- recursive=True, vars=vars))
- filter=None, recursive=True,
- force=False, vars=vars))
- else:
- copyfile(
- "{install_dir}/bin/designer",
@ -110,5 +110,5 @@ index ce65750..ed7fb09 100644
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
--
2.24.1
2.26.2

32
0001-shiboken-Support-Clang-version-10.patch
View File

@ -1,32 +0,0 @@
From 9ae63824a5ec550e82561b9f07fc6307ae1f3cec Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 6 Apr 2020 08:15:11 +0200
Subject: [PATCH] shiboken: Support Clang version 10
Adapt the version check of the internal include directory to parse the
entire directory (typically named like 9.0.0) as version number
instead of just checking the first digit.
Change-Id: I7e09c36fd523328e962c7f2acbc8385787e94998
Fixes: PYSIDE-1259
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index d3e5e212..188725da 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -274,7 +274,7 @@ static QString findClangBuiltInIncludesDir()
for (const QFileInfo &fi : versionDirs) {
const QString fileName = fi.fileName();
if (fileName.at(0).isDigit()) {
- const QVersionNumber versionNumber = QVersionNumber::fromString(fileName.at(0));
+ const QVersionNumber versionNumber = QVersionNumber::fromString(fileName);
if (!versionNumber.isNull() && versionNumber > lastVersionNumber) {
candidate = fi.absoluteFilePath();
lastVersionNumber = versionNumber;
--
2.26.1

41
lib64.patch
View File

@ -1,12 +1,18 @@
From f041ed5f4a3960cebf65c963b50d2c5490cd8b2a Mon Sep 17 00:00:00 2001
From d494a8eb0653b6e22207c48da7808a0bbd86b569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Thu, 20 Dec 2018 19:05:03 +0100
Subject: [PATCH] Lookup clang library and install in arch specific library
path
---
build_scripts/platforms/unix.py | 4 ++--
sources/pyside2/CMakeLists.txt | 2 +-
.../shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 +-
sources/shiboken2/CMakeLists.txt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 83de489..f6498c6 100644
index 60722cd..c9df7f9 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -81,7 +81,7 @@ def prepare_packages_posix(self, vars):
@ -18,7 +24,7 @@ index 83de489..f6498c6 100644
"{st_build_dir}/{st_package_name}",
filter=[
adjusted_lib_name("libshiboken*",
@@ -156,7 +156,7 @@ def prepare_packages_posix(self, vars):
@@ -139,7 +139,7 @@ def prepare_packages_posix(self, vars):
# <install>/lib/lib* -> {st_package_name}/
copydir(
@ -28,10 +34,10 @@ index 83de489..f6498c6 100644
filter=[
adjusted_lib_name("libpyside*",
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index 1603859..f8b1bf5 100644
index bab97f4..26fa266 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -96,7 +96,7 @@ endif()
@@ -98,7 +98,7 @@ endif()
option(BUILD_TESTS "Build tests." TRUE)
option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
@ -41,7 +47,7 @@ index 1603859..f8b1bf5 100644
if(CMAKE_HOST_APPLE)
set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "Deprecated. CMake now finds the proper include dir itself.")
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index f301733..a421153 100644
index dac5110..4b091eb 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -243,7 +243,7 @@ static QString findClangLibDir()
@ -54,11 +60,11 @@ index f301733..a421153 100644
return path;
}
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index c1349ca..bdbc93d 100644
index 5877971..25a53b3 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -115,7 +115,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
set(CMAKE_CXX_STANDARD 11)
@@ -121,7 +121,7 @@ else()
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
@ -66,17 +72,6 @@ index c1349ca..bdbc93d 100644
set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install \
prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
set(BIN_INSTALL_DIR "bin" CACHE PATH "The subdirectory relative to the install prefix where \
diff --git a/sources/shiboken2/data/shiboken_helpers.cmake b/sources/shiboken2/data/shiboken_helpers.cmake
index 8111fa6..d9f8c1e 100644
--- a/sources/shiboken2/data/shiboken_helpers.cmake
+++ b/sources/shiboken2/data/shiboken_helpers.cmake
@@ -174,7 +174,8 @@ macro(setup_clang)
set(CLANG_LIB_NAMES libclang)
endif()
- find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib)
+ set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)")
+ find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib${LIB_SUFFIX})
if (NOT EXISTS ${CLANG_LIBRARY})
string(REPLACE ";" ", " CLANG_LIB_NAMES_STRING "${CLANG_LIB_NAMES}")
message(FATAL_ERROR "Unable to find the Clang library in ${CLANG_DIR}.\
--
2.26.2

3
pyside-setup-opensource-src-5.14.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41ce931695567639c92acb68a9d66ed5609f067011af9a94b53fc0d697ad1d1c
size 3217008

3
pyside-setup-opensource-src-5.15.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
size 3367088

31
python3-pyside2.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Wed May 27 12:03:15 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.15.0
* [PYSIDE-487] Add API of Qt 5.15
* [PYSIDE-487] Add support for QSerialPort
* [PYSIDE-487] Add QtQuickControls2
* [PYSIDE-841] example: add systray example
* [PYSIDE-841] doc: add more videos from Qt events
* [PYSIDE-841] doc: add tutorial for using qrc files
* [PYSIDE-904] libpyside: Remove deprecated API
* [PYSIDE-904] Add support for template type aliases
* [PYSIDE-957] Add a tool to dump meta objects of QObject-derived classes
* [PYSIDE-1280] Enable injecting raw code for setattro/getattro
* [PYSIDE-1309] Rename and update some snippets
* [PYSIDE-454] shiboken: Add a way of specifying system includes to be parsed
* [PYSIDE-454] shiboken: Handle smart pointers with const pointees
* [PYSIDE-904] libshiboken: Remove deprecated API
* [PYSIDE-957] shiboken: Fix refcounts of sbkenum
* [PYSIDE-990] shiboken: Handle inline namespaces
* [PYSIDE-1024] shiboken: Make it possible to specify smartpointer instantiations
* [PYSIDE-1074] shiboken: Fix classes in hidden namespaces
* [PYSIDE-1188] shiboken: Fix shared pointer return value in virtual function
* [PYSIDE-1265] shiboken: Introduce a separate logging category for documentation generation
* [PYSIDE-1265] shiboken: Change debug messages to use qCInfo and remove some messages
* [PYSIDE-1267] shiboken: Allow for parsing headers under system include paths
* [PYSIDE-1296] shiboken: Support non-type template parameters in functions
- Drop 0001-shiboken-Support-Clang-version-10.patch. Fixed upstream
- Rebase 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
- Rebase lib64.patch
-------------------------------------------------------------------
Thu Apr 23 12:46:58 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

10
python3-pyside2.spec
View File

@ -22,7 +22,7 @@
BuildRequires: python3-devel
BuildRequires: python3-setuptools
Name: python3-pyside2
Version: 5.14.1
Version: 5.15.0
Release: 0
Summary: Python bindings for Qt
# Legal:
@ -39,8 +39,6 @@ Patch0: lib64.patch
Patch1: 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
# PATCH-FIX-OPENSUSE
Patch2: 0002-Fix-the-openSUSE-executable-names.patch
# PATCH-FIX-UPSTREAM
Patch3: 0001-shiboken-Support-Clang-version-10.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -49,8 +47,7 @@ BuildRequires: libqt5-qtdeclarative-private-headers-devel
##### essential modules
BuildRequires: cmake(Qt5Concurrent)
BuildConflicts: cmake(Qt5Core) >= 5.15
BuildRequires: cmake(Qt5Core) >= 5.14
BuildRequires: cmake(Qt5Core) >= 5.15
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5Sql)
@ -74,12 +71,14 @@ BuildRequires: cmake(Qt5Designer)
BuildRequires: cmake(Qt5Multimedia)
BuildRequires: cmake(Qt5MultimediaWidgets)
BuildRequires: cmake(Qt5OpenGL)
BuildRequires: cmake(Qt5QuickControls2)
BuildRequires: cmake(Qt5QuickWidgets)
BuildRequires: cmake(Qt5RemoteObjects)
BuildRequires: cmake(Qt5Script)
BuildRequires: cmake(Qt5ScriptTools)
BuildRequires: cmake(Qt5Scxml)
BuildRequires: cmake(Qt5Sensors)
BuildRequires: cmake(Qt5SerialPort)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5TextToSpeech)
BuildRequires: cmake(Qt5WebChannel)
@ -125,7 +124,6 @@ Examples and Tutorials for the PySide2 bindings for Qt.
%setup -q -n pyside-setup-opensource-src-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%if "%{_lib}" == "lib64"
%patch0 -p1
%endif