libtorrent: update to 0.12.3

4 files changed, 5 insertions, 115 deletions

diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index 1ade5e8d7f..3209eee9b4 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,12 +1,12 @@
            SPELL=libtorrent
-         VERSION=0.12.2
+         VERSION=0.12.3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
         WEB_SITE=http://libtorrent.rakshasa.no
          ENTERED=20050117
       LICENSE[0]=GPL
-     SOURCE_HASH=sha512:bb13ac3ffc072cc9329100d077b392ea86dae7835d1a60055da490dfcf6235ab2ef19009d8ae2d64c499052ca65957e68e0cb59a327b5e31e12c8edebecda567
+     SOURCE_HASH=sha512:2c51247308317f4ea498c8da5bd4c07ed9f52bc9b38ada5908905bf4fced593d13287be40c703441d746b84c5db6adab0321475a04a9c1a2348bba34aff39640
         KEYWORDS="bittorrent ftp libs"
            SHORT='LibTorrent is a BitTorrent library written in C++ for *nix.'
 cat << EOF
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index dd6d1a09e2..c71f3e7883 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2008-09-15 Mathieu Lonjaret <lejatorn@sourcemage.org>
+	* DETAILS, PRE_BUILD: update to 0.12.3, patch not needed anymore
+
 2008-05-10 Mathieu Lonjaret <lejatorn@sourcemage.org>
 	* DETAILS: corrected mistake (BUILD_API=2)
 
diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
index 302a7234eb..ea304d2d3a 100755
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -1,5 +1,3 @@
 default_pre_build                          &&
 cd ${SOURCE_DIRECTORY}                     &&
-# fix problems on amd64 with libtool versions (bug #13943)
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch  &&
 ./autogen.sh
diff --git a/ftp-libs/libtorrent/gcc43.patch b/ftp-libs/libtorrent/gcc43.patch
deleted file mode 100644
index 7d26e29fd1..0000000000
--- a/ftp-libs/libtorrent/gcc43.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# From http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
-#
-[Libtorrent-devel] fix building with gcc 4.3 and above
-Serge Belyshev belyshev at depni.sinp.msu.ru
-Fri Feb 29 07:30:00 UTC 2008
-
-    * Previous message: [Libtorrent-devel] Total incoming incorrect
-    * Next message: [Libtorrent-devel] fix building rtorrent HEAD without xmlrpc
-    * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
-
-In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
-do not build anymore. Fixed by the following patches, for libtorrent:
-
-Index: libtorrent-0.12.0/rak/functional.h
-===================================================================
---- libtorrent-0.12.0.orig/rak/functional.h
-+++ libtorrent-0.12.0/rak/functional.h
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
- 
-+#include <stddef.h>
- #include <functional>
- 
- namespace rak {
-Index: libtorrent-0.12.0/src/data/chunk.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/data/chunk.cc
-+++ libtorrent-0.12.0/src/data/chunk.cc
-@@ -38,6 +38,7 @@
- 
- #include <algorithm>
- #include <functional>
-+#include <cstring>
- 
- #include "torrent/exceptions.h"
- 
-Index: libtorrent-0.12.0/src/data/chunk_list.h
-===================================================================
---- libtorrent-0.12.0.orig/src/data/chunk_list.h
-+++ libtorrent-0.12.0/src/data/chunk_list.h
-@@ -38,6 +38,7 @@
- #define LIBTORRENT_DATA_CHUNK_LIST_H
- 
- #include <vector>
-+#include <string>
- #include <rak/error_number.h>
- #include <rak/functional.h>
- 
-Index: libtorrent-0.12.0/src/net/address_list.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/net/address_list.cc
-+++ libtorrent-0.12.0/src/net/address_list.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <rak/functional.h>
-+#include <algorithm>
- 
- #include "download/download_info.h"  // for SocketAddressCompact
- 
-Index: libtorrent-0.12.0/src/torrent/data/file_list.h
-===================================================================
---- libtorrent-0.12.0.orig/src/torrent/data/file_list.h
-+++ libtorrent-0.12.0/src/torrent/data/file_list.h
-@@ -38,6 +38,7 @@
- #define LIBTORRENT_FILE_LIST_H
- 
- #include <vector>
-+#include <cstdlib>
- #include <torrent/common.h>
- #include <torrent/bitfield.h>
- #include <torrent/path.h>
-Index: libtorrent-0.12.0/src/torrent/exceptions.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/torrent/exceptions.cc
-+++ libtorrent-0.12.0/src/torrent/exceptions.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <cerrno>
-+#include <cstring>
- 
- #include "exceptions.h"
- 
-Index: libtorrent-0.12.0/src/torrent/tracker_list.h
-===================================================================
---- libtorrent-0.12.0.orig/src/torrent/tracker_list.h
-+++ libtorrent-0.12.0/src/torrent/tracker_list.h
-@@ -40,6 +40,7 @@
- #include <algorithm>
- #include <vector>
- #include <torrent/common.h>
-+#include <string>
- 
- namespace torrent {
- 
-Index: libtorrent-0.12.0/src/utils/diffie_hellman.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/utils/diffie_hellman.cc
-+++ libtorrent-0.12.0/src/utils/diffie_hellman.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <string>
-+#include <cstring>
- 
- #ifdef USE_OPENSSL
- #include <openssl/bn.h>
-