rpms/rtorrent/devel rtorrent-gcc43.patch, NONE, 1.1 rtorrent-sigc.patch, NONE, 1.1 rtorrent.spec, 1.20, 1.21
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Sat Apr 5 14:27:22 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384
Modified Files:
rtorrent.spec
Added Files:
rtorrent-gcc43.patch rtorrent-sigc.patch
Log Message:
* Sat Apr 5 2008 Christopher Aillon <caillon at redhat.com> - 0.7.8-3
- Fix build against newer sigc++
- Fix build against GCC 4.3
rtorrent-gcc43.patch:
--- NEW FILE rtorrent-gcc43.patch ---
diff -up rtorrent-0.7.8/rak/functional.h.gcc43 rtorrent-0.7.8/rak/functional.h
--- rtorrent-0.7.8/rak/functional.h.gcc43 2008-04-05 10:13:51.000000000 -0400
+++ rtorrent-0.7.8/rak/functional.h 2008-04-05 10:14:06.000000000 -0400
@@ -37,6 +37,7 @@
#ifndef RAK_FUNCTIONAL_H
#define RAK_FUNCTIONAL_H
+#include <cstdlib>
#include <functional>
namespace rak {
diff -up rtorrent-0.7.8/src/command_ui.cc.gcc43 rtorrent-0.7.8/src/command_ui.cc
--- rtorrent-0.7.8/src/command_ui.cc.gcc43 2008-04-05 10:15:40.000000000 -0400
+++ rtorrent-0.7.8/src/command_ui.cc 2008-04-05 10:17:01.000000000 -0400
@@ -39,6 +39,7 @@
#include <rak/functional.h>
#include <rak/functional_fun.h>
#include <sigc++/adaptors/bind.h>
+#include <ctime>
#include "core/manager.h"
#include "core/view_manager.h"
diff -up rtorrent-0.7.8/src/display/text_element_value.cc.gcc43 rtorrent-0.7.8/src/display/text_element_value.cc
--- rtorrent-0.7.8/src/display/text_element_value.cc.gcc43 2008-04-05 10:08:57.000000000 -0400
+++ rtorrent-0.7.8/src/display/text_element_value.cc 2008-04-05 10:09:49.000000000 -0400
@@ -36,6 +36,8 @@
#include "config.h"
+#include <ctime>
+
#include "globals.h"
#include "text_element_value.h"
diff -up rtorrent-0.7.8/src/rpc/exec_file.cc.gcc43 rtorrent-0.7.8/src/rpc/exec_file.cc
--- rtorrent-0.7.8/src/rpc/exec_file.cc.gcc43 2008-04-05 10:10:42.000000000 -0400
+++ rtorrent-0.7.8/src/rpc/exec_file.cc 2008-04-05 10:10:57.000000000 -0400
@@ -36,7 +36,7 @@
#include "config.h"
-#include <string>
+#include <cstring>
#include <unistd.h>
#include <rak/path.h>
#include <sys/types.h>
diff -up rtorrent-0.7.8/src/rpc/parse.cc.gcc43 rtorrent-0.7.8/src/rpc/parse.cc
--- rtorrent-0.7.8/src/rpc/parse.cc.gcc43 2008-04-05 10:11:35.000000000 -0400
+++ rtorrent-0.7.8/src/rpc/parse.cc 2008-04-05 10:11:50.000000000 -0400
@@ -36,6 +36,7 @@
#include "config.h"
+#include <cstring>
#include <locale>
#include <rak/path.h>
#include <torrent/exceptions.h>
rtorrent-sigc.patch:
--- NEW FILE rtorrent-sigc.patch ---
diff -up rtorrent-0.7.8/src/core/http_queue.cc.gcc43 rtorrent-0.7.8/src/core/http_queue.cc
--- rtorrent-0.7.8/src/core/http_queue.cc.gcc43 2008-04-05 10:02:57.000000000 -0400
+++ rtorrent-0.7.8/src/core/http_queue.cc 2008-04-05 10:06:19.000000000 -0400
@@ -38,8 +38,8 @@
#include <memory>
#include <sstream>
-#include <sigc++/bind.h>
-#include <sigc++/hide.h>
+#include <sigc++/adaptors/bind.h>
+#include <sigc++/adaptors/hide.h>
#include <torrent/http.h>
#include "rak/functional.h"
diff -up rtorrent-0.7.8/src/option_parser.cc.gcc43 rtorrent-0.7.8/src/option_parser.cc
--- rtorrent-0.7.8/src/option_parser.cc.gcc43 2008-04-05 10:16:17.000000000 -0400
+++ rtorrent-0.7.8/src/option_parser.cc 2008-04-05 10:16:41.000000000 -0400
@@ -43,8 +43,8 @@
#include <getopt.h>
#include <stdexcept>
#include <unistd.h>
-#include <sigc++/bind.h>
-#include <sigc++/hide.h>
+#include <sigc++/adaptors/bind.h>
+#include <sigc++/adaptors/hide.h>
#include "option_parser.h"
diff -up rtorrent-0.7.8/src/ui/download_list.cc.gcc43 rtorrent-0.7.8/src/ui/download_list.cc
--- rtorrent-0.7.8/src/ui/download_list.cc.gcc43 2008-04-05 10:12:38.000000000 -0400
+++ rtorrent-0.7.8/src/ui/download_list.cc 2008-04-05 10:13:20.000000000 -0400
@@ -38,8 +38,8 @@
#include <rak/functional.h>
#include <rak/string_manip.h>
-#include <sigc++/bind.h>
-#include <sigc++/hide.h>
+#include <sigc++/adaptors/bind.h>
+#include <sigc++/adaptors/hide.h>
#include <torrent/exceptions.h>
#include <torrent/torrent.h>
diff -up rtorrent-0.7.8/src/command_ui.cc.gcc43 rtorrent-0.7.8/src/command_ui.cc
--- rtorrent-0.7.8/src/command_ui.cc.gcc43 2008-04-05 10:15:40.000000000 -0400
+++ rtorrent-0.7.8/src/command_ui.cc 2008-04-05 10:17:01.000000000 -0400
@@ -38,7 +38,7 @@
#include <rak/functional.h>
#include <rak/functional_fun.h>
-#include <sigc++/bind.h>
+#include <sigc++/adaptors/bind.h>
#include "core/manager.h"
#include "core/view_manager.h"
Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rtorrent.spec 18 Feb 2008 22:31:42 -0000 1.20
+++ rtorrent.spec 5 Apr 2008 14:26:41 -0000 1.21
@@ -2,7 +2,7 @@
License: GPL
Group: Applications/Internet
Version: 0.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: BitTorrent client based on libtorrent
URL: http://rtorrent.rakshasa.no/
Source0: http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -11,6 +11,9 @@
BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.11.4, curl-devel, ncurses-devel
Requires: libtorrent >= 0.11.8
+Patch1: %{name}-sigc.patch
+Patch2: %{name}-gcc43.patch
+
%description
A BitTorrent client using libtorrent, which on high-bandwidth connections is
able to seed at 3 times the speed of the official client. Using
@@ -20,6 +23,8 @@
%prep
%setup -q
+%patch1 -p1 -b .sigc
+%patch2 -p1 -b .gcc43
%build
# work around a bug thats triggered by gcc 4.1
@@ -44,6 +49,10 @@
%{_mandir}/man1/rtorrent*
%changelog
+* Sat Apr 5 2008 Christopher Aillon <caillon at redhat.com> - 0.7.8-3
+- Fix build against newer sigc++
+- Fix build against GCC 4.3
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.8-2
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list