diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-03-05 22:11:46 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-03-05 22:11:46 +0000 |
| commit | 32ceef7c610965159d07fe1262df07b8b6aeb7be (patch) | |
| tree | 820bb9697fd6d4ea695482cbab67f50b05eb0f8d | |
| parent | Stable for HPPA (bug #261108). (diff) | |
| download | gentoo-2-32ceef7c610965159d07fe1262df07b8b6aeb7be.tar.gz gentoo-2-32ceef7c610965159d07fe1262df07b8b6aeb7be.tar.bz2 gentoo-2-32ceef7c610965159d07fe1262df07b8b6aeb7be.zip | |
Fix dos line-endings in patch. Bug 261253. Thanks to Aelia <diego.abelenda@gmail.com> for reporting.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
| -rw-r--r-- | net-libs/libtorrent/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch | 98 |
2 files changed, 55 insertions, 50 deletions
diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog index dcf85551fd08..b9c887dd9b02 100644 --- a/net-libs/libtorrent/ChangeLog +++ b/net-libs/libtorrent/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/libtorrent # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.136 2009/03/04 14:44:59 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.137 2009/03/05 22:11:45 loki_val Exp $ + + 05 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> + files/libtorrent-0.12.4-gcc44.patch: + Fix dos line-endings in patch. Bug 261253. Thanks to Aelia + <diego.abelenda@gmail.com> for reporting. 04 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> +files/libtorrent-0.12.4-gcc44.patch, libtorrent-0.12.4.ebuild: diff --git a/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch b/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch index 150e1b1f7ab4..a7cbe32ec62d 100644 --- a/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch +++ b/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch @@ -1,49 +1,49 @@ -diff -Nurp libtorrent-0.12.4.old/src/torrent/poll_epoll.cc libtorrent-0.12.4/src/torrent/poll_epoll.cc
---- libtorrent-0.12.4.old/src/torrent/poll_epoll.cc 2008-10-28 06:49:47.000000000 -0500
-+++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-02-04 09:45:22.000000000 -0600
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <cerrno>
-+#include <cstdio>
- #include <cstring>
-
- #include <unistd.h>
-
-
-diff -Nurp libtorrent-0.12.4.old/src/protocol/extensions.cc libtorrent-0.12.4/src/protocol/extensions.cc
---- libtorrent-0.12.4.old/src/protocol/extensions.cc 2008-08-26 15:15:15.000000000 -0500
-+++ libtorrent-0.12.4/src/protocol/extensions.cc 2009-02-04 09:47:07.000000000 -0600
-@@ -36,6 +36,7 @@
-
- #include "config.h"
-
-+#include <cstdio>
- #include <limits>
- #include <sstream>
-
-diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_dht.cc libtorrent-0.12.4/src/tracker/tracker_dht.cc
---- libtorrent-0.12.4.old/src/tracker/tracker_dht.cc 2008-08-26 15:18:34.000000000 -0500
-+++ libtorrent-0.12.4/src/tracker/tracker_dht.cc 2009-02-04 09:48:49.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <sstream>
-
- #include "dht/dht_router.h"
-
-diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_udp.cc libtorrent-0.12.4/src/tracker/tracker_udp.cc
---- libtorrent-0.12.4.old/src/tracker/tracker_udp.cc 2008-05-07 07:19:13.000000000 -0500
-+++ libtorrent-0.12.4/src/tracker/tracker_udp.cc 2009-02-04 09:49:24.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <sigc++/adaptors/bind.h>
- #include <torrent/connection_manager.h>
-
+diff -Nurp libtorrent-0.12.4.old/src/torrent/poll_epoll.cc libtorrent-0.12.4/src/torrent/poll_epoll.cc +--- libtorrent-0.12.4.old/src/torrent/poll_epoll.cc 2008-10-28 06:49:47.000000000 -0500 ++++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-02-04 09:45:22.000000000 -0600 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include <cerrno> ++#include <cstdio> + #include <cstring> + + #include <unistd.h> + + +diff -Nurp libtorrent-0.12.4.old/src/protocol/extensions.cc libtorrent-0.12.4/src/protocol/extensions.cc +--- libtorrent-0.12.4.old/src/protocol/extensions.cc 2008-08-26 15:15:15.000000000 -0500 ++++ libtorrent-0.12.4/src/protocol/extensions.cc 2009-02-04 09:47:07.000000000 -0600 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include <cstdio> + #include <limits> + #include <sstream> + +diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_dht.cc libtorrent-0.12.4/src/tracker/tracker_dht.cc +--- libtorrent-0.12.4.old/src/tracker/tracker_dht.cc 2008-08-26 15:18:34.000000000 -0500 ++++ libtorrent-0.12.4/src/tracker/tracker_dht.cc 2009-02-04 09:48:49.000000000 -0600 +@@ -36,6 +36,8 @@ + + #include "config.h" + ++#include <cstdio> ++ + #include <sstream> + + #include "dht/dht_router.h" + +diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_udp.cc libtorrent-0.12.4/src/tracker/tracker_udp.cc +--- libtorrent-0.12.4.old/src/tracker/tracker_udp.cc 2008-05-07 07:19:13.000000000 -0500 ++++ libtorrent-0.12.4/src/tracker/tracker_udp.cc 2009-02-04 09:49:24.000000000 -0600 +@@ -36,6 +36,8 @@ + + #include "config.h" + ++#include <cstdio> ++ + #include <sigc++/adaptors/bind.h> + #include <torrent/connection_manager.h> + |