Fix missing cast that is fatal with newer gcc.

4 files changed, 27 insertions, 9 deletions

diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index 43c96961ddfb..a3288da93ef2 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/d4x
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.20 2004/06/15 14:45:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.21 2004/06/16 15:31:00 azarah Exp $
+
+  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/d4x-2.5.0_rc4-fix-cast.patch, d4x-2.5.0_rc4.ebuild:
+  Fix missing cast that is fatal with newer gcc.
 
 *d4x-2.5.0_rc4 (04 Feb 2004)
 
diff --git a/net-misc/d4x/Manifest b/net-misc/d4x/Manifest
index 38b8aa8ed0ff..c70fc152c169 100644
--- a/net-misc/d4x/Manifest
+++ b/net-misc/d4x/Manifest
@@ -1,13 +1,14 @@
-MD5 f78b91c5597c5f55bf2df1904ff20a8f d4x-2.03.ebuild 1538
 MD5 969b0be703a62b909b28088d281dc6bd d4x-2.4.1-r1.ebuild 1991
+MD5 f78b91c5597c5f55bf2df1904ff20a8f d4x-2.03.ebuild 1538
+MD5 7031a12806590f84048a5a90a61f0aac ChangeLog 4116
+MD5 4d7b08ad79376f96dab14bac4cc22328 d4x-2.5.0_rc4.ebuild 1879
 MD5 a31b81ea1a06857f51facbd73549bb9b d4x-2.5.0_rc2.ebuild 1816
-MD5 c1a5c81ce79415e7d7f4c148307d08d3 ChangeLog 3954
-MD5 38f65422b4aa44ce7fe11eaaffc384e9 d4x-2.5.0_rc4.ebuild 1769
 MD5 5d41ee33c5ff557bad7627cbc67c3b6f metadata.xml 224
-MD5 5b49dbe10d588970e6f766cfdb310e67 files/d4x-2.5.0_rc2-gtk24.patch 279
-MD5 a9d346bf4f3d64d906935b663747e434 files/d4x-sndserv-bigendian.patch 502
-MD5 3e8783cc051415a9ee4f756fcc45c925 files/digest-d4x-2.4.1-r1 62
 MD5 07dde74dfe302bab95327f285a5a16ba files/d4x-2.4.1-fix-statusbar-crash.patch 772
 MD5 724445bfed12d4bafd7bb97eef1d669c files/digest-d4x-2.03 61
-MD5 fc389107a8b5d040a989fe1d220beb3e files/digest-d4x-2.5.0_rc2 65
 MD5 145551a0dbe79421f8b102a726996ea7 files/digest-d4x-2.5.0_rc4 65
+MD5 a9d346bf4f3d64d906935b663747e434 files/d4x-sndserv-bigendian.patch 502
+MD5 5b49dbe10d588970e6f766cfdb310e67 files/d4x-2.5.0_rc2-gtk24.patch 279
+MD5 7025e0ce352893c55b23ffeea8f87d1c files/d4x-2.5.0_rc4-fix-cast.patch 317
+MD5 3e8783cc051415a9ee4f756fcc45c925 files/digest-d4x-2.4.1-r1 62
+MD5 fc389107a8b5d040a989fe1d220beb3e files/digest-d4x-2.5.0_rc2 65
diff --git a/net-misc/d4x/d4x-2.5.0_rc4.ebuild b/net-misc/d4x/d4x-2.5.0_rc4.ebuild
index 14ee88ffa7a6..5e09432b9a64 100644
--- a/net-misc/d4x/d4x-2.5.0_rc4.ebuild
+++ b/net-misc/d4x/d4x-2.5.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0_rc4.ebuild,v 1.1 2004/06/15 14:42:36 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0_rc4.ebuild,v 1.2 2004/06/16 15:31:00 azarah Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -24,6 +24,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	# Newer gcc needs us to explicitly cast 'const gchar *' to 'gchar *'
+	epatch ${FILESDIR}/${P}-fix-cast.patch
+
 	# Use our own $CXXFLAGS
 	cd ${S}
 	cp configure configure.orig
diff --git a/net-misc/d4x/files/d4x-2.5.0_rc4-fix-cast.patch b/net-misc/d4x/files/d4x-2.5.0_rc4-fix-cast.patch
new file mode 100644
index 000000000000..9d04511f0cd0
--- /dev/null
+++ b/net-misc/d4x/files/d4x-2.5.0_rc4-fix-cast.patch
@@ -0,0 +1,10 @@
+--- d4x-2.5.0rc4/main/face/misc.cc.orig	2004-06-16 14:49:59.235168784 +0200
++++ d4x-2.5.0rc4/main/face/misc.cc	2004-06-16 14:55:39.809393632 +0200
+@@ -329,5 +329,6 @@
+ };
+ 
+ gchar *d4x_menu_translate_func(const gchar *label,gpointer data){
+-	return _(label);
++	gchar *retval = (gchar *)label;
++	return _(retval);
+ };