Yet another gcc2 fix closing bug #49427. Thanks again Tristan.

3 files changed, 73 insertions, 2 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 9079485b20b8..d5d2939ddb69 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/easytag
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.24 2004/04/27 18:38:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.25 2004/04/30 01:36:27 eradicator Exp $
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  easytag-0.31_pre2-r3.ebuild, files/easytag-0.31_pre2-gcc2.patch:
+  Yet another gcc2 fix closing bug #49427.  Thanks again Tristan.
 
 *easytag-0.31_pre2-r3 (27 Apr 2004)
 
diff --git a/media-sound/easytag/easytag-0.31_pre2-r3.ebuild b/media-sound/easytag/easytag-0.31_pre2-r3.ebuild
index 5e992b60289a..3651a76a3a7a 100644
--- a/media-sound/easytag/easytag-0.31_pre2-r3.ebuild
+++ b/media-sound/easytag/easytag-0.31_pre2-r3.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/media-sound/easytag/easytag-0.31_pre2-r3.ebuild,v 1.1 2004/04/27 18:38:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31_pre2-r3.ebuild,v 1.2 2004/04/30 01:36:27 eradicator Exp $
 
 inherit eutils
 
@@ -36,6 +36,7 @@ src_unpack() {
 
 	if use gtk2; then
 		epatch ${DISTDIR}/${DSD_PATCH}
+		epatch ${FILESDIR}/${P}-gcc2.patch
 
 		export WANT_AUTOMAKE=1.7
 		export WANT_AUTOCONF=2.5
diff --git a/media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch b/media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch
new file mode 100644
index 000000000000..36b3fdfa3f7e
--- /dev/null
+++ b/media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch
@@ -0,0 +1,66 @@
+diff -Naur easytag-0.30.2.orig/src/easytag.c easytag-0.30.2/src/easytag.c
+--- easytag-0.30.2.orig/src/easytag.c	2004-04-29 07:13:46.000000000 -0400
++++ easytag-0.30.2/src/easytag.c	2004-04-29 07:15:50.000000000 -0400
+@@ -1133,6 +1133,7 @@
+     GList *etfilelist = NULL;
+     File_Tag *FileTag;
+     gint progress_bar_index;
++    double fraction;
+ 
+     if (!ETCore->ETFileDisplayedList) return;
+ 
+@@ -1150,7 +1151,7 @@
+         FileTag = ET_File_Tag_Item_New();
+         ET_Manage_Changes_Of_File_Data(etfilelist->data,NULL,FileTag);
+         etfilelist = g_list_next(etfilelist);
+-        double fraction = (++progress_bar_index) / (double) ETCore->ETFileSelectionList_Length;
++        fraction = (++progress_bar_index) / (double) ETCore->ETFileSelectionList_Length;
+         gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction);
+         /* Needed to refresh status bar */
+         while (gtk_events_pending())
+@@ -1322,7 +1323,8 @@
+     ET_File   *etfile_save_position = NULL;
+     File_Tag  *FileTag;
+     File_Name *FileNameNew;
+-
++    gchar progress_bar_text[30];
++    double fraction;
+ 
+     if (!ETCore) return FALSE;
+ 
+@@ -1348,7 +1350,6 @@
+     /* Initialize status bar */
+     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar),0);
+     progress_bar_index = 0;
+-    gchar progress_bar_text[30];
+     g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_save);
+     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text);
+ 
+@@ -1377,7 +1378,7 @@
+             ET_Display_File_Data_To_UI((ET_File *)etfilelist_tmp->data);
+             Browser_List_Select_File_By_Etfile((ET_File *)etfilelist_tmp->data,FALSE);
+ 
+-            double fraction = (++progress_bar_index) / (double) nb_files_to_save;
++            fraction = (++progress_bar_index) / (double) nb_files_to_save;
+             gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction);
+             g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_save);
+             gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text);
+diff -Naur easytag-0.30.2.orig/src/et_core.c easytag-0.30.2/src/et_core.c
+--- easytag-0.30.2.orig/src/et_core.c	2004-04-29 07:13:46.000000000 -0400
++++ easytag-0.30.2/src/et_core.c	2004-04-29 07:14:38.000000000 -0400
+@@ -2336,13 +2336,13 @@
+ gboolean ET_Display_File_Info_To_UI(ET_File_Info *ETFileInfo)
+ {
+ 
+-    g_print("ET_Display_File_Infotoui\n");
+-
+     gchar *text;
+     gchar *time  = NULL;
+     gchar *time1 = NULL;
+     gchar *size  = NULL;
+     gchar *size1 = NULL;
++    
++    g_print("ET_Display_File_Infotoui\n");
+ 
+     /* MPEG, Layer versions */
+     text = g_strdup_printf("%d, Layer %d",ETFileInfo->version,ETFileInfo->layer);