Hello community, here is the log from the commit of package python-pyside2 for openSUSE:Factory checked in at 2018-05-11 09:15:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyside2 (Old) and /work/SRC/openSUSE:Factory/.python-pyside2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyside2" Fri May 11 09:15:58 2018 rev:3 rq:605911 version:2.0~pre.1519723362.e621f811 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyside2/python-pyside2.changes 2018-03-13 10:25:10.419330237 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyside2.new/python-pyside2.changes 2018-05-11 09:16:10.715072738 +0200 @@ -1,0 +2,13 @@ +Wed May 9 07:32:42 UTC 2018 - [email protected] + +- Build Qt version >= 5.9, 5.9 is minimal supported Qt version +- Do not build with WebEngine on PowerPC and s390(x) +- Do not build version dependent with QtWebEngine +- Do not build with QtWebKit, QtWebKit is officilly deprecated, openSUSE + had 5.212 version which is not Qt upstream officilly supported + https://bugreports.qt.io/browse/PYSIDE-598 +- Remove duplicated build requires +- Add 0001-Remove-5.10-API-in-Qt-5.9.patch fixes build error in Leap 15 + * Files is listed in CMakeLists.txt but version 5.9 haven't those files + +------------------------------------------------------------------- New: ---- 0001-Remove-5.10-API-in-Qt-5.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyside2.spec ++++++ --- /var/tmp/diff_new_pack.3DsITX/_old 2018-05-11 09:16:12.159020426 +0200 +++ /var/tmp/diff_new_pack.3DsITX/_new 2018-05-11 09:16:12.159020426 +0200 @@ -34,6 +34,8 @@ Name: python-pyside2 %endif +%define supported_min_qt 5.9 + Version: 2.0~pre.1519723362.e621f811 Release: 0 Summary: PySide - python bindings for Qt @@ -45,6 +47,8 @@ Patch1: fix-cmake.patch # PATCH-FIX-UPSTREAM missing lib suffix handling Patch2: lib64.patch +# PATCH-FIX-OPENSUSE Do not add 5.10 API if compile with 5.9 https://bugreports.qt.io/browse/PYSIDE-573 +Patch3: 0001-Remove-5.10-API-in-Qt-5.9.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -53,49 +57,44 @@ BuildRequires: libqt5-qtdeclarative-private-headers-devel ##### essential modules -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) < 5.11 -BuildRequires: pkgconfig(Qt5Core) >= 5.10 -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: pkgconfig(Qt5Concurrent) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Core) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Network) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5PrintSupport) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Sql) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Test) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Widgets) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5X11Extras) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Xml) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5XmlPatterns) >= %{supported_min_qt} ##### optional modules -BuildRequires: libQt53DQuickScene2D5 -BuildRequires: pkgconfig(Qt53DAnimation) -BuildRequires: pkgconfig(Qt53DCore) -BuildRequires: pkgconfig(Qt53DExtras) -BuildRequires: pkgconfig(Qt53DInput) -BuildRequires: pkgconfig(Qt53DLogic) -BuildRequires: pkgconfig(Qt53DRender) -BuildRequires: pkgconfig(Qt5Charts) -BuildRequires: pkgconfig(Qt5DataVisualization) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5MultimediaWidgets) -BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5QuickWidgets) -BuildRequires: pkgconfig(Qt5Script) -BuildRequires: pkgconfig(Qt5ScriptTools) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5TextToSpeech) -BuildRequires: pkgconfig(Qt5TextToSpeech) -BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: pkgconfig(Qt53DAnimation) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt53DCore) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt53DExtras) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt53DInput) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt53DLogic) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt53DQuickScene2D) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt53DRender) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Charts) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5DataVisualization) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Designer) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Multimedia) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5MultimediaWidgets) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5OpenGL) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5QuickWidgets) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Script) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5ScriptTools) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Svg) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5TextToSpeech) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5WebChannel) >= %{supported_min_qt} +%ifnarch ppc ppc64 ppc64le s390 s390x BuildRequires: pkgconfig(Qt5WebEngineWidgets) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebSockets) -BuildRequires: pkgconfig(Qt5WebSockets) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(Qt5XmlPatterns) -#breaks with llvm 5? -#BuildRequires: pkgconfig(Qt5WebKitWidgets) +%endif +BuildRequires: pkgconfig(Qt5WebSockets) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Widgets) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5Xml) >= %{supported_min_qt} +BuildRequires: pkgconfig(Qt5XmlPatterns) >= %{supported_min_qt} BuildRequires: libxslt-devel BuildRequires: llvm-clang-devel >= 3.9 @@ -122,6 +121,9 @@ %if "%{_libdir}" == "/usr/lib64" %patch2 -p1 %endif +%if 0%{?suse_version} < 1550 +%patch3 -p1 +%endif %build export CFLAGS=-I/usr/include/linux ++++++ 0001-Remove-5.10-API-in-Qt-5.9.patch ++++++ >From e78409939db6703c74e3b959d877b7ea6f65ad80 Mon Sep 17 00:00:00 2001 From: Max Lin <[email protected]> Date: Wed, 9 May 2018 18:56:39 +0800 Subject: [PATCH] Remove 5.10 API in Qt 5.9 --- sources/pyside2/PySide2/QtCore/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index f2770f8..dd2e212 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -92,8 +92,6 @@ ${QtCore_GEN_DIR}/qpointf_wrapper.cpp ${QtCore_GEN_DIR}/qprocess_wrapper.cpp ${QtCore_GEN_DIR}/qprocessenvironment_wrapper.cpp ${QtCore_GEN_DIR}/qpropertyanimation_wrapper.cpp -${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp -${QtCore_GEN_DIR}/qrandomgenerator64_wrapper.cpp ${QtCore_GEN_DIR}/qreadlocker_wrapper.cpp ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp ${QtCore_GEN_DIR}/qrect_wrapper.cpp @@ -106,7 +104,6 @@ ${QtCore_GEN_DIR}/qresource_wrapper.cpp ${QtCore_GEN_DIR}/qrunnable_wrapper.cpp ${QtCore_GEN_DIR}/qsavefile_wrapper.cpp ${QtCore_GEN_DIR}/qsemaphore_wrapper.cpp -${QtCore_GEN_DIR}/qsemaphorereleaser_wrapper.cpp ${QtCore_GEN_DIR}/qsequentialanimationgroup_wrapper.cpp ${QtCore_GEN_DIR}/qsettings_wrapper.cpp ${QtCore_GEN_DIR}/qsignalmapper_wrapper.cpp -- 2.16.3
