Fix compilation with gcc 4.6.0

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 47 insertions, 17 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 1ac8aa6b842c..695b3f0d0f47 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.156 2011/04/13 19:40:46 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.157 2011/04/13 21:30:46 sochotnicky Exp $
+
+  13 Apr 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  libtorrent-0.12.7.ebuild, +files/libtorrent-0.12.7-gcc-4.6.0.patch:
+  Fix compilation with gcc 4.6.0
 
   13 Apr 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   libtorrent-0.12.7.ebuild, +files/libtorrent-0.12.7-test.patch:
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 68b0ec4f8901..528ed298d1e9 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -3,29 +3,30 @@ Hash: SHA256
 
 AUX download_constructor.diff 636 RMD160 0738998c97044f86ab9edc9fc61f87fe63c84d6c SHA1 304a5bc521cb910f9a7783d453f1e4a129f8e019 SHA256 86316ea03ade9ee427176a4c3a15e1b8c1373f89a99d7506fb0595870e02f461
 AUX libtorrent-0.12.6-gcc44.patch 536 RMD160 0dfa71e21cbc407d1bd0e2c1804873616f3f9f7b SHA1 fc7ed2fb4bf6420bd483cb1b62f22760f7630509 SHA256 c8fb8857bc57f6d6a9ff62d77c1e267fff3a8d905f0c7e0f930127dd64723725
+AUX libtorrent-0.12.7-gcc-4.6.0.patch 539 RMD160 6dc3f864ea00a5cb66473033b8c864088ee5e063 SHA1 da261fcc22b5781737aa9ccd3c0d4151ca6546ce SHA256 75194a41677fddcf715c70f31786d78cb1287171e9c372f653fa945f32ac354c
 AUX libtorrent-0.12.7-test.patch 480 RMD160 428aa22761f476a70cf3c8bfc2623658a3e14fd1 SHA1 c7d71988770c872aeed57e3a9514aaf3e73b7f82 SHA256 a2af3ee1a2c359196603efbffb11acebcaf9e67513888422ce2fbea7eadab52d
 DIST libtorrent-0.12.5.tar.gz 587228 RMD160 645ae77a23c77c1d2134431b182cb206ab254259 SHA1 05a60581c6b1a94e2a07d1a07e47b8c60d2e237c SHA256 e963f70cfd395520176c163e665e2284b98614701e716e76585c4faa54629dc1
 DIST libtorrent-0.12.6.tar.gz 594113 RMD160 62f0c9737d4ca9621c42d673ea997f9d36875530 SHA1 bf7082f98bd6281493cba94a456697fb88c2c21b SHA256 7b02f33164966a05261e83bad76eef537198fefe76eaf57dfd64bb27c7d77129
 DIST libtorrent-0.12.7.tar.gz 632060 RMD160 13c66bb2ea50289219a58a4831c4b93b5c775197 SHA1 8f00bbac7796230085c90cd15946374d07843c43 SHA256 96f59ec9593cd77ef9bad78cadef9ce6f1040243cccf1108aa7844e58d632a97
 EBUILD libtorrent-0.12.5.ebuild 1210 RMD160 bf0ebf7a4108206436657c4d303c1c9cad690377 SHA1 d3ebae9622f81edbc824aac58da6604741646f6a SHA256 5fa3a9aba82cfcc0f9bb20cd1ffb6b079e82a1334835bec4f03622b033eab928
 EBUILD libtorrent-0.12.6.ebuild 1335 RMD160 faf34138c62b1ae591f95b743e210b2184ea0c66 SHA1 1d181d2ca7ae7aa7acdf377ff2c98a3b8368a019 SHA256 4bf43e5bbae4b2e03de0ad4cd0cfbc8d7c969cd7c4e19d44a46f443d3615bf1d
-EBUILD libtorrent-0.12.7.ebuild 1439 RMD160 a6991a3c82578c98385664b5e00906b3e993512f SHA1 c651825a28dc7003810ca6f3e964ac40ca74390e SHA256 80acf02b82ebe92285fc9aa205e45a8f35fafebb1cf9783f13c09c59a7545b94
-MISC ChangeLog 23455 RMD160 52cc66b521ab95706610c84e4ffbc0b7a8a9986d SHA1 a49197b7431fe4ee7320bec740ca36602d1f544c SHA256 cb791b9d53b128ab64644b8a3c64705b7ee8284fcf876cf74a1f1b05a2146bf2
+EBUILD libtorrent-0.12.7.ebuild 1482 RMD160 1d9b5b87a8dbf599834fe901c9dc066a69c70085 SHA1 aea1848ad055a4b03201bb5c45eec990630ec632 SHA256 e6b147c103caf5f34836dc3fe26777636f23d3edf60481935ea3553f41379ee3
+MISC ChangeLog 23620 RMD160 185c7185dbb717fd0dbe6bfc9c0bc9d32b0b0349 SHA1 87913b8410bc981271bce790c3b257f991d80794 SHA256 5a570e9a2e6c1938c7e20e84ff8e12852de62220d92272fc09de4553eaa96011
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNpfxPAAoJELy9dS57CHJBl30QAJ8ICf6GxrAQa6Zu+EXxv3vr
-bZT4Pq9mpafYGs7ExyJJ22CqwjstETK8wOOz3vpxHuQud7HRK2E+6THOQKMRX0vw
-U9zCxDhN16coiBfLg+ajvghbnOLFJyVID6bc8GNSKhij3KfFLH0va4U6S7ztccTq
-leWFGtDMFR3lZCtvKiZ+FzRi3IIUG0r3ZXZ7kqMO953zbRdVKonhbtTZNPCxYTb7
-gcbEjoZYO6Su2x8BMBvhM6KVKXDGtcHOjMHee9DOFAHuHgi2hfJmOZSu/pY/nqYg
-Xm3AQd+Kw6qlc1wS9SezZzaIFzaw73bTqPxwC7XWyvRzPKOcKhNpiR1XOv7o38li
-N+xq4OmbA5rlZ4h+ww0YTluR5p5q5eHpM/elTrC721bP0MSnqpE4jvEKVMc+vTJN
-k2tzURxjl0CmAzy7M8sKryb4ISXG1kAWkRt6JOdUdupX65C9vKqjKz77UY8ccAWN
-UDfd+NgNtQZ8fj3ccpuvBlbzX5Z/wNy3eXeVzj8R2WT8KoeF3UmTNdzLrTztB2kX
-Jq4euhf8ijttJDWy+uizSQMcqH+LRmUFGGegXhJGLE2kI+yGbbTDsOpfNXuKRxyj
-AQR9ctq4nBWb5y/Wn25aF1GsnWHVaUIkjkkyFvu6FO8cF6Par7SgE3V+lJWFvdx+
-RkrN03wWBpLlhWwGwUJa
-=FgUH
+iQIcBAEBCAAGBQJNphYWAAoJELy9dS57CHJB5foQAL7ZcO/3F3sQQYcsCBG1hsQu
+uZDUcYoi2lqeBnaiIkMm0sRVJSffXqV9q/3HVYvCltsEX5Ha9XedeBG7rg1uWc68
+vk3BvU/h1ud/41qmhRld3SuRrvJAmr5+fJbfzFCR8j4UpL+LVvrhmXFMkQVcE6m9
+lE5EArrvFklFWqAHr/pOgfnuW2Kw7eguZeCKgghgdKFFdMQvlGXKO7uHrlmoZ3hw
+eW8Ob8SGSrnk1xSz4qJI7QrSaOIebfSD+jOu/wAFGeG4xGjM7ZJMJFVJUAblfpFX
+uBKKUq2eWDSPurT5KAuymFAkux9x4YsiYUoGqrqqqBf2L8ytOolwgAj18XT+l12U
+q2SCGaBHgFhZJ5EJNwJvJwN27Qiqc+VjbJrPPrlxYIIJKbTLjLppMP2NoLepbf8l
+z17PeDsyWV2ob8QSf27fG9qR2oIejYNPbPiGRPmXjV/DIDmV7ysYaaNoBFLTSEQx
+GECCSJZ3KBpWdn8WIdqQKQXJTa1m+kM4YxrgmQvlXw5P9wnSTwfGYLpXxWaF5YRb
+iS6Js8r0+nBkLi3pFZorVs+WdM4Wn7XpvMmWmyj0hKUQNkj1n2Ae+GKTP12C3CjL
+zec6oV2wf8LHARtp5Ov7kW5i8kWWU9Ybsy0xK/NPZUfriMI+K6Ubxw02SxvtrY1y
+6cDrX1b07KTh3SEF6U1c
+=kibm
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.7-gcc-4.6.0.patch b/net-libs/libtorrent/files/libtorrent-0.12.7-gcc-4.6.0.patch
new file mode 100644
index 000000000000..c998c6441157
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.12.7-gcc-4.6.0.patch
@@ -0,0 +1,24 @@
+diff --git a/src/data/memory_chunk.h b/src/data/memory_chunk.h
+index af71842..64d535e 100644
+--- a/src/data/memory_chunk.h
++++ b/src/data/memory_chunk.h
+@@ -40,6 +40,7 @@
+ #include <algorithm>
+ #include <inttypes.h>
+ #include <sys/mman.h>
++#include <cstddef>
+ 
+ namespace torrent {
+ 
+diff --git a/src/torrent/common.h b/src/torrent/common.h
+index 4ed250f..b7d7b7b 100644
+--- a/src/torrent/common.h
++++ b/src/torrent/common.h
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_COMMON_H
+ 
+ #include <inttypes.h>
++#include <cstddef>
+ 
+ struct sockaddr;
+ 
diff --git a/net-libs/libtorrent/libtorrent-0.12.7.ebuild b/net-libs/libtorrent/libtorrent-0.12.7.ebuild
index b55a918139cd..44f9157dd37a 100644
--- a/net-libs/libtorrent/libtorrent-0.12.7.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.7.ebuild,v 1.2 2011/04/13 19:40:46 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.7.ebuild,v 1.3 2011/04/13 21:30:46 sochotnicky Exp $
 
 EAPI=2
 inherit eutils libtool toolchain-funcs
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.12.6-gcc44.patch
 	epatch "${FILESDIR}"/${P}-test.patch
+	epatch "${FILESDIR}"/${P}-gcc-4.6.0.patch
 	epatch "${FILESDIR}"/download_constructor.diff
 	elibtoolize
 }