Hello community, here is the log from the commit of package python3-pyside2 for openSUSE:Factory checked in at 2018-11-08 09:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pyside2 (Old) and /work/SRC/openSUSE:Factory/.python3-pyside2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyside2" Thu Nov 8 09:47:39 2018 rev:2 rq:644854 version:5.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pyside2/python3-pyside2.changes 2018-06-22 13:29:44.275170820 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pyside2.new/python3-pyside2.changes 2018-11-08 09:48:13.145118978 +0100 @@ -1,0 +2,17 @@ +Wed Oct 24 07:14:44 UTC 2018 - Adrian Schröter <[email protected]> + +- enable support for Qt5Scxml +- cleanup python2 deps +- enable doc generation + +------------------------------------------------------------------- +Tue Oct 23 20:29:53 UTC 2018 - Christophe Giboudeaux <[email protected]> + +- Add fix_build.patch to fix an error reported by the post build checks. + +------------------------------------------------------------------- +Mon Oct 22 14:40:28 UTC 2018 - Adrian Schröter <[email protected]> + +- update to version 5.11.2 tag + +------------------------------------------------------------------- Old: ---- pyside-setup-2.0~pre.1526654735.3f8c8702.obscpio New: ---- fix_build.patch pyside-setup-5.11.2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pyside2.spec ++++++ --- /var/tmp/diff_new_pack.3JaaJZ/_old 2018-11-08 09:48:14.237117692 +0100 +++ /var/tmp/diff_new_pack.3JaaJZ/_new 2018-11-08 09:48:14.241117688 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,15 +23,17 @@ BuildRequires: python3-setuptools Name: python3-pyside2 -Version: 2.0~pre.1526654735.3f8c8702 +Version: 5.11.2 Release: 0 Summary: PySide - python bindings for Qt License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Languages/Python -Url: http://wiki.qt.io/Qt_for_Python +URL: http://wiki.qt.io/Qt_for_Python Source0: pyside-setup-%{version}.tar.xz Patch1: fix-cmake.patch Patch2: lib64.patch +# PATCH-FIX-UPSTREAM +Patch3: fix_build.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -41,7 +43,6 @@ ##### essential modules BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) < 5.12 BuildRequires: pkgconfig(Qt5Core) >= 5.11 BuildRequires: pkgconfig(Qt5Network) @@ -70,25 +71,24 @@ BuildRequires: pkgconfig(Qt5QuickWidgets) BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5ScriptTools) +BuildRequires: pkgconfig(Qt5Scxml) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5TextToSpeech) -BuildRequires: pkgconfig(Qt5TextToSpeech) BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: pkgconfig(Qt5WebEngineWidgets) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebSockets) BuildRequires: pkgconfig(Qt5WebSockets) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5XmlPatterns) #BuildRequires: pkgconfig(Qt5Vector3D) -#breaks with llvm 5? -#BuildRequires: pkgconfig(Qt5WebKitWidgets) +# WebKit modules is to be removed when FreeCAD 0.18 is released +BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: libxslt-devel BuildRequires: clang-devel >= 3.9 -BuildRequires: python-devel >= 2.6 -BuildRequires: python-setuptools +BuildRequires: libxslt-devel +BuildRequires: python3-Sphinx +BuildRequires: python3-idna +BuildRequires: python3-urllib3 %description The PySide2 project provides Python bindings for the Qt @@ -97,7 +97,7 @@ %package devel Summary: Header Files for PySide2 Group: Development/Languages/Python -Requires: %name = %{version} +Requires: %{name} = %{version} %description devel Files needed for development with the PySide2 bindings @@ -109,17 +109,18 @@ %if "%{_lib}" == "lib64" %patch2 -p1 %endif +%patch3 -p1 %build -export LLVM_INSTALL_DIR=/usr +export LLVM_INSTALL_DIR=%{_prefix} export CFLAGS=-I/usr/include/linux -%mypython setup.py build --reuse-build --ignore-git \ +%{mypython} setup.py build --reuse-build --ignore-git \ %if %{with tests} --build-tests %endif %install -%mypython setup.py install --reuse-build --ignore-git --prefix=%{_prefix} --root=%{buildroot} \ +%{mypython} setup.py install --reuse-build --ignore-git --prefix=%{_prefix} --root=%{buildroot} \ %if %{with tests} --build-tests %endif @@ -136,43 +137,49 @@ rmdir %{buildroot}%{_prefix}/lib{/cmake,/pkgconfig,} %endif -sed -i 's,=.*/pyside._install/[^\/]*,=/usr,' %{buildroot}%{_prefix}/%_lib/pkgconfig/*.pc -sed -i 's,^libdir=.*,libdir=%{_libdir},' %{buildroot}%{_prefix}/%_lib/pkgconfig/*.pc +sed -i 's,=.*/pyside._install/[^\/]*,=/usr,' %{buildroot}/%{_libdir}/pkgconfig/*.pc +sed -i 's,^libdir=.*,libdir=%{_libdir},' %{buildroot}/%{_libdir}/pkgconfig/*.pc -sed -i 's,"[^"]*/include/shiboken2","/usr/include/shiboken2",' %{buildroot}%{_prefix}/%_lib/cmake/Shiboken*/*.cmake -sed -i 's,"[^"]*/%_lib/libshiboken2.\(.*\)","%{_libdir}/libshiboken2.\1",' %{buildroot}%{_prefix}/%_lib/cmake/Shiboken*/*.cmake -sed -i 's,"[^"]*/bin/shiboken2","%{_prefix}/bin/shiboken2",' %{buildroot}%{_prefix}/%_lib/cmake/Shiboken*/*.cmake -sed -i 's,^include("[^"]*-release/%_lib/,include("%{_libdir}/,' %{buildroot}%{_prefix}/%_lib/cmake/Shiboken*/*.cmake - -sed -i 's,"[^"]*/include/PySide2","/usr/include/PySide2",' %{buildroot}%{_prefix}/%_lib/cmake/PySide2*/*.cmake -sed -i 's,"[^"]*/lib/cmake/\(.*\)","%{_libdir}/cmake/\1",' %{buildroot}%{_prefix}/%_lib/cmake/PySide2*/*.cmake -sed -i 's,"[^"]*/lib/libpyside2\.\(.*\)","%{_libdir}/libpyside2.\1",' %{buildroot}%{_prefix}/%_lib/cmake/PySide2*/*.cmake -sed -i 's,"[^"]*/\(python.*/site-packages\)","%{_libdir}/\1",' %{buildroot}%{_prefix}/%_lib/cmake/PySide2*/*.cmake -sed -i 's,"[^"]*/share/PySide2/typesystems","%{_prefix}/share/PySide2/typesystems",' %{buildroot}%{_prefix}/%_lib/cmake/PySide2*/*.cmake -sed -i 's,^include("[^"]*-release/lib/,include("%{_libdir}/,' %{buildroot}%{_prefix}/%_lib/cmake/PySide2*/*.cmake +sed -i 's,"[^"]*/include/shiboken2","%{_includedir}/shiboken2",' %{buildroot}/%{_libdir}/cmake/Shiboken*/*.cmake +sed -i 's,"[^"]*/%{_lib}/libshiboken2.\(.*\)","%{_libdir}/libshiboken2.\1",' %{buildroot}/%{_libdir}/cmake/Shiboken*/*.cmake +sed -i 's,"[^"]*/bin/shiboken2","%{_bindir}/shiboken2",' %{buildroot}/%{_libdir}/cmake/Shiboken*/*.cmake +sed -i 's,^include("[^"]*-release/%{_lib}/,include("%{_libdir}/,' %{buildroot}/%{_libdir}/cmake/Shiboken*/*.cmake + +sed -i 's,"[^"]*/include/PySide2","%{_includedir}/PySide2",' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake +sed -i 's,"[^"]*/lib/cmake/\(.*\)","%{_libdir}/cmake/\1",' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake +sed -i 's,"[^"]*/lib/libpyside2\.\(.*\)","%{_libdir}/libpyside2.\1",' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake +sed -i 's,"[^"]*/\(python.*/site-packages\)","%{_libdir}/\1",' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake +sed -i 's,"[^"]*/share/PySide2/typesystems","%{_datadir}/PySide2/typesystems",' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake +sed -i 's,^include("[^"]*-release/lib/,include("%{_libdir}/,' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake + +sed -i 's,env python,python,' %{buildroot}/%{_bindir}/pyside2-uic + +# docu generation +cd docs +make html +cd - %check %if %{with tests} -%mypython testrunner.py test +%{mypython} testrunner.py test %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root) %license LICENSE.* -%{_prefix}/bin/* +%{_bindir}/* %{_libdir}/*.so.* %{py_sitedir}/* %files devel -%defattr(-,root,root) -%{_mandir}/man*/* -%{_prefix}/include/* +%doc docs/_build/html +%{_datadir}/PySide2/ +%{_includedir}/* %{_libdir}/*.so %{_libdir}/cmake %{_libdir}/pkgconfig -%{_datadir}/PySide2 +%{_mandir}/man*/* %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3JaaJZ/_old 2018-11-08 09:48:14.273117650 +0100 +++ /var/tmp/diff_new_pack.3JaaJZ/_new 2018-11-08 09:48:14.277117645 +0100 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://code.qt.io/pyside/pyside-setup.git</param> <param name="scm">git</param> - <param name="revision">5.11</param> - <param name="versionprefix">2.0~pre</param> + <param name="revision">v5.11.2</param> + <param name="version">5.11.2</param> </service> <service mode="disabled" name="set_version" /> ++++++ fix_build.patch ++++++ >From 70d241713ae375124eaabdd928fcdfd034822c6e Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes <[email protected]> Date: Wed, 29 Aug 2018 16:09:01 +0200 Subject: shiboken/pep384: Avoid warning by literal comparison Even though we are certain of the comparison, better to get rid of the warnings. Change-Id: Iafa51b4c59c2315b24fc9092d18792f0c9297553 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Qt CI Bot <[email protected]> --- sources/shiboken2/libshiboken/pep384impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/shiboken2/libshiboken/pep384impl.cpp') diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp index 25a3b625..4481f1cd 100644 --- a/sources/shiboken2/libshiboken/pep384impl.cpp +++ b/sources/shiboken2/libshiboken/pep384impl.cpp @@ -130,7 +130,7 @@ check_PyTypeObject_valid(void) long probe_tp_dictoffset = PyLong_AsLong(d); PyObject *probe_tp_mro = PyObject_GetAttrString(obtype, "__mro__"); if (false - || probe_tp_name != check->tp_name + || (probe_tp_name - check->tp_name) != 0 // to avoid warning || probe_tp_basicsize != check->tp_basicsize || probe_tp_call != check->tp_call || probe_tp_str != check->tp_str -- cgit v1.2.1 ++++++ lib64.patch ++++++ --- /var/tmp/diff_new_pack.3JaaJZ/_old 2018-11-08 09:48:14.309117608 +0100 +++ /var/tmp/diff_new_pack.3JaaJZ/_new 2018-11-08 09:48:14.309117608 +0100 @@ -1,5 +1,5 @@ diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt -index 0a2920e4..b9388182 100644 +index 1af84fc..843761f 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -104,7 +104,8 @@ if(MSVC) @@ -12,16 +12,7 @@ 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}.\ -@@ -114,7 +115,7 @@ endif() - message(STATUS "CLANG: ${CLANG_DIR}, ${CLANG_LIBRARY} detected by ${CLANG_DIR_SOURCE}") - - # Find highest version clang builtin includes folder to pass along to shiboken. --set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib/clang) -+set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib${LIB_SUFFIX}/clang) - file(GLOB CLANG_BUILTIN_INCLUDES_DIR_CANDIDATES "${CLANG_BUILTIN_INCLUDES_DIR_PREFIX}/*") - - # Collect only directories, and not files, and only directories starting with a number. -@@ -303,7 +304,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T +@@ -311,7 +312,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -29,3 +20,16 @@ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) if (WIN32) +diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +index 74cad05..ff02e6d 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +@@ -268,7 +268,7 @@ static QString findClangBuiltInIncludesDir() + if (!clangPath.isEmpty()) { + QString candidate; + QVersionNumber lastVersionNumber(1, 0, 0); +- QDir clangDir(clangPath + QLatin1String("/lib/clang")); ++ QDir clangDir(clangPath + QLatin1String("/lib64/clang")); + const QFileInfoList versionDirs = + clangDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); + for (const QFileInfo &fi : versionDirs) { ++++++ pyside-setup-2.0~pre.1526654735.3f8c8702.obscpio -> pyside-setup-5.11.2.obscpio ++++++ /work/SRC/openSUSE:Factory/python3-pyside2/pyside-setup-2.0~pre.1526654735.3f8c8702.obscpio /work/SRC/openSUSE:Factory/.python3-pyside2.new/pyside-setup-5.11.2.obscpio differ: char 9, line 1 ++++++ pyside-setup.obsinfo ++++++ --- /var/tmp/diff_new_pack.3JaaJZ/_old 2018-11-08 09:48:14.341117570 +0100 +++ /var/tmp/diff_new_pack.3JaaJZ/_new 2018-11-08 09:48:14.341117570 +0100 @@ -1,5 +1,5 @@ name: pyside-setup -version: 2.0~pre.1526654735.3f8c8702 -mtime: 1526654735 -commit: 3f8c8702ea295f39357e7c66f46e5138f56bcc9f +version: 5.11.2 +mtime: 1536315952 +commit: 824b7733c0bd8b162b198c67014d7f008fb71b8c
