diff --git a/qbittorrent-3.1.12-libboost-1.57.patch b/qbittorrent-3.1.12-libboost-1.57.patch new file mode 100644 index 0000000..88d0ec4 --- /dev/null +++ b/qbittorrent-3.1.12-libboost-1.57.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 + #include + ++#ifndef Q_MOC_RUN + #include + #include + #include ++#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 + #include + ++#ifndef Q_MOC_RUN + #include + #include ++#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 + #include + ++#ifndef Q_MOC_RUN + #include ++#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 ++#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 + #include + #include "ui_peer.h" ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #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 ++#endif + #include + #include + +--- 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 + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include "ui_login.h" + #include "qtorrenthandle.h" + diff --git a/qbittorrent.spec b/qbittorrent.spec index 209087a..c23a032 100644 --- a/qbittorrent.spec +++ b/qbittorrent.spec @@ -1,5 +1,5 @@ Name: qbittorrent -Version: 3.1.9 +Version: 3.1.12 Release: 1mamba Summary: Free and reliable P2P Bittorrent client Group: Graphical Desktop/Applications/Networking @@ -11,29 +11,19 @@ Source: http://downloads.sourceforge.net/qbittorrent/qbittorrent-%{versio Source1: qbittorrent-nox.README Patch0: qbittorrent-3.0.9-gcc-4.8.patch Patch1: qbittorrent-3.1.8-libqt4-4.8.5.patch +Patch2: qbittorrent-3.1.12-libboost-1.57.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libatk-devel BuildRequires: libboost-devel -BuildRequires: libcairo-devel -BuildRequires: libdbus-devel -BuildRequires: libdbus-glib-devel -BuildRequires: libfontconfig-devel -BuildRequires: libfreetype-devel BuildRequires: libgcc -BuildRequires: libgdk-pixbuf-devel -BuildRequires: libglib-devel -BuildRequires: libgtk-devel -BuildRequires: libnotify-devel BuildRequires: libopenssl-devel -BuildRequires: libpango-devel -BuildRequires: libpng-devel BuildRequires: libqt4-devel BuildRequires: libqtsingleapplication-devel BuildRequires: libqtsinglecoreapplication-devel BuildRequires: libstdc++6-devel BuildRequires: libtorrent-rasterbar-devel +BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -53,6 +43,7 @@ A Headless Bittorrent Client with a feature rich Web UI allowing users to contro %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 cp -p %{S:1} doc/README %build @@ -106,15 +97,20 @@ make install -C build-gui \ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/pixmaps/qbittorrent.png -%doc AUTHORS COPYING NEWS README TODO Changelog +%doc AUTHORS COPYING +#NEWS TODO Changelog %files nox %defattr(-,root,root,-) %{_bindir}/qbittorrent-nox %{_mandir}/man1/qbittorrent-nox.1* -%doc AUTHORS COPYING doc/README +%doc AUTHORS COPYING +#doc/README %changelog +* Thu Feb 26 2015 Silvan Calarco 3.1.12-1mamba +- update to 3.1.12 + * Sun Mar 02 2014 Automatic Build System 3.1.9-1mamba - automatic update by autodist