Fix build problems with clang

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

4 files changed, 146 insertions, 24 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 0a967b465a3f..1c5144ca18d4 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.172 2012/03/08 09:48:21 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.173 2012/03/09 00:15:08 sochotnicky Exp $
+
+  09 Mar 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  rtorrent-0.9.0.ebuild, +files/rtorrent-0.9.0-clang.patch:
+  Fix build problems with clang
 
   08 Mar 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   rtorrent-0.9.0.ebuild:
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 8c70df94e080..54f20ebe59d7 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
 AUX rtorrent-0.8.6-canvas-fix.patch 11607 RMD160 01f3be5ecf0769a44e31f9852eb3da5454e85c75 SHA1 4d60d95845df05c9864ca50d3f84726d2b93ab14 SHA256 a843dcd8c3b7fe0179c24d53cb485d2f11156a189e58911bbd14e5e30db71925
 AUX rtorrent-0.8.6-ncurses.patch 572 RMD160 c0e390c444e50d69d8dbe4727c76b5962651a570 SHA1 2267dce2ddfb1ea865ba50c95e4a5beaf24da533 SHA256 4bcc6f33fad67d14f44cfdc63409fc94ef917dc120c46e60ce175d36af3fcb02
@@ -8,6 +5,7 @@ AUX rtorrent-0.8.7-canvas-fix.patch 10095 RMD160 67315e412a1d071c32366ff0920ae2f
 AUX rtorrent-0.8.9-canvas-fix.patch 9995 RMD160 e9d7c870b8a77e46fa8556544de6a5b39c3accb1 SHA1 952b4bb18e5001c8257a6dcecda66a5d0817d781 SHA256 f53eca85da4800f123f1f482dd49e07d40fcc4055e84f9450f3894cc51259415
 AUX rtorrent-0.8.9-ncurses.patch 618 RMD160 61969665a70c02d7a5e810c40c33d190191b0abf SHA1 cf9e67d7d6a17f22e9c081307e14dfe0bca6345e SHA256 67002221b79bb5e43e8ed05ae0ebb22130c10eaf5739acbb1fb424050f2e2a05
 AUX rtorrent-0.9.0-canvas-fix.patch 8483 RMD160 d5343f52e791d4ae1af5540c65ac6ea0cc0a7d1a SHA1 2e37f09ecced53683c7c1f6cf292aac6aa3de691 SHA256 400a25e462e19dc1785b24c9c4343b11de17900b1cd572047a82751a73da0e63
+AUX rtorrent-0.9.0-clang.patch 5834 RMD160 1cda73fbc814291e53b0c68f474b32ada2665fae SHA1 5a436c15965f4e6ea6621d7817647e605e806d17 SHA256 5ea0ce8640d6a0590d03fa43780255ff88eb255685c34063f5b895ecdb159df4
 AUX rtorrent-0.9.0-gold.patch 773 RMD160 99c5fcc9551374b21823d7639b8173b7940edc17 SHA1 8e01c946be798009939cadfd40266c08b7f53e03 SHA256 98de8de9c1537bd2b726416e3cc41b959de6f14be853f3c2574b100552d1c706
 AUX rtorrent-0.9.0-ncurses.patch 416 RMD160 002eab97d40734a65f9042eb3055255f674177eb SHA1 bb437cc90ed09e4e2226c9eeceb2c0a8133ecb4e SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
@@ -20,23 +18,6 @@ EBUILD rtorrent-0.8.6-r1.ebuild 1596 RMD160 c4558712e434a91bd49bb99049badd7e8c1e
 EBUILD rtorrent-0.8.6-r4.ebuild 1666 RMD160 15b8466b39eb46d3fedd8978cf8e5641219ba32c SHA1 b56cb4f72c7e1a3f790340dc62e8cd3d3d09acd8 SHA256 eb8746d33eeb701043483be7d6d0105870a416ee93172454bebb2a11b8a83b83
 EBUILD rtorrent-0.8.7-r4.ebuild 1789 RMD160 5285fa692756cad50bda9882873e1f4fcf45a92d SHA1 7e44800220f1f2d174859c2a5d74cede264a1e1e SHA256 d3fd7a7b3bb531e1f00539ad7a629d4444d5a082597a308b39cc4b0ab27d3522
 EBUILD rtorrent-0.8.9.ebuild 1828 RMD160 bffd5e1db1147315fe442bf554ff09d46c6546b8 SHA1 432ce0555ce50ad727fdb393971165a2ce7ee60a SHA256 90e97541e66bbdcd2b162e521fbbf686d8f47f8187bbba3cb3596c07480e1064
