commit a64a35a546b112cdbc30aa5d67cc7e1302adb2d8
Author: Jan Rękorajski <[email protected]>
Date: Thu Feb 19 22:30:35 2015 +0100
- fix moc problems on boost 1.57.0
- rel 2
boost-moc.patch | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
qbittorrent.spec | 4 ++-
2 files changed, 90 insertions(+), 1 deletion(-)
---
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 4e89e18..8d04190 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -8,13 +8,14 @@ Summary(hu.UTF-8): qbittorrent - Qt4-alapú torrent kliens
Summary(pl.UTF-8): qbittorrent - graficzny klient torrenta oparty na Qt4
Name: qbittorrent
Version: 3.1.11
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications
Source0:
http://downloads.sourceforge.net/qbittorrent/%{name}-%{version}.tar.gz
# Source0-md5: fcdcb9c0d42d040ead66d1a9cf33cd28
Patch0: lang-hu-2.3.0.patch
Patch1: cxx.patch
+Patch2: boost-moc.patch
URL: http://qbittorrent.sourceforge.net/
BuildRequires: GeoIP-devel
BuildRequires: QtCore-devel >= %{qtver}
@@ -52,6 +53,7 @@ qTorrent - graficzny klient torrenta oparty na Qt4.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if %{with qsa}
%{__rm} -r src/qtsingleapp
diff --git a/boost-moc.patch b/boost-moc.patch
new file mode 100644
index 0000000..88d0ec4
--- /dev/null
+++ b/boost-moc.patch
@@ -0,0 +1,87 @@
+--- qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h.orig 2015-02-19
22:16:34.767200481 +0100
++++ qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h 2015-02-19
22:12:45.290535475 +0100
+@@ -43,9 +43,11 @@
+ #include <QTimer>
+ #include <QNetworkCookie>
+
++#ifndef Q_MOC_RUN
+ #include <libtorrent/version.hpp>
+ #include <libtorrent/session.hpp>
+ #include <libtorrent/ip_filter.hpp>
++#endif
+
+ #include "qtracker.h"
+ #include "qtorrenthandle.h"
+--- qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h~ 2014-10-22
21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h 2015-02-19
22:18:32.677199626 +0100
+@@ -37,8 +37,10 @@
+ #include <QStringList>
+ #include <QHostAddress>
+
++#ifndef Q_MOC_RUN
+ #include <libtorrent/session.hpp>
+ #include <libtorrent/ip_filter.hpp>
++#endif
+
+ using namespace std;
+
+--- qbittorrent-3.1.11/src/preferences/options_imp.cpp~ 2014-10-22
21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/preferences/options_imp.cpp 2015-02-19
22:19:55.923865690 +0100
+@@ -38,7 +38,9 @@
+ #include <QTranslator>
+ #include <QDesktopServices>
+
++#ifndef Q_MOC_RUN
+ #include <libtorrent/version.hpp>
++#endif
+
+ #include "options_imp.h"
+ #include "preferences.h"
+--- qbittorrent-3.1.11/src/preferences/options_imp.h~ 2014-10-22
21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/preferences/options_imp.h 2015-02-19
22:20:37.453865390 +0100
+@@ -32,7 +32,9 @@
+ #define OPTIONS_IMP_H
+
+ #include "ui_options.h"
++#ifndef Q_MOC_RUN
+ #include <libtorrent/ip_filter.hpp>
++#endif
+
+ // actions on double-click on torrents
+ enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};
+--- qbittorrent-3.1.11/src/properties/peeraddition.h~ 2014-10-22
21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/properties/peeraddition.h 2015-02-19
22:22:30.387197906 +0100
+@@ -36,7 +36,9 @@
+ #include <QMessageBox>
+ #include <QHostAddress>
+ #include "ui_peer.h"
++#ifndef Q_MOC_RUN
+ #include <libtorrent/session.hpp>
++#endif
+
+ #include <boost/version.hpp>
+ #if BOOST_VERSION < 103500
+--- qbittorrent-3.1.11/src/geoip/geoipmanager.h~ 2014-10-22
21:45:31.000000000 +0200
++++ qbittorrent-3.1.11/src/geoip/geoipmanager.h 2015-02-19
22:24:06.623863876 +0100
+@@ -31,7 +31,9 @@
+ #ifndef GEOIPMANAGER_H
+ #define GEOIPMANAGER_H
+
++#ifndef Q_MOC_RUN
+ #include <libtorrent/session.hpp>
++#endif
+ #include <QString>
+ #include <QIcon>
+
+--- qbittorrent-3.1.11/src/trackerlogin.h~ 2014-10-22 21:45:31.000000000
+0200
++++ qbittorrent-3.1.11/src/trackerlogin.h 2015-02-19 22:25:55.037196425
+0100
+@@ -33,7 +33,9 @@
+
+ #include <QDialog>
+ #include <QMessageBox>
++#ifndef Q_MOC_RUN
+ #include <libtorrent/session.hpp>
++#endif
+ #include "ui_login.h"
+ #include "qtorrenthandle.h"
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qbittorrent.git/commitdiff/a64a35a546b112cdbc30aa5d67cc7e1302adb2d8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
