Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qbittorrent for openSUSE:Factory
checked in at 2023-10-29 19:41:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old)
and /work/SRC/openSUSE:Factory/.qbittorrent.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qbittorrent"
Sun Oct 29 19:41:28 2023 rev:112 rq:1120896 version:4.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2023-10-23
23:40:48.415184919 +0200
+++ /work/SRC/openSUSE:Factory/.qbittorrent.new.17445/qbittorrent.changes
2023-10-29 19:41:49.387426157 +0100
@@ -1,0 +2,7 @@
+Fri Oct 27 20:02:13 UTC 2023 - Luigi Baldoni <aloi...@gmx.com>
+
+- Reintroduce qbittorrent-fix_boost_1.66_build.patch that had
+ been hastily removed and add qbittorrent-altpython.patch
+ to use a newer python for plugins on Leap.
+
+-------------------------------------------------------------------
New:
----
qbittorrent-altpython.patch
qbittorrent-fix_boost_1.66_build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qbittorrent.spec ++++++
--- /var/tmp/diff_new_pack.YiR7YW/_old 2023-10-29 19:41:50.155454098 +0100
+++ /var/tmp/diff_new_pack.YiR7YW/_new 2023-10-29 19:41:50.155454098 +0100
@@ -17,6 +17,13 @@
#
+%if 0%{?sle_version} == 150500 || 0%{?sle_version} == 150600
+%define _pyalt 11
+%endif
+%if 0%{?sle_version} == 150400
+%define _pyalt 10
+%endif
+
Name: qbittorrent
Version: 4.6.0
Release: 0
@@ -27,6 +34,10 @@
Source1: https://downloads.sf.net/%{name}/%{name}-%{version}.tar.xz.asc
Source2:
https://raw.githubusercontent.com/qbittorrent/qBittorrent/release-%{version}/5B7CC9A2.asc#/%{name}.keyring
Patch0: harden_qbittorrent-nox@.service.patch
+# PATCH-FIX-OPENSUSE qbittorrent-fix_boost_1.66_build.patch search for
libboost_system.so and patch stacktrace function # aloi...@gmx.com
+Patch2: qbittorrent-fix_boost_1.66_build.patch
+# PATCH-FIX-OPENSUSE qbittorrent-altpython.patch force newer python for the
plugins -- aloi...@gmx.com
+Patch3: qbittorrent-altpython.patch
BuildRequires: cmake >= 3.16
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@@ -47,7 +58,7 @@
# contains the qt6 plugins to read SVG icons
%requires_ge libQt6Svg6
# For search engines.
-Recommends: python3
+Recommends: python3%{_pyalt}
%description
qBittorrent is a bittorrent client programmed in C++ and Qt that
@@ -67,6 +78,7 @@
%prep
%autosetup -p1
+sed -e 's/__PYTHON_ALT__/python3%{?_pyalt:.%{_pyalt}}/' -i
src/base/utils/foreignapps.cpp
%build
for ui in nox gui; do
++++++ qbittorrent-altpython.patch ++++++
Index: qbittorrent-4.6.0/src/base/utils/foreignapps.cpp
===================================================================
--- qbittorrent-4.6.0.orig/src/base/utils/foreignapps.cpp
+++ qbittorrent-4.6.0/src/base/utils/foreignapps.cpp
@@ -256,7 +256,7 @@ PythonInfo Utils::ForeignApps::pythonInf
static PythonInfo pyInfo;
if (!pyInfo.isValid())
{
- if (testPythonInstallation(u"python3"_s, pyInfo))
+ if (testPythonInstallation(u"__PYTHON_ALT__"_s, pyInfo))
return pyInfo;
if (testPythonInstallation(u"python"_s, pyInfo))
++++++ qbittorrent-fix_boost_1.66_build.patch ++++++
Index: qbittorrent-4.6.0/CMakeLists.txt
===================================================================
--- qbittorrent-4.6.0.orig/CMakeLists.txt
+++ qbittorrent-4.6.0/CMakeLists.txt
@@ -7,7 +7,7 @@ project(qBittorrent
)
# version requirements - older versions may work, but you are on your own
-set(minBoostVersion 1.71)
+set(minBoostVersion 1.66)
set(minQt5Version 5.15.2)
set(minQt6Version 6.2)
set(minOpenSSLVersion 1.1.1)
Index: qbittorrent-4.6.0/src/app/stacktrace.cpp
===================================================================
--- qbittorrent-4.6.0.orig/src/app/stacktrace.cpp
+++ qbittorrent-4.6.0/src/app/stacktrace.cpp
@@ -30,7 +30,16 @@
#include <boost/stacktrace.hpp>
+#include <sstream>
+#include <boost/version.hpp>
+
std::string getStacktrace()
{
+#if BOOST_VERSION >= 107100
return boost::stacktrace::to_string(boost::stacktrace::stacktrace());
+#else
+ std::ostringstream out;
+ out << boost::stacktrace::stacktrace();
+ return out.str();
+#endif
}
