Fix building w/ gcc-4.3 for bug #251449. Thanks to Gene Seto for the

patch.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 66 insertions, 6 deletions

diff --git a/net-irc/xchatosd/ChangeLog b/net-irc/xchatosd/ChangeLog
index c549ee378c95..668513c051b6 100644
--- a/net-irc/xchatosd/ChangeLog
+++ b/net-irc/xchatosd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchatosd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.21 2007/02/23 11:10:53 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.22 2009/02/12 05:17:54 dirtyepic Exp $
+
+  12 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/xchatosd-5.19-gcc43.patch, xchatosd-5.19.ebuild:
+  Fix building w/ gcc-4.3 for bug #251449. Thanks to Gene Seto for the
+  patch.
 
   23 Feb 2007; Raúl Porcel <armin76@gentoo.org> xchatosd-5.19.ebuild:
   Remove ROOT, bug 168039
diff --git a/net-irc/xchatosd/Manifest b/net-irc/xchatosd/Manifest
index ad5416b513a5..3fef041ba9c9 100644
--- a/net-irc/xchatosd/Manifest
+++ b/net-irc/xchatosd/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xchatosd-5.19-gcc4.patch 654 RMD160 c9eea64027c3d2e9a566c83a434891e6f90558ab SHA1 26ea37a28a8e7372832eaadff9b68546faa85b71 SHA256 bb0364dc85b3f58996f39fd0882756e431f403efc1c855f9380b6922b5201c7b
+AUX xchatosd-5.19-gcc43.patch 1114 RMD160 651f1cb6106db57c7350d23f7513d9bdf421f3a4 SHA1 5910385d88726190142ba3408622c16b194be868 SHA256 5b9e497d06607624a190f2f31dc7acc00eaffdd0d5749fbe2bbd5306e074155f
 DIST xchatosd-5.19.tar.gz 10778 RMD160 dc5c1aa226144cf77c1039d7f86112cdd3e3cb76 SHA1 5472365872f47fd6c9fd46dea33461c9d1a88816 SHA256 664c769a01fa52226b8a8dd45ee28f26caf8dc4d4ecf88f5d66623f701480f6f
-EBUILD xchatosd-5.19.ebuild 1165 RMD160 beb105d36719d72b33b29990430da8e909663e1a SHA1 a5f2a15455b717ec177a1c5b469129498ca04684 SHA256 6869f0e75f3977cfdc562f83dd7627ba71fcbe29b44a52213f4ad498cd01e1f7
-MISC ChangeLog 2913 RMD160 447463137b4b6279e11684ead0183a5f63eb6aa1 SHA1 26dcd97e2b1048dfc4e3cbbeea068eb48a7a0826 SHA256 7daea837160db6c670d96019d44a0bf66ec543bf4656e336ea2e7bd5f13dcfc0
+EBUILD xchatosd-5.19.ebuild 1206 RMD160 4ea0c68f9b2f4965aa49509c0b787f8f34be84b4 SHA1 7cab76eac0184154e49b37fc06e16f0ed10b20c8 SHA256 aee8199d1698fa879597059a51c64a29dbcec5bfc5ca3bfc52c52c76f68ba672
+MISC ChangeLog 3102 RMD160 87d92855d313c33b753421901efd0a7250ac8253 SHA1 5c2b457ce9b3da848315777b693a30eee874249c SHA256 58a50de96141dc6dd2c989cea2af781f992fab90c0efa18b77be686a01666986
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmTsVMACgkQiqiDRvmkBmJo8ACfWikehGscnrZ0NXDthJw+2k7P
+NtQAoLIeR/NBDbFeKtcdtbdMoNvmhxU9
+=QFSQ
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchatosd/files/xchatosd-5.19-gcc43.patch b/net-irc/xchatosd/files/xchatosd-5.19-gcc43.patch
new file mode 100644
index 000000000000..35185c6967a9
--- /dev/null
+++ b/net-irc/xchatosd/files/xchatosd-5.19-gcc43.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/show_bug.cgi?id=251449
+
+--- xchatosd-5.19-orig/xchatosd_conf.cpp
++++ xchatosd-5.19/xchatosd_conf.cpp
+@@ -1,4 +1,6 @@
+ #include "xchatosd_conf.h"
++#include <cstdlib>
++#include <cstring>
+ 
+ XOsdConf::XOsdConf()
+ {
+--- xchatosd-5.19-orig/xchatosd.cpp
++++ xchatosd-5.19/xchatosd.cpp
+@@ -3,8 +3,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <xosd.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <cstring>
+ #include <langinfo.h>
+ #include "xchatosd.h"
+ #include "xchatosd_lang.h"
+@@ -22,7 +21,7 @@ using namespace std;
+ static xchat_plugin *ph;
+ static XOsd *osd = NULL;
+ static XOsdConf config;
+-static char *codepage;
++static char const *codepage;
+ #ifdef ICONV_LIB
+ static iconv_t iconv_desc = (iconv_t) (-1);
+ #endif
+@@ -445,8 +444,8 @@ static int osd_notify_cb(char *word[], c
+ 
+ extern "C" { int
+ xchat_plugin_init(xchat_plugin * plugin_handle,
+-		  char **plugin_name,
+-		  char **plugin_desc, char **plugin_version, char *arg)
++		  char const **plugin_name,
++		  char const **plugin_desc, char const **plugin_version, char *arg)
+ {
+ 	ph = plugin_handle;
+ 	XOSDconfRead();
diff --git a/net-irc/xchatosd/xchatosd-5.19.ebuild b/net-irc/xchatosd/xchatosd-5.19.ebuild
index 3ca2e771c7de..71a3476d1584 100644
--- a/net-irc/xchatosd/xchatosd-5.19.ebuild
+++ b/net-irc/xchatosd/xchatosd-5.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.19.ebuild,v 1.6 2007/02/23 11:10:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.19.ebuild,v 1.7 2009/02/12 05:17:54 dirtyepic Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -24,6 +24,7 @@ src_unpack() {
 	einfo "Updating xchat-plugin.h from /usr/include/xchat/xchat-plugin.h"
 	cp -f /usr/include/xchat/xchat-plugin.h "${S}"/xchat-plugin.h
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {