Update patch with the one from Philipp in bug #212824.

(Portage version: 2.1.5_rc6)

2 files changed, 60 insertions, 39 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 1e702ead097c..463dc05cf328 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.112 2008/04/21 14:33:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.113 2008/04/27 12:54:14 flameeyes Exp $
+
+  27 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/libtorrent-0.11.9+gcc-4.3.patch:
+  Update patch with the one from Philipp in bug #212824.
 
   21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/libtorrent-0.11.9+gcc-4.3.patch, libtorrent-0.12.0.ebuild:
diff --git a/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch b/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
index d7343c81ab03..1090cf550149 100644
--- a/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
+++ b/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
@@ -1,15 +1,28 @@
---- libtorrent-0.11.9.orig/src/data/chunk.cc
-+++ libtorrent-0.11.9/src/data/chunk.cc
-@@ -38,6 +38,7 @@
+diff -Nurp libtorrent-0.12.0.old/rak/functional.h libtorrent-0.12.0/rak/functional.h
+--- libtorrent-0.12.0.old/rak/functional.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/rak/functional.h	2008-03-09 16:00:11.000000000 +0100
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
  
- #include <algorithm>
++#include <cstddef>
  #include <functional>
-+#include <cstring>
  
- #include "torrent/exceptions.h"
+ namespace rak {
+diff -Nurp libtorrent-0.12.0.old/src/data/chunk.cc libtorrent-0.12.0/src/data/chunk.cc
+--- libtorrent-0.12.0.old/src/data/chunk.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/data/chunk.cc	2008-03-09 16:00:11.000000000 +0100
+@@ -36,6 +36,7 @@
+ 
+ #include "config.h"
  
---- libtorrent-0.11.9.orig/src/data/chunk_list.h
-+++ libtorrent-0.11.9/src/data/chunk_list.h
++#include <cstring>
+ #include <algorithm>
+ #include <functional>
+ 
+diff -Nurp libtorrent-0.12.0.old/src/data/chunk_list.h libtorrent-0.12.0/src/data/chunk_list.h
+--- libtorrent-0.12.0.old/src/data/chunk_list.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/data/chunk_list.h	2008-03-09 16:00:11.000000000 +0100
 @@ -38,6 +38,7 @@
  #define LIBTORRENT_DATA_CHUNK_LIST_H
  
@@ -18,19 +31,32 @@
  #include <rak/error_number.h>
  #include <rak/functional.h>
  
---- libtorrent-0.11.9.orig/src/net/address_list.cc
-+++ libtorrent-0.11.9/src/net/address_list.cc
-@@ -38,6 +38,8 @@
+diff -Nurp libtorrent-0.12.0.old/src/net/address_list.cc libtorrent-0.12.0/src/net/address_list.cc
+--- libtorrent-0.12.0.old/src/net/address_list.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/net/address_list.cc	2008-03-09 16:00:11.000000000 +0100
+@@ -36,6 +36,8 @@
  
- #include <rak/functional.h>
+ #include "config.h"
  
 +#include <algorithm>
 +
+ #include <rak/functional.h>
+ 
  #include "download/download_info.h"  // for SocketAddressCompact
+diff -Nurp libtorrent-0.12.0.old/src/torrent/data/file_list_iterator.h libtorrent-0.12.0/src/torrent/data/file_list_iterator.h
+--- libtorrent-0.12.0.old/src/torrent/data/file_list_iterator.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/torrent/data/file_list_iterator.h	2008-03-09 16:00:11.000000000 +0100
+@@ -37,6 +37,7 @@
+ #ifndef LIBTORRENT_FILE_LIST_ITERATOR_H
+ #define LIBTORRENT_FILE_LIST_ITERATOR_H
  
- #include "address_list.h"
---- libtorrent-0.11.9.orig/src/torrent/exceptions.cc
-+++ libtorrent-0.11.9/src/torrent/exceptions.cc
++#include <cstdlib>
+ #include <torrent/common.h>
+ #include <torrent/data/file_list.h>
+ 
+diff -Nurp libtorrent-0.12.0.old/src/torrent/exceptions.cc libtorrent-0.12.0/src/torrent/exceptions.cc
+--- libtorrent-0.12.0.old/src/torrent/exceptions.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/torrent/exceptions.cc	2008-03-09 16:00:11.000000000 +0100
 @@ -37,6 +37,7 @@
  #include "config.h"
  
@@ -39,34 +65,25 @@
  
  #include "exceptions.h"
  
---- libtorrent-0.11.9.orig/src/torrent/data/file_list_iterator.h
-+++ libtorrent-0.11.9/src/torrent/data/file_list_iterator.h
-@@ -40,6 +40,8 @@
+diff -Nurp libtorrent-0.12.0.old/src/torrent/tracker_list.h libtorrent-0.12.0/src/torrent/tracker_list.h
+--- libtorrent-0.12.0.old/src/torrent/tracker_list.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/torrent/tracker_list.h	2008-03-09 16:01:01.000000000 +0100
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_TRACKER_LIST_H
+ 
+ #include <algorithm>
++#include <string>
+ #include <vector>
  #include <torrent/common.h>
- #include <torrent/data/file_list.h>
  
-+#include <cstdlib>
-+
- namespace torrent {
+diff -Nurp libtorrent-0.12.0.old/src/utils/diffie_hellman.cc libtorrent-0.12.0/src/utils/diffie_hellman.cc
+--- libtorrent-0.12.0.old/src/utils/diffie_hellman.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/utils/diffie_hellman.cc	2008-03-09 16:00:11.000000000 +0100
+@@ -36,6 +36,7 @@
  
- class File;
---- libtorrent-0.11.9.orig/src/utils/diffie_hellman.cc
-+++ libtorrent-0.11.9/src/utils/diffie_hellman.cc
-@@ -37,6 +37,7 @@
  #include "config.h"
  
- #include <string>
 +#include <cstring>
+ #include <string>
  
  #ifdef USE_OPENSSL
- #include <openssl/bn.h>
---- libtorrent-0.11.9.orig/rak/functional.h
-+++ libtorrent-0.11.9/rak/functional.h
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
- 
-+#include <cstdlib>
- #include <functional>
- 
- namespace rak {