update to 3.1.12 [release 3.1.12-1mamba;Thu Feb 26 2015]

This commit is contained in:
Silvan Calarco 2024-01-05 16:59:29 +01:00
parent 2d3742cefa
commit b7a992f422
2 changed files with 98 additions and 15 deletions

View File

@ -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"

View File

@ -1,5 +1,5 @@
Name: qbittorrent Name: qbittorrent
Version: 3.1.9 Version: 3.1.12
Release: 1mamba Release: 1mamba
Summary: Free and reliable P2P Bittorrent client Summary: Free and reliable P2P Bittorrent client
Group: Graphical Desktop/Applications/Networking Group: Graphical Desktop/Applications/Networking
@ -11,29 +11,19 @@ Source: http://downloads.sourceforge.net/qbittorrent/qbittorrent-%{versio
Source1: qbittorrent-nox.README Source1: qbittorrent-nox.README
Patch0: qbittorrent-3.0.9-gcc-4.8.patch Patch0: qbittorrent-3.0.9-gcc-4.8.patch
Patch1: qbittorrent-3.1.8-libqt4-4.8.5.patch Patch1: qbittorrent-3.1.8-libqt4-4.8.5.patch
Patch2: qbittorrent-3.1.12-libboost-1.57.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libatk-devel
BuildRequires: libboost-devel BuildRequires: libboost-devel
BuildRequires: libcairo-devel
BuildRequires: libdbus-devel
BuildRequires: libdbus-glib-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel
BuildRequires: libgtk-devel
BuildRequires: libnotify-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libpango-devel
BuildRequires: libpng-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
BuildRequires: libqtsingleapplication-devel BuildRequires: libqtsingleapplication-devel
BuildRequires: libqtsinglecoreapplication-devel BuildRequires: libqtsinglecoreapplication-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libtorrent-rasterbar-devel BuildRequires: libtorrent-rasterbar-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRoot: %{_tmppath}/%{name}-%{version}-root 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 %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
cp -p %{S:1} doc/README cp -p %{S:1} doc/README
%build %build
@ -106,15 +97,20 @@ make install -C build-gui \
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/pixmaps/qbittorrent.png %{_datadir}/pixmaps/qbittorrent.png
%doc AUTHORS COPYING NEWS README TODO Changelog %doc AUTHORS COPYING
#NEWS TODO Changelog
%files nox %files nox
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/qbittorrent-nox %{_bindir}/qbittorrent-nox
%{_mandir}/man1/qbittorrent-nox.1* %{_mandir}/man1/qbittorrent-nox.1*
%doc AUTHORS COPYING doc/README %doc AUTHORS COPYING
#doc/README
%changelog %changelog
* Thu Feb 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.12-1mamba
- update to 3.1.12
* Sun Mar 02 2014 Automatic Build System <autodist@mambasoft.it> 3.1.9-1mamba * Sun Mar 02 2014 Automatic Build System <autodist@mambasoft.it> 3.1.9-1mamba
- automatic update by autodist - automatic update by autodist