Hello community, here is the log from the commit of package qbittorrent for openSUSE:Factory checked in at 2017-06-04 02:02:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old) and /work/SRC/openSUSE:Factory/.qbittorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qbittorrent" Sun Jun 4 02:02:04 2017 rev:55 rq:500874 version:3.3.13 Changes: -------- --- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2017-06-02 10:34:33.529507214 +0200 +++ /work/SRC/openSUSE:Factory/.qbittorrent.new/qbittorrent.changes 2017-06-04 02:02:33.813041657 +0200 @@ -1,0 +2,7 @@ +Fri Jun 2 20:12:04 UTC 2017 - [email protected] + +- Rebase qbittorrent-libtorrent-1.1.1.patch. +- Add qbittorrent-fix-qt-5.4-compat.patch: Fix compatibility with + Qt 5.4 or older. + +------------------------------------------------------------------- New: ---- qbittorrent-fix-qt-5.4-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qbittorrent.spec ++++++ --- /var/tmp/diff_new_pack.T23wDg/_old 2017-06-04 02:02:34.396959238 +0200 +++ /var/tmp/diff_new_pack.T23wDg/_new 2017-06-04 02:02:34.396959238 +0200 @@ -31,6 +31,8 @@ Patch0: bittorrent_missing_ppc64le_in_ax_boost_base.m4.patch # PATCH-FIX-OPENSUSE qbittorrent-libtorrent-1.1.1.patch -- Fix building with libtorrent-rasterbar 1.1.1. Patch1: qbittorrent-libtorrent-1.1.1.patch +# PATCH-FIX-OPENSUSE qbittorrent-fix-qt-5.4-compat.patch -- Fix compatibility with Qt 5.4 or older. +Patch2: qbittorrent-fix-qt-5.4-compat.patch BuildRequires: autoconf BuildRequires: automake %if 0%{?suse_version} > 1325 @@ -86,6 +88,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build aclocal -I m4 ++++++ qbittorrent-fix-qt-5.4-compat.patch ++++++ --- a/src/base/http/server.cpp +++ b/src/base/http/server.cpp @@ -126,7 +126,7 @@ bool Server::setupHttps(const QByteArray { QSslKey sslKey(key, QSsl::Rsa); if (sslKey.isNull()) -#ifdef QBT_USES_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) sslKey = QSslKey(key, QSsl::Ec); #else { ++++++ qbittorrent-libtorrent-1.1.1.patch ++++++ --- /var/tmp/diff_new_pack.T23wDg/_old 2017-06-04 02:02:34.444952464 +0200 +++ /var/tmp/diff_new_pack.T23wDg/_new 2017-06-04 02:02:34.444952464 +0200 @@ -1,8 +1,6 @@ -Index: qbittorrent-3.3.12/src/base/bittorrent/session.cpp -=================================================================== ---- qbittorrent-3.3.12.orig/src/base/bittorrent/session.cpp -+++ qbittorrent-3.3.12/src/base/bittorrent/session.cpp -@@ -45,6 +45,9 @@ +--- a/src/base/bittorrent/session.cpp ++++ b/src/base/bittorrent/session.cpp +@@ -44,6 +44,9 @@ #include <QTimer> #include <cstdlib> @@ -12,7 +10,7 @@ #include <queue> #include <vector> -@@ -194,6 +197,36 @@ namespace +@@ -183,6 +186,36 @@ namespace template <typename T> LowerLimited<T> lowerLimited(T limit, T ret) { return LowerLimited<T>(limit, ret); } @@ -49,14 +47,14 @@ } // Session -@@ -332,7 +365,11 @@ Session::Session(QObject *parent) +@@ -321,7 +354,11 @@ Session::Session(QObject *parent) dispatchAlerts(alertPtr.release()); }); #else -+#if LIBTORRENT_VERSION_NUM < 10102 -+ std::string peerId = makeFingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); -+#else ++#if LIBTORRENT_VERSION_NUM >= 10102 std::string peerId = libt::generate_fingerprint(PEER_ID, QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD); ++#else ++ std::string peerId = makeFingerprint(PEER_ID, QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD); +#endif libt::settings_pack pack; pack.set_int(libt::settings_pack::alert_mask, alertMask);
