Hello community,
here is the log from the commit of package python3-pyside2 for openSUSE:Factory
checked in at 2019-05-22 11:10:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pyside2 (Old)
and /work/SRC/openSUSE:Factory/.python3-pyside2.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyside2"
Wed May 22 11:10:55 2019 rev:4 rq:701006 version:5.12.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pyside2/python3-pyside2.changes
2018-12-31 09:47:27.974163545 +0100
+++
/work/SRC/openSUSE:Factory/.python3-pyside2.new.5148/python3-pyside2.changes
2019-05-22 11:10:57.834597913 +0200
@@ -1,0 +2,20 @@
+Mon May 6 08:19:22 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.12.3. No changelog available for this version.
+- Fix the license tag, the shiboken2 subdir uses a different license.
+
+-------------------------------------------------------------------
+Sat Apr 6 17:08:25 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.12.2
+ * Added binding for QWebEngineUrlScheme
+ * Fixed a crash related to multiple inheritance
+ * Fixed wrong METADATA for generated wheels
+ * Prevent Python 3.5 from crashing the build
+ Check the changes-* files for the complete list of changes.
+- Drop fix-cmake.patch
+- Drop 0001-Avoid-creation-of-empty-build-directories-in-install.patch
+- Refresh lib64.patch
+- Drop the unused _service file.
+
+-------------------------------------------------------------------
Old:
----
0001-Avoid-creation-of-empty-build-directories-in-install.patch
_service
fix-cmake.patch
pyside-setup-5.12.0.obscpio
New:
----
pyside-setup-everywhere-src-5.12.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pyside2.spec ++++++
--- /var/tmp/diff_new_pack.JG7mv2/_old 2019-05-22 11:10:58.842597979 +0200
+++ /var/tmp/diff_new_pack.JG7mv2/_new 2019-05-22 11:10:58.846597979 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python3-pyside2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,20 +22,17 @@
BuildRequires: python3-devel
BuildRequires: python3-setuptools
Name: python3-pyside2
-
-Version: 5.12.0
+Version: 5.12.3
Release: 0
Summary: Python bindings for Qt
-License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
+# shiboken2 is licensed under GPL-3.0-with-Qt-Company-Qt-exception-1.1
+License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND
GPL-3.0-with-Qt-Company-Qt-exception-1.1
Group: Development/Languages/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 - PYSIDE-882
-Patch3: 0001-Avoid-creation-of-empty-build-directories-in-install.patch
+Source0:
https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-everywhere-src-%{version}.tar.xz
+Patch0: lib64.patch
# PATCH-FIX-UPSTREAM - PYSIDE-881
-Patch4: 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch
+Patch1: 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -43,53 +40,55 @@
BuildRequires: libqt5-qtdeclarative-private-headers-devel
##### essential modules
-BuildRequires: pkgconfig(Qt5Concurrent)
-BuildConflicts: pkgconfig(Qt5Core) >= 5.13
-BuildRequires: pkgconfig(Qt5Core) >= 5.12
-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: cmake(Qt5Concurrent)
+BuildConflicts: cmake(Qt5Core) >= 5.13
+BuildRequires: cmake(Qt5Core) >= 5.12
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5PrintSupport)
+BuildRequires: cmake(Qt5Sql)
+BuildRequires: cmake(Qt5Test)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5X11Extras)
+BuildRequires: cmake(Qt5Xml)
+BuildRequires: cmake(Qt5XmlPatterns)
##### 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(Qt5Scxml)
-BuildRequires: pkgconfig(Qt5Svg)
-BuildRequires: pkgconfig(Qt5TextToSpeech)
-BuildRequires: pkgconfig(Qt5WebChannel)
-BuildRequires: pkgconfig(Qt5WebEngineWidgets)
-BuildRequires: pkgconfig(Qt5WebSockets)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5Xml)
-BuildRequires: pkgconfig(Qt5XmlPatterns)
-#BuildRequires: pkgconfig(Qt5Vector3D)
-# WebKit modules is to be removed when FreeCAD 0.18 is released
-BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: cmake(Qt53DAnimation)
+BuildRequires: cmake(Qt53DCore)
+BuildRequires: cmake(Qt53DExtras)
+BuildRequires: cmake(Qt53DInput)
+BuildRequires: cmake(Qt53DLogic)
+BuildRequires: cmake(Qt53DRender)
+BuildRequires: cmake(Qt5Charts)
+BuildRequires: cmake(Qt5DataVisualization)
+BuildRequires: cmake(Qt5Designer)
+BuildRequires: cmake(Qt5Multimedia)
+BuildRequires: cmake(Qt5MultimediaWidgets)
+BuildRequires: cmake(Qt5OpenGL)
+BuildRequires: cmake(Qt5QuickWidgets)
+BuildRequires: cmake(Qt5RemoteObjects)
+BuildRequires: cmake(Qt5Script)
+BuildRequires: cmake(Qt5ScriptTools)
+BuildRequires: cmake(Qt5Scxml)
+BuildRequires: cmake(Qt5Sensors)
+BuildRequires: cmake(Qt5Svg)
+BuildRequires: cmake(Qt5TextToSpeech)
+BuildRequires: cmake(Qt5WebChannel)
+BuildRequires: cmake(Qt5WebEngineWidgets)
+BuildRequires: cmake(Qt5WebSockets)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5Xml)
+BuildRequires: cmake(Qt5XmlPatterns)
+# FreeCAD 0.18 still uses Qt5Webkit
+BuildRequires: cmake(Qt5WebKit)
BuildRequires: clang-devel >= 3.9
BuildRequires: libxslt-devel
BuildRequires: python3-Sphinx
BuildRequires: python3-idna
BuildRequires: python3-urllib3
+BuildRequires: python3-wheel
%description
The PySide2 project provides Python bindings for the Qt
@@ -113,13 +112,11 @@
Examples and Tutorials for the PySide2 bindings for Qt.
%prep
-%setup -q -n pyside-setup-%{version}
-%patch1 -p1
+%setup -q -n pyside-setup-everywhere-src-%{version}
%if "%{_lib}" == "lib64"
-%patch2 -p1
+%patch0 -p1
%endif
-%patch3 -p1
-%patch4 -p1 -d sources/pyside2-tools/
+%patch1 -p1
%build
export LLVM_INSTALL_DIR=%{_prefix}
@@ -186,6 +183,7 @@
%files
%license LICENSE.*
+%doc dist/changes*
%{_bindir}/*
%{_libdir}/*.so.*
%{python_sitearch}/*
++++++ 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch ++++++
--- /var/tmp/diff_new_pack.JG7mv2/_old 2019-05-22 11:10:58.862597979 +0200
+++ /var/tmp/diff_new_pack.JG7mv2/_new 2019-05-22 11:10:58.862597979 +0200
@@ -4,13 +4,13 @@
Subject: [PATCH] Remove unnecessary she-bang from icon-cache.py
---
- pyside2uic/icon_cache.py | 1 -
+ sources/pyside2-tools/pyside2uic/icon_cache.py | 1 -
1 file changed, 1 deletion(-)
-diff --git a/pyside2uic/icon_cache.py b/pyside2uic/icon_cache.py
+diff --git a/sources/pyside2-tools/pyside2uic/icon_cache.py
b/sources/pyside2-tools/pyside2uic/icon_cache.py
index 523d207..9d0dfe2 100644
---- a/pyside2uic/icon_cache.py
-+++ b/pyside2uic/icon_cache.py
+--- a/sources/pyside2-tools/pyside2uic/icon_cache.py
++++ b/sources/pyside2-tools/pyside2uic/icon_cache.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# This file is part of the PySide project.
++++++ lib64.patch ++++++
--- /var/tmp/diff_new_pack.JG7mv2/_old 2019-05-22 11:10:58.874597980 +0200
+++ /var/tmp/diff_new_pack.JG7mv2/_new 2019-05-22 11:10:58.874597980 +0200
@@ -12,10 +12,10 @@
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
-index d3767976..63019a0a 100644
+index 83de489..f6498c6 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
-@@ -80,7 +80,7 @@ def prepare_packages_posix(self, vars):
+@@ -81,7 +81,7 @@ def prepare_packages_posix(self, vars):
# <install>/lib/lib* -> {st_package_name}/
copydir(
@@ -24,7 +24,7 @@
"{st_build_dir}/{st_package_name}",
filter=[
adjusted_lib_name("libshiboken*",
-@@ -155,7 +155,7 @@ def prepare_packages_posix(self, vars):
+@@ -156,7 +156,7 @@ def prepare_packages_posix(self, vars):
# <install>/lib/lib* -> {st_package_name}/
copydir(
@@ -33,24 +33,38 @@
"{st_build_dir}/{st_package_name}",
filter=[
adjusted_lib_name("libpyside*",
+
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
-index 1d563fb4..7b8d8b85 100644
+index 1e6f017..fdfb631 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
-@@ -187,7 +187,7 @@ endif()
+@@ -94,7 +94,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)
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
- 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)
+ 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)
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 d3d5c8d..acb1efd 100644
+--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
++++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+@@ -243,7 +243,7 @@ static QString findClangLibDir()
+ {
+ for (const char *envVar : {"LLVM_INSTALL_DIR", "CLANG_INSTALL_DIR"}) {
+ if (qEnvironmentVariableIsSet(envVar)) {
+- const QString path = QFile::decodeName(qgetenv(envVar)) +
QLatin1String("/lib");
++ const QString path = QFile::decodeName(qgetenv(envVar)) +
QLatin1String("/lib64");
+ if (QFileInfo::exists(path))
+ return path;
+ }
diff --git a/sources/shiboken2/CMakeLists.txt
b/sources/shiboken2/CMakeLists.txt
-index 619c0f08..ab1dceff 100644
+index 1e52c42..4cac3ae 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
-@@ -124,7 +124,8 @@ if(MSVC)
+@@ -122,7 +122,8 @@ if(MSVC)
set(CLANG_LIB_NAMES libclang)
endif()
@@ -60,27 +74,11 @@
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}.\
-@@ -333,7 +334,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D
QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
+@@ -309,7 +310,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)
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
- 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)
+ 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 dlls will be installed (default is /bin)" FORCE)
- if (WIN32)
-diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
-index d3d5c8da..acb1efd9 100644
---- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
-+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
-@@ -243,7 +243,7 @@ static QString findClangLibDir()
- {
- for (const char *envVar : {"LLVM_INSTALL_DIR", "CLANG_INSTALL_DIR"}) {
- if (qEnvironmentVariableIsSet(envVar)) {
-- const QString path = QFile::decodeName(qgetenv(envVar)) +
QLatin1String("/lib");
-+ const QString path = QFile::decodeName(qgetenv(envVar)) +
QLatin1String("/lib64");
- if (QFileInfo::exists(path))
- return path;
- }
---
-2.19.2
-