-EBUILD rtorrent-0.9.0.ebuild 1795 RMD160 25a6cad220f29a7bca9a7f20fd39954cc4fd862f SHA1 4b92b053d6b0aaeb7085066b6d74c857c60ec239 SHA256 2a94185d9daffbb5df0efc84fa85dfac86b11ac8f694e3a583ad4cdb2f90e2de
-MISC ChangeLog 25708 RMD160 b171fe61a660f5d05974ec2b723256ea1d0be3d9 SHA1 db4ec18c214d5ebbd4784b99b5fa6ea6ef5f2b86 SHA256 05f12c46541b3c92ca9ddf96087d93042f7e579d643e4ce0d818681f74550c33
+EBUILD rtorrent-0.9.0.ebuild 1834 RMD160 dea53ee19a43eb4664f7dafbbf987fc87d777da4 SHA1 7f71b8cf87d2ca9eabf76558fb1bc1c8019f8390 SHA256 5c0a04e9b263b53ed6700b804f0d4e4bffb34d47c4226c0ee5eb13f56744a263
+MISC ChangeLog 25862 RMD160 483c3aba6149db721254267c7f130e2409c9aa7d SHA1 b03e607d64b62c3262b75feae311d06eb1a4a0c7 SHA256 afeceeb5d71c3fa4c3e00d6b04e2866f8bab311887b4bb747cd668aac032a44b
 MISC metadata.xml 461 RMD160 20828b74a80b51c1df06f6dba3aa63fbe7eec437 SHA1 7d50936803d36c9e88d2030bcf6647d4cede9d09 SHA256 db7942b39f614d72ff07b2ca64acbddd975cc016761d0037eb9edf786a4b295d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJPWIByAAoJELy9dS57CHJBW5EP/3eBRyVJLjAO82CvEhS3QMoc
-mVRLd8pFU9fFlgfnKT5nAfGGsDNmf7T55oemu1lf6bZ8+aVv33gceLricButd721
-itPq0wknVLk4tVzKgXR2t+DpPee0WOzw9dWIZS9XO1FRihAD+CqfXK3PoDzcRTi3
-HdH4wnXvLcTA2LkyuaNCd7uPnqnR/NzfQfO8HF+bXzcMl34whWG27vgMNG6YNoJn
-W8VI0ZB+CDKBt4Bs28d40ZAovfqKrDaZA4yLH8l+uds+mp/lF6sYpfkBvYjkHjmW
-WGSlOYPbDZ01ur+l2yhd3hyM5dDykDK54h+tPoicVIzM1c5Q9wTuJUxDwf8HRG3o
-3KcM9dcnAHoZ0UiogRuttbF6dTujDYd46u6PIeT+T1BzcUIJnekoWLkC0NiZz8mw
-MZ7GjEifslzBAdV/Z4Qrw9B5EYxPPwJrKRxI35BR6r+bLuSAtqCHRkSfVsZ8K8e+
-sKTRa/LYxwXy58RgsZJkpkUWzYFDNex24l1EcEW9k8E4G3N5VvlFofBrnpBYEVxu
-fxbeJta9yUUTyDmIvZcqGCm2K1cz8ycxYliHXH+Hk8i9HxdY55TVBO9mQHR43sTE
-kdWFzdJLVMGpLeM8ag/mQHY2/DU6RcYxKzKwnJ6nB2tozEkQN1tdj/o2z2L/HOsN
-kRTEIH79F9cjabKnDB/d
-=gw4r
------END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch b/net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch
new file mode 100644
index 000000000000..e3bed62ea03b
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.0-clang.patch
@@ -0,0 +1,136 @@
+From e58f3975f128f68638843a11b40a239350bf88f4 Mon Sep 17 00:00:00 2001
+From: Jari Sundell <sundell.software@gmail.com>
+Date: Thu, 29 Dec 2011 18:58:12 +0900
+Subject: [PATCH] Fixed compiler issues with clang.
+
+---
+ src/command_download.cc         |    9 ++++-----
+ src/command_dynamic.cc          |    6 +++---
+ src/command_helpers.h           |   11 +++++++++--
+ src/display/window_file_list.cc |    2 +-
+ src/thread_base.h               |    4 +---
+ 5 files changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/src/command_download.cc b/src/command_download.cc
+index 30abb4d..bc58b9a 100644
+--- a/src/command_download.cc
++++ b/src/command_download.cc
+@@ -138,10 +138,9 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type&
+ 
+   switch (changeType) {
+   case 0:
+-    if (symlink(target.c_str(), link.c_str()) == -1)
++    // if (symlink(target.c_str(), link.c_str()) == -1)
+       //     control->core()->push_log("create_link failed: " + std::string(rak::error_number::current().c_str()));
+       //     control->core()->push_log("create_link failed: " + std::string(rak::error_number::current().c_str()) + " to " + target);
+-      ; // Disabled.
+     break;
+ 
+   case 1:
+@@ -150,9 +149,9 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type&
+     rak::error_number::clear_global();
+ 
+     if (!fileStat.update_link(link) || !fileStat.is_link() ||
+-        unlink(link.c_str()) == -1)
+-      ; //     control->core()->push_log("delete_link failed: " + std::string(rak::error_number::current().c_str()));
+-
++        unlink(link.c_str()) == -1) {
++      //     control->core()->push_log("delete_link failed: " + std::string(rak::error_number::current().c_str()));
++    }
+     break;
+   }
+   default:
+diff --git a/src/command_dynamic.cc b/src/command_dynamic.cc
+index 6e83454..013f855 100644
+--- a/src/command_dynamic.cc
++++ b/src/command_dynamic.cc
+@@ -156,7 +156,7 @@ system_method_insert_object(const torrent::Object::list_type& args, int flags) {
+       (flags & rpc::object_storage::mask_type) == rpc::object_storage::flag_multi_type) {
+ 
+     rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type>
+-      (create_new_key<0>(rawKey, ""),
++      (create_new_key(rawKey),
+        std::bind(&rpc::object_storage::call_function_str, control->object_storage(),
+                  rawKey, std::placeholders::_1, std::placeholders::_2),
+        &rpc::command_base_call<rpc::target_type>,
+@@ -164,7 +164,7 @@ system_method_insert_object(const torrent::Object::list_type& args, int flags) {
+ 
+   } else {
+     rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type>
+-      (create_new_key<0>(rawKey, ""),
++      (create_new_key(rawKey),
+        std::bind(&rpc::object_storage::get_str, control->object_storage(), rawKey),
+        &rpc::command_base_call<rpc::target_type>,
+        cmd_flags, NULL, NULL);
+@@ -354,7 +354,7 @@ system_method_redirect(const torrent::Object::list_type& args) {
+   std::string new_key  = torrent::object_create_string(args.front());
+   std::string dest_key = torrent::object_create_string(args.back());
+ 
+-  rpc::commands.create_redirect(create_new_key<0>(new_key, ""), create_new_key<0>(dest_key, ""),
++  rpc::commands.create_redirect(create_new_key(new_key), create_new_key(dest_key),
+                                 rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_delete_key | rpc::CommandMap::flag_modifiable);
+ 
+   return torrent::Object();
+diff --git a/src/command_helpers.h b/src/command_helpers.h
+index 8b290ce..b215ec2 100644
+--- a/src/command_helpers.h
++++ b/src/command_helpers.h
+@@ -152,11 +152,11 @@ void initialize_commands();
+   rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_tracker_target | rpc::CommandMap::flag_dont_delete);
+ 
+ #define CMD2_REDIRECT_GENERIC_STR(from_key, to_key)                     \
+-  rpc::commands.create_redirect(create_new_key<0>(from_key, ""), create_new_key<0>(to_key, ""), \
++  rpc::commands.create_redirect(create_new_key(from_key), create_new_key(to_key), \
+                                 rpc::CommandMap::flag_public_xmlrpc | rpc::CommandMap::flag_no_target | rpc::CommandMap::flag_delete_key);
+ 
+ #define CMD2_REDIRECT_GENERIC_STR_NO_EXPORT(from_key, to_key)                     \
+-  rpc::commands.create_redirect(create_new_key<0>(from_key, ""), create_new_key<0>(to_key, ""), \
++  rpc::commands.create_redirect(create_new_key(from_key), create_new_key(to_key), \
+                                 rpc::CommandMap::flag_no_target | rpc::CommandMap::flag_delete_key);
+ 
+ //
+@@ -205,4 +205,11 @@ create_new_key(const std::string& key, const char postfix[postfix_size]) {
+   return buffer;
+ }
+ 
++inline const char*
++create_new_key(const std::string& key) {
++  char *buffer = new char[key.size() + 1];
++  std::memcpy(buffer, key.c_str(), key.size() + 1);
++  return buffer;
++}
++
+ #endif
+diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc
+index 6a923dc..7c9f692 100644
+--- a/src/display/window_file_list.cc
++++ b/src/display/window_file_list.cc
+@@ -123,7 +123,7 @@ WindowFileList::redraw() {
+   if (fl->size_files() == 0 || m_canvas->height() < 2)
+     return;
+ 
+-  iterator entries[m_canvas->height() - 1];
++  std::vector<iterator> entries(m_canvas->height() - 1);
+ 
+   unsigned int last = 0;
+ 
+diff --git a/src/thread_base.h b/src/thread_base.h
+index 4cd38de..479e3cd 100644
+--- a/src/thread_base.h
++++ b/src/thread_base.h
+@@ -44,11 +44,9 @@
+ #include "rak/priority_queue_default.h"
+ #include "core/poll_manager.h"
+ 
+-struct thread_queue_hack;
+-
+ // Move this class to libtorrent.
+ 
+-struct thread_queue_hack;
++class thread_queue_hack;
+ 
+ class ThreadBase : public torrent::thread_base {
+ public:
+-- 
+1.7.3.4
+
diff --git a/net-p2p/rtorrent/rtorrent-0.9.0.ebuild b/net-p2p/rtorrent/rtorrent-0.9.0.ebuild
index 35e3a3f00828..97bab101dbcd 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.0.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.0.ebuild,v 1.3 2012/03/08 09:48:21 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.0.ebuild,v 1.4 2012/03/09 00:15:08 sochotnicky Exp $
 
 EAPI=2
 
@@ -30,6 +30,7 @@ src_prepare() {
 	# bug #358271
 	epatch "${FILESDIR}"/${P}-ncurses.patch
 	epatch "${FILESDIR}"/${P}-gold.patch
+	epatch "${FILESDIR}"/${P}-clang.patch
 	use color && EPATCH_OPTS="-p1" epatch "${FILESDIR}"/${P}-canvas-fix.patch
 }