Patch to fix compilation with gcc3.4. Closes #72673.

4 files changed, 128 insertions, 9 deletions

diff --git a/app-cdr/simplecdrx/ChangeLog b/app-cdr/simplecdrx/ChangeLog
index fb1032bf1bef..047149bab1f0 100644
--- a/app-cdr/simplecdrx/ChangeLog
+++ b/app-cdr/simplecdrx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/simplecdrx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/ChangeLog,v 1.21 2004/10/05 11:22:56 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/ChangeLog,v 1.22 2004/11/28 12:20:51 ticho Exp $
+
+  28 Nov 2004; Andrej Kacian <ticho@gentoo.org> +files/1.3.2-gcc34.patch,
+  simplecdrx-1.3.2.ebuild:
+  Fix compiling with gcc 3.4 with a patch.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   simplecdrx-1.3.1.ebuild, simplecdrx-1.3.2.ebuild:
diff --git a/app-cdr/simplecdrx/Manifest b/app-cdr/simplecdrx/Manifest
index d60287e4c33b..70f4246475df 100644
--- a/app-cdr/simplecdrx/Manifest
+++ b/app-cdr/simplecdrx/Manifest
@@ -1,12 +1,23 @@
-MD5 5404d3fab7de2c7830427c394f52642a ChangeLog 2951
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 5e27cf83d75e590015fc998ca8f2dc0c simplecdrx-1.2.1.ebuild 1209
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 07733d5a9b2cb9800c874d6cff7d3587 simplecdrx-1.2.2.ebuild 1210
+MD5 6bbaae22f4982eb13af85ed0056a5ce8 ChangeLog 3093
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 666f9441af2e5439f206d91e2caf8a4b simplecdrx-1.3.2.ebuild 1195
 MD5 86087c36ecc80a4755836561d633b2fc simplecdrx-1.3.1.ebuild 1203
-MD5 c4f61a3bc28d407884407eb1dbc1e24f simplecdrx-1.3.2.ebuild 1102
-MD5 f2762ab596bf0fe451bc1e62cf45efcb files/digest-simplecdrx-1.2.1 69
-MD5 79258e2575b29b60451e9674678855f1 files/digest-simplecdrx-1.2.2 69
+MD5 5e27cf83d75e590015fc998ca8f2dc0c simplecdrx-1.2.1.ebuild 1209
 MD5 59d18c2a93cf208a577bcac4b15270ed files/digest-simplecdrx-1.3.1 69
-MD5 45d9721fbc3ab559de8dbe31f84b3fbc files/digest-simplecdrx-1.3.2 69
+MD5 f2762ab596bf0fe451bc1e62cf45efcb files/digest-simplecdrx-1.2.1 69
 MD5 efa005520ba1caa37badc23436faa715 files/simplecdrx.desktop 163
+MD5 79258e2575b29b60451e9674678855f1 files/digest-simplecdrx-1.2.2 69
 MD5 e853699018cfb6e086534751519dfccb files/simplecdrx.png 2533
+MD5 45d9721fbc3ab559de8dbe31f84b3fbc files/digest-simplecdrx-1.3.2 69
+MD5 52c8536196bf51985a2fde08c7921e0a files/1.3.2-gcc34.patch 2843
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBqcKr10xuJSrg3/sRAgL5AJ9rfWQF1TOtn3Fft+vJwkiv0XVDgwCeM7gP
+GSQMjRkrEtqvnTLVNO9NAbk=
+=smcG
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/simplecdrx/files/1.3.2-gcc34.patch b/app-cdr/simplecdrx/files/1.3.2-gcc34.patch
new file mode 100644
index 000000000000..30da20a62f65
--- /dev/null
+++ b/app-cdr/simplecdrx/files/1.3.2-gcc34.patch
@@ -0,0 +1,95 @@
+diff -bur simplecdrx-1.3.2-orig/src/callbacks.c simplecdrx-1.3.2-new/src/callbacks.c
+--- simplecdrx-1.3.2-orig/src/callbacks.c	2003-12-26 06:04:49.000000000 +0100
++++ simplecdrx-1.3.2-new/src/callbacks.c	2004-11-28 13:04:18.000000000 +0100
+@@ -689,14 +689,14 @@
+ {
+   string filename_, time_total;
+   gchar *temp[2];
+-  char *temp_;
++  gchar *temp_;
+   if (r == -1)
+ 	  return;
+   if (tracks == 1)
+     return;
+   gtk_clist_get_text (GTK_CLIST (get_widget (main_win, "audio_list")), r, 0,
+ 		      &temp[0]);
+-  (gchar *) temp_ = temp[0];
++  temp_ = temp[0];
+   filename_ = temp_;
+ 
+   if (int (filename_.find (".mp3")) != -1
+@@ -946,7 +946,7 @@
+ on_delete_file_clicked (GtkButton * button, gpointer user_data)
+ {
+   gchar *temp_file[2];
+-  char *temp_ = NULL;
++  gchar *temp_ = NULL;
+   string tmp_file, tmp_dir, tmp;
+   int i;
+   if (total_members_file == -1)
+@@ -954,7 +954,7 @@
+ // Initializing localized lists 
+   gtk_clist_get_text (GTK_CLIST (get_widget (main_win, "data_master_list")),
+ 		      r1, 0, &temp_file[0]);
+-  (gchar *) temp_ = temp_file[0];
++  temp_ = temp_file[0];
+   
+   tmp_file = temp_;
+   tmp_dir = current_dir;
+diff -bur simplecdrx-1.3.2-orig/src/datacdops.cpp simplecdrx-1.3.2-new/src/datacdops.cpp
+--- simplecdrx-1.3.2-orig/src/datacdops.cpp	2003-12-26 06:04:49.000000000 +0100
++++ simplecdrx-1.3.2-new/src/datacdops.cpp	2004-11-28 13:06:47.000000000 +0100
+@@ -430,7 +430,7 @@
+ refresh_list()
+ {
+   gchar *temp[2];
+-  char *temp_;
++  gchar *temp_;
+   string tmp, tmp_curr, last_dir;
+   int i = 0;
+ 	int ii = 0;
+@@ -443,7 +443,7 @@
+       gtk_clist_get_text (GTK_CLIST
+ 			  (get_widget (main_win, "dir_master_list")), r, 0,
+ 			  &temp[0]);
+-      (gchar *) temp_ = temp[0];
++      temp_ = temp[0];
+       tmp = temp_;
+       if (tmp != "/" && tmp != "..")
+ 	tmp = current_dir + tmp + "/";
+@@ -778,7 +778,7 @@
+       int count = 1, cont;
+       gchar *temp[2];
+       gboolean overbrn;
+-      char *temp_;
++      gchar *temp_;
+       bool overburn;
+       string tmp, dirname = convert.randName ();
+       dirname = setupData1.tempdiraudio + "/" + dirname;
+@@ -798,7 +798,7 @@
+ 	  r = count - 1;
+ 	  gtk_clist_get_text (GTK_CLIST (get_widget (main_win, "audio_list")),
+ 			      r, 0, &temp[0]);
+-	  (gchar *) temp_ = temp[0];
++	  temp_ = temp[0];
+ 	  tmp = temp_;
+ 	  cont =
+ 	    master_aud.convertTracklist (count, tracks, tmp, setupData1,
+@@ -927,7 +927,7 @@
+ void remove_dir()
+ {  
+ 	gchar *temp_dir[2];
+-  char *temp__;
++  gchar *temp__;
+   string tmp_file, tmp_dir, tmp;
+   int i;
+   if (total_members_dir == -1)
+@@ -935,7 +935,7 @@
+ // Initializing localized lists and clearing file list
+   gtk_clist_get_text (GTK_CLIST (get_widget (main_win, "dir_master_list")),
+ 		      rowtemp, 0, &temp_dir[0]);
+-  (gchar *) temp__ = temp_dir[0];
++  temp__ = temp_dir[0];
+ 
+   tmp_dir = temp__;
+   if (tmp_dir == "/")
diff --git a/app-cdr/simplecdrx/simplecdrx-1.3.2.ebuild b/app-cdr/simplecdrx/simplecdrx-1.3.2.ebuild
index 882bcf16eed3..380f7e6f3fb7 100644
--- a/app-cdr/simplecdrx/simplecdrx-1.3.2.ebuild
+++ b/app-cdr/simplecdrx/simplecdrx-1.3.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-1.3.2.ebuild,v 1.9 2004/10/05 11:22:56 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-1.3.2.ebuild,v 1.10 2004/11/28 12:20:51 ticho Exp $
+
+inherit eutils
 
 DESCRIPTION="CD ripping/mastering"
 HOMEPAGE="http://ogre.rocky-road.net/cdr.shtml"
@@ -25,6 +27,13 @@ DEPEND="media-sound/madplay
 	dev-libs/glib
 	media-libs/libao"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+}
+
 src_compile() {
 	sed -i -e 's:/usr/local/share:/usr/share:g' src/main.c.orig
 	econf || die "econf failed"