Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python3-pyside2 for openSUSE:Factory
checked in at 2022-06-20 15:37:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pyside2 (Old)
and /work/SRC/openSUSE:Factory/.python3-pyside2.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyside2"
Mon Jun 20 15:37:59 2022 rev:17 rq:983779 version:5.15.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pyside2/python3-pyside2.changes
2021-10-12 21:51:26.936051719 +0200
+++
/work/SRC/openSUSE:Factory/.python3-pyside2.new.1548/python3-pyside2.changes
2022-06-20 15:38:43.146986173 +0200
@@ -1,0 +2,71 @@
+Fri Jun 17 21:31:00 UTC 2022 - Ben Greiner <c...@bnavigator.de>
+
+- Clean up some deprecated python-rpm-macro usage and declare
+ BuildRequirement on it explicitly.
+- Provide python dist-info metadata and PyPI names in rpm metadata
+- Fix missing install of typing stub and PySide2.support
+- Fix ctest suite run by providing some extra paths
+
+-------------------------------------------------------------------
+Sat Jun 11 19:43:43 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 5.15.4
+ * [PYSIDE-955] QOpenGLContext.versionFunctions() have been
+ implemented. Class QOpenGLVersionFunctionsFactory (from Qt 6)
+ has also been added.
+ * [PYSIDE-1409] signature: The decision heuristics of result
+ tuples have been refined.
+ * [PYSIDE-1438] Crashes in Qt Datavisualization's
+ QBar/SurfaceDataProxy add/set/insertRow() members have been
+ fixed.
+ * [PYSIDE-1502] Import errors will now be properly reported.
+ * [PYSIDE-1513] Documentation on properties has been added.
+ * [PYSIDE-1538] signature: Unrecognized items will no longer raise
+ exceptions.
+ * [PYSIDE-1540] The performance of QPainter::drawPoints(QPolygon)
+ has been improved.
+ * [PYSIDE-1529] Crashes when registering static fields have been
+ fixed.
+
+-------------------------------------------------------------------
+Sat Mar 12 08:44:57 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 5.15.3. Bugs fixed:
+ * [PYSIDE-454] namespace std is no longer rejected in the Qt
+ typesystem files.
+ * [PYSIDE-807] setup.py's 'clean' command has been fixed.
+ * [PYSIDE-1305] The error handling of constructor keyword
+ arguments has been fixed.
+ * [PYSIDE-1422] A crash related to Signal and __eq__ has
+ been fixed.
+ * [PYSIDE-1432] An ownership issue in QLayout::replaceWidget()
+ has been fixed.
+ * [PYSIDE-1442] QFlags operations have been fixed.
+ * [PYSIDE-1447] A crash related to qApp and Python 3.9 has been
+ fixed.
+ * [PYSIDE-1449] QTestlib's QAbstractItemModelTester has been
+ added.
+ * [PYSIDE-1460] An infinite loop changing up directories in the
+ signature bootstrap code has been fixed.
+ * [PYSIDE-1466] The newly introduced overload QSetting.value()
+ taking a type has been documentated.
+ * [PYSIDE-1478] A bug related to using QQmlContext.setContextProperty()
+ with the snake case feature has been fixed.
+ * [PYSIDE-1347] Inheritance for enum types has been fixed.
+ * [PYSIDE-1448] Code injected at target/end being invoked
+ for multiple overload ids has been fixed.
+ * [PYSIDE-1470] shiboken.delete() can now be used to delete
+ Q*Application.
+ * [PYSIDE-1501] The clang parser has been fixed to be able
+ to handle some Boost headers.
+- Switch to CMake for building pyside2.
+- Add patch:
+ * 0001-Always-link-to-python-libraries.patch
+- Rebase patch:
+ * 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
+- Drop now unneeded patches:
+ * lib64.patch
+ * 0002-Fix-the-openSUSE-executable-names.patch
+- Build pyside without QtWebEngine on powerpc and zSystems
+
+-------------------------------------------------------------------
Old:
----
0002-Fix-the-openSUSE-executable-names.patch
lib64.patch
pyside-setup-opensource-src-5.15.2.tar.xz
New:
----
0001-Always-link-to-python-libraries.patch
pyside-setup-opensource-src-5.15.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pyside2.spec ++++++
--- /var/tmp/diff_new_pack.AVbk8A/_old 2022-06-20 15:38:43.762987074 +0200
+++ /var/tmp/diff_new_pack.AVbk8A/_new 2022-06-20 15:38:43.766987079 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python3-pyside2
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,8 @@
# QML imports created and used by examples
%global __requires_exclude qmlimport\\((Charts|TextBalloonPlugin)
-%define mypython python3
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
Name: python3-pyside2
-Version: 5.15.2
+Version: 5.15.4
Release: 0
Summary: Python bindings for Qt
# Legal:
@@ -36,23 +33,38 @@
Group: Development/Languages/Python
URL: http://wiki.qt.io/Qt_for_Python
Source0:
https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM
-Patch0: lib64.patch
+# PATCH-FIX-OPENSUSE
+Patch0: 0001-Always-link-to-python-libraries.patch
# PATCH-FIX-UPSTREAM
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-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
+Patch2: 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
# PATCH-FIX-UPSTREAM
-Patch4: 0001-Backport-LLVM-13-fix-from-shiboken6.patch
+Patch3: 0001-Backport-LLVM-13-fix-from-shiboken6.patch
+# Provide the PyPI names
+Provides: python3-PySide2 = %{version}-%{release}
+Provides: python3-shiboken2 = %{version}-%{release}
+Provides: python3-shiboken2_generator = %{version}-%{release}
+# SECTION common_dependencies
+BuildRequires: clang-devel >= 3.9
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
-
BuildRequires: libqt5-qtdeclarative-private-headers-devel
-
-##### essential modules
+BuildRequires: libxslt-devel
+BuildRequires: python-rpm-macros
+BuildRequires: python3-Sphinx
+BuildRequires: python3-devel
+BuildRequires: python3-idna
+BuildRequires: python3-setuptools
+BuildRequires: python3-urllib3
+BuildRequires: python3-wheel
+%if %{with tests}
+BuildRequires: Mesa-dri
+BuildRequires: xvfb-run
+%endif
+# /SECTION
+# SECTION essential_modules
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core) >= 5.15
BuildRequires: cmake(Qt5Network)
@@ -63,8 +75,8 @@
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: cmake(Qt5Xml)
BuildRequires: cmake(Qt5XmlPatterns)
-
-##### optional modules
+# /SECTION
+# SECTION optional_modules
BuildRequires: libQt53DQuickScene2D5
BuildRequires: cmake(Qt53DAnimation)
BuildRequires: cmake(Qt53DCore)
@@ -89,22 +101,14 @@
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5TextToSpeech)
BuildRequires: cmake(Qt5WebChannel)
+%ifnarch ppc64 ppc64le s390x
BuildRequires: cmake(Qt5WebEngineWidgets)
+%endif
BuildRequires: cmake(Qt5WebSockets)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
BuildRequires: cmake(Qt5XmlPatterns)
-
-BuildRequires: clang-devel >= 3.9
-BuildRequires: libxslt-devel
-BuildRequires: python3-Sphinx
-BuildRequires: python3-idna
-BuildRequires: python3-urllib3
-BuildRequires: python3-wheel
-%if %{with tests}
-BuildRequires: xvfb-run
-BuildRequires: Mesa-dri
-%endif
+# /SECTION
%description
The PySide2 project provides Python bindings for the Qt
@@ -125,79 +129,108 @@
License: BSD-3-Clause
Group: Development/Languages/Python
Requires: %{name} = %{version}
+BuildArch: noarch
%description examples
Examples and Tutorials for the PySide2 bindings for Qt.
%prep
-%setup -q -n pyside-setup-opensource-src-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%if "%{_lib}" == "lib64"
-%patch0 -p1
-%endif
-
-# Test expects depth of 32
-printf '[QtGui::qdatastream_gui_operators_test]\n linux\n' >>
build_history/blacklist.txt
-
-# bug_307 fails on armv7l only
-%ifarch %{arm}
-printf '[QtWidgets::bug_307]\n linux\n' >> build_history/blacklist.txt
-%endif
+%autosetup -p1 -n pyside-setup-opensource-src-%{version}
%build
-export LLVM_INSTALL_DIR=%{_prefix}
-# Workaround for PYSIDE-880
-export LC_ALL=C.utf8
-%{mypython} setup.py build --reuse-build --ignore-git
%{?jobs:--parallel=%{jobs}} \
-%if %{with tests}
- --build-tests
-%endif
+_libsuffix=$(echo %{_lib} | cut -b4-)
-%install
-export LC_ALL=C.utf8
-%{mypython} setup.py install --reuse-build --ignore-git --prefix=%{_prefix}
--root=%{buildroot} \
+# NOTE:The compiler and linker flags shall not be defined
+%cmake \
+ -DLIB_SUFFIX:STRING="${_libsuffix}" \
+ -DCMAKE_C_FLAGS:STRING="" \
+ -DCMAKE_CXX_FLAGS:STRING="" \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="" \
+ -DPYTHON_EXECUTABLE:STRING=python3 \
+ -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \
%if %{with tests}
- --build-tests
+ -DBUILD_TESTS:BOOL=ON
%endif
-# and hack re-installation, since setup is doing it wrong
-rm -rf %{buildroot}/*
-mkdir -p %{buildroot}/%{_libdir}
-cp -a ./pyside?_install/py*-release/* %{buildroot}%{_prefix}/
-
-cp -a ./pyside3_build/py*-release/pyside2/PySide2/*.pyi
%{buildroot}%{python_sitearch}/PySide2/
+%cmake_build
-cp -a ./examples %{buildroot}%{_datadir}/PySide2/
+%install
+%cmake_install
-sed -i 's,=.*/pyside._install/[^\/]*,=/usr,'
%{buildroot}/%{_libdir}/pkgconfig/*.pc
-sed -i 's,^libdir=.*,libdir=%{_libdir},' %{buildroot}/%{_libdir}/pkgconfig/*.pc
+sed -i 's#env python$#python%{python3_bin_suffix}#' \
+ %{buildroot}%{_bindir}/pyside_tool.py
-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
+# Broken and conflicts with python3-pyside6
+rm %{buildroot}%{_bindir}/shiboken_tool.py
-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,"[^"]*/share/PySide2/glue","%{_datadir}/PySide2/glue",'
%{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake
-sed -i 's,^include("[^"]*-release/%{_lib}/,include("%{_libdir}/,'
%{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake
+# No use on linux
+rm %{buildroot}%{_datadir}/PySide2/typesystems/*_{mac,win}.xml
+
+# The cmake superproject forgets these
+cp -r build/sources/pyside2/PySide2/*.pyi \
+ build/sources/pyside2/PySide2/py.typed \
+ build/sources/pyside2/PySide2/support \
+ %{buildroot}%{python3_sitearch}/PySide2/
+# this is not ideal, but at least we get some python dist metadata
+python3 setup.py dist_info
+for d in *.dist-info; do
+ # the commands were copied verbatim, not wrapped by entry-points.
+ rm -f $d/entry_points.txt
+ cp -r $d
%{buildroot}%{python3_sitearch}/${d/.dist-info/-%{version}.dist-info}
+done
-rm %{buildroot}%{_bindir}/*_tool.py
-rm -Rf %{buildroot}%{_datadir}/PySide2/typesystems/typesystem_*_win.xml
+# Examples must be installed manually
+cp -R examples %{buildroot}%{_datadir}/PySide2
%fdupes %{buildroot}%{_datadir}/PySide2/examples/
-%fdupes %{buildroot}%{_libdir}/cmake/
-%fdupes %{buildroot}%{python_sitearch}/shiboken2/
+%fdupes %{buildroot}%{_libqt5_libdir}/cmake/
+%fdupes %{buildroot}%{python3_sitearch}
%check
%if %{with tests}
-xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset"
%{mypython} testrunner.py test
+# Set some environment variables
+export PATH=%{_libqt5_bindir}:$PATH
+export LD_LIBRARY_PATH=%{buildroot}%{_libqt5_libdir}:$LD_LIBRARY_PATH
+export
PYTHONPATH=%{buildroot}%{python3_sitearch}:$PWD/build/sources/pyside2/tests/pysidetest
+%if 0%{?sle_version} && 0%{?sle_version} <= 150300
+# Leap 15.3: ctest searches the libs before shiboken_paths.py can set the
search path (!?)
+for binding in $PWD/build/sources/shiboken2/tests/lib*; do
+ export LD_LIBRARY_PATH=$binding:$LD_LIBRARY_PATH
+done
+export
LD_LIBRARY_PATH=$PWD/build/sources/pyside2/tests/pysidetest:$LD_LIBRARY_PATH
+%endif
+
+%define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX
+render -noreset"
+
+# Tests known to fail (listed in build_history/blacklist.txt)
+ctest_exclude_regex="QtMultimedia_audio_test"
+ctest_exclude_regex="$ctest_exclude_regex|QtQml_javascript_exceptions"
+ctest_exclude_regex="$ctest_exclude_regex|QtScriptTools_debugger_test"
+ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test"
+ctest_exclude_regex="$ctest_exclude_regex|QtWebEngineWidgets_pyside-474-qtwebengineview"
+ctest_exclude_regex="$ctest_exclude_regex|QtWebEngineCore_web_engine_custom_scheme"
+%ifarch %{arm}
+# bug_307 fails on armv7l only
+ctest_exclude_regex="$ctest_exclude_regex|QtWidget_bug_307"
+%endif
+%ifarch ppc64le
+# TODO: investigate/report test failure on PowerPC
+ctest_exclude_regex="$ctest_exclude_regex|QtQml_signal_arguments"
+%endif
+
+# Tests are executed from subdirectories. %%ctest can't be used.
+%define ctest_command %{shrink:ctest
+ --output-on-failure
+ --force-new-ctest-process
+ --parallel %{_smp_build_ncpus}
+ --exclude-regex "($ctest_exclude_regex)"}
+
+pushd build/sources/shiboken2
+%{xvfb_command} %{ctest_command}
+popd
+pushd build/sources/pyside2
+%{xvfb_command} %{ctest_command}
+popd
%endif
%post -p /sbin/ldconfig
@@ -206,20 +239,30 @@
%files
%license LICENSE.*
%doc dist/changes*
-%{_bindir}/*
-%{_libdir}/*.so.*
-%{python_sitearch}/*
+%{_bindir}/pyside2-lupdate
+%{_bindir}/pyside_tool.py
+%{_bindir}/shiboken2
+%{_libqt5_libdir}/libpyside2.%{py3_soflags}.so.*
+%{_libqt5_libdir}/libshiboken2.%{py3_soflags}.so.*
+%{python3_sitearch}/PySide2/
+%{python3_sitearch}/PySide2-%{version}.dist-info
+%{python3_sitearch}/shiboken2/
+%{python3_sitearch}/shiboken2-%{version}.dist-info
+%{python3_sitearch}/shiboken2_generator/
+%{python3_sitearch}/shiboken2_generator-%{version}.dist-info
%files devel
%{_datadir}/PySide2/
+%{_includedir}/PySide2/
+%{_includedir}/shiboken2/
+%{_libqt5_libdir}/libpyside2.%{py3_soflags}.so
+%{_libqt5_libdir}/libshiboken2.%{py3_soflags}.so
+%{_libqt5_libdir}/cmake/PySide2-%{version}
+%{_libqt5_libdir}/cmake/Shiboken2-%{version}
+%{_libqt5_libdir}/pkgconfig/pyside2.pc
+%{_libqt5_libdir}/pkgconfig/shiboken2.pc
+%{_mandir}/man1/pyside2-lupdate.1%{?ext_man}
%exclude %{_datadir}/PySide2/examples
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/cmake/PySide2-%{version}
-%{_libdir}/cmake/Shiboken2-%{version}
-%{_libdir}/pkgconfig/pyside2.pc
-%{_libdir}/pkgconfig/shiboken2.pc
-%{_mandir}/man*/*
%files examples
%dir %{_datadir}/PySide2
++++++ 0001-Always-link-to-python-libraries.patch ++++++
>From d46be00db12b97bff6b62222ccb4e97fdb0a7ed4 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christo...@krop.fr>
Date: Mon, 21 Mar 2022 14:48:20 +0100
Subject: [PATCH] Always link to python libraries.
---
sources/shiboken2/data/shiboken_helpers.cmake | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/sources/shiboken2/data/shiboken_helpers.cmake
b/sources/shiboken2/data/shiboken_helpers.cmake
index 5e0c6ea..5c0bcdc 100644
--- a/sources/shiboken2/data/shiboken_helpers.cmake
+++ b/sources/shiboken2/data/shiboken_helpers.cmake
@@ -413,21 +413,9 @@ macro(shiboken_compute_python_libraries)
"SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries"
"IS_CALLED_FROM_EXPORT" "" "" ${ARGN})
- if (NOT SHIBOKEN_PYTHON_LIBRARIES)
- set(SHIBOKEN_PYTHON_LIBRARIES "")
- endif()
-
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES)
- set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES})
- endif()
- endif()
-
- if(CMAKE_BUILD_TYPE STREQUAL "Release")
- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES)
- set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
- endif()
- endif()
+ # Always link to python libraries.
+ message(STATUS "Linking shiboken to ${PYTHON_LIBRARIES}")
+ set(SHIBOKEN_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
# If the resulting variable
# contains a "debug;X;optimized;Y" list like described in
shiboken_check_if_limited_api,
--
2.35.1
++++++ 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch ++++++
--- /var/tmp/diff_new_pack.AVbk8A/_old 2022-06-20 15:38:43.802987132 +0200
+++ /var/tmp/diff_new_pack.AVbk8A/_new 2022-06-20 15:38:43.806987138 +0200
@@ -1,79 +1,22 @@
-From 06f2d7c11dece8a6e7328cf4f8ade48ce75874b0 Mon Sep 17 00:00:00 2001
+From 88b4cc717777aa88afbed8ec30b6ef95a7ec01d1 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christo...@krop.fr>
-Date: Mon, 30 Dec 2019 11:24:23 +0100
+Date: Mon, 21 Mar 2022 17:03:40 +0100
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.
-
-pyside2-tools wrongly assumed the executables were in /usr/bin on Linux.
---
- build_scripts/platforms/unix.py | 17 +---------
- sources/pyside2-tools/CMakeLists.txt | 48 ----------------------------
- 2 files changed, 1 insertion(+), 64 deletions(-)
+ sources/pyside2-tools/CMakeLists.txt | 32 ----------------------------
+ 1 file changed, 32 deletions(-)
-diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
-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):
- "{st_build_dir}/{st_package_name}",
- filter=[
- "pyside2-lupdate",
-- "uic",
-- "rcc",
- ],
- recursive=False, vars=vars))
-
-- # Copying designer
-- if sys.platform == "darwin":
-- executables.extend(copydir(
-- "{install_dir}/bin/Designer.app",
-- "{st_build_dir}/{st_package_name}/Designer.app",
-- filter=None, recursive=True,
-- force=False, vars=vars))
-- else:
-- copyfile(
-- "{install_dir}/bin/designer",
-- "{st_build_dir}/{st_package_name}/designer",
-- force=False, vars=vars)
--
- # <install>/lib/lib* -> {st_package_name}/
- copydir(
- "{install_dir}/lib/",
-@@ -204,7 +189,7 @@ def prepare_packages_posix(self, vars):
- # compatibility
- if sys.version_info[0] == 3:
- examples_path =
"{st_build_dir}/{st_package_name}/examples".format(**vars)
-- pyside_rcc_path = "{install_dir}/bin/rcc".format(**vars)
-+ pyside_rcc_path = "/usr/bin/rcc"
- pyside_rcc_options = ['-g', 'python']
- regenerate_qt_resources(examples_path, pyside_rcc_path,
pyside_rcc_options)
-
diff --git a/sources/pyside2-tools/CMakeLists.txt
b/sources/pyside2-tools/CMakeLists.txt
-index ce65750..ed7fb09 100644
+index ce65750..f9ebd84 100644
--- a/sources/pyside2-tools/CMakeLists.txt
+++ b/sources/pyside2-tools/CMakeLists.txt
-@@ -39,54 +39,6 @@ if (NOT PYTHON_SITE_PACKAGES)
- endif()
+@@ -55,38 +55,6 @@ else()
+ set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
endif()
--# Handling .exe extension for Window and the uic/rcc executables
--if (WIN32)
-- set(EXE_EXT ".exe")
--else()
-- set(EXE_EXT "")
--endif()
--
--set(TOOLS_PATH "${_qt5Core_install_prefix}/bin")
--set(UIC_PATH "${TOOLS_PATH}/uic${EXE_EXT}")
--set(RCC_PATH "${TOOLS_PATH}/rcc${EXE_EXT}")
--if (APPLE)
-- set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app")
--else()
-- set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
--endif()
--
-install(FILES "${UIC_PATH}"
- DESTINATION bin
- PERMISSIONS
@@ -110,6 +53,6 @@
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
--
-2.26.2
+2.35.1
++++++ pyside-setup-opensource-src-5.15.2.tar.xz ->
pyside-setup-opensource-src-5.15.4.tar.xz ++++++
++++ 5917 lines of diff (skipped)
