gcc2 compilation fix thanks to Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in bug #48672.

4 files changed, 308 insertions, 6 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 6af944b25c7a..500621d983ab 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2004/04/13 18:44:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.23 2004/04/22 17:01:58 eradicator Exp $
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  easytag-0.31_pre2-r2.ebuild, files/easytag-0.30.2-gcc2.patch:
+  gcc2 compilation fix thanks to Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in
+  bug #48672.
 
 *easytag-0.31_pre2-r2 (13 Apr 2004)
 
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index b1c7efa54e81..2610792e7e48 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,9 +1,10 @@
-MD5 f6e9a01630c6ca34e3d75d057b26d59e easytag-0.31_pre2-r2.ebuild 1829
+MD5 be788633d67209bef46c6117793fc81e easytag-0.31_pre2-r2.ebuild 1876
 MD5 4b3530d67c2f286baea4cf70a36e57f3 easytag-0.30d.ebuild 1598
 MD5 bb581b933b5ec0e4238fedc55168fedc easytag-0.30c.ebuild 1480
-MD5 bb2f568d39247340c579a6aa12ce9704 ChangeLog 4406
+MD5 5601616b962dfaff2a655b53fa89d970 ChangeLog 4626
 MD5 b8ca490eb4cbf24dca497d295311e4ac metadata.xml 317
 MD5 dfb4c4e7aee1e1bb0711c1b60f6178fb files/digest-easytag-0.31_pre2-r2 142
 MD5 e032b0a7fe4897ec0e7dad2ef9002639 files/digest-easytag-0.30c 278
 MD5 0dc3e112a9f2e10861c7608a584f9423 files/digest-easytag-0.30d 349
 MD5 a767d8be7a9435927acebb4b1ca9df4c files/easytag-0.30.2-fix-configure.patch 648
+MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
diff --git a/media-sound/easytag/easytag-0.31_pre2-r2.ebuild b/media-sound/easytag/easytag-0.31_pre2-r2.ebuild
index 1150569da00d..f94345f3cf4a 100644
--- a/media-sound/easytag/easytag-0.31_pre2-r2.ebuild
+++ b/media-sound/easytag/easytag-0.31_pre2-r2.ebuild
@@ -1,6 +1,8 @@
 # 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-r2.ebuild,v 1.1 2004/04/13 18:44:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31_pre2-r2.ebuild,v 1.2 2004/04/22 17:01:58 eradicator Exp $
+
+inherit eutils
 
 IUSE="nls oggvorbis flac gtk2"
 
@@ -31,8 +33,11 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
-	if [ `use gtk2` ] ; then
+
+	if use gtk2; then
 		epatch ${DISTDIR}/${DSD_PATCH}
+		epatch ${FILESDIR}/${MY_P}-gcc2.patch
+
 		export WANT_AUTOMAKE=1.7
 		export WANT_AUTOCONF=2.5
 		ebegin "Remaking configure script (be patient)"
@@ -66,7 +71,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ `use gtk2` ] ; then
+	if use gtk2; then
 		einfo "You merged with the \"gtk2\" USE flag set"
 		ewarn "GTK+ 2 support for this program is still experimental"
 		ewarn "Please report bugs to http://bugs.gentoo.org"
diff --git a/media-sound/easytag/files/easytag-0.30.2-gcc2.patch b/media-sound/easytag/files/easytag-0.30.2-gcc2.patch
new file mode 100644
index 000000000000..330743a94c45
--- /dev/null
+++ b/media-sound/easytag/files/easytag-0.30.2-gcc2.patch
@@ -0,0 +1,291 @@
+diff -Naur easytag-0.30.2.orig/src/browser.c easytag-0.30.2/src/browser.c
+--- easytag-0.30.2.orig/src/browser.c	2004-04-22 06:48:52.000000000 -0400
++++ easytag-0.30.2/src/browser.c	2004-04-22 06:56:26.000000000 -0400
+@@ -1131,14 +1131,14 @@
+  */
+ void Browser_List_Remove_File (ET_File *searchETFile)
+ {
+-    if (searchETFile == NULL)
+-		  return;
+-
+ 	 gint row;
+ 	 GtkTreePath *currentPath = NULL;
+ 	 GtkTreeIter currentIter;
+ 	 ET_File *currentETFile;
+ 
++    if (searchETFile == NULL)
++		  return;
++
+ 	 // Go through the file list until it is found
+ 	 for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL); row++) {
+ 		  if (row == 0)
+@@ -1162,13 +1162,13 @@
+  */
+ void Browser_List_Select_File_By_Etfile (ET_File *searchETFile, gboolean select_it)
+ {
+-    if (searchETFile == NULL)
+-		  return;
+-
+ 	 gint row;
+ 	 GtkTreePath *currentPath = NULL;
+ 	 GtkTreeIter currentIter;
+ 	 ET_File *currentETFile;
++    
++    if (searchETFile == NULL)
++		  return;
+ 
+ 	 // Go through the file list until it is found
+ 	 for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL); row++) {
+@@ -1227,13 +1227,13 @@
+  */
+ void Browser_List_Unselect_File_By_Etfile(ET_File *searchETFile)
+ {
+-    if (searchETFile == NULL)
+-		  return;
+-
+ 	 gint row;
+ 	 GtkTreePath *currentPath = NULL;
+ 	 GtkTreeIter currentIter;
+ 	 ET_File *currentETFile;
++    
++    if (searchETFile == NULL)
++		  return;
+ 
+ 	 // Go through the file list until it is found
+ 	 for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL); row++) {
+@@ -1603,6 +1603,7 @@
+     GtkTreePath *currentPath2 = NULL;
+     gint row;
+     gint row2;
++    GList *list = NULL;
+ 
+     // Save the current displayed data
+     ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+@@ -1637,7 +1638,6 @@
+             if (!AlbumList)
+                 continue;
+ 
+-            GList *list = NULL;
+             while (AlbumList && !list) // list!=NULL => We have found the BrowserArtistList row...
+             {
+                 list = g_list_find((GList *)AlbumList->data,etfile);
+diff -Naur easytag-0.30.2.orig/src/cddb.c easytag-0.30.2/src/cddb.c
+--- easytag-0.30.2.orig/src/cddb.c	2004-04-22 06:48:52.000000000 -0400
++++ easytag-0.30.2/src/cddb.c	2004-04-22 06:48:38.000000000 -0400
+@@ -822,6 +822,7 @@
+ 	 GtkTreePath *rowpath;
+ 	 gboolean result;
+ 	 gboolean itemselected = FALSE;
++	 GtkTreeIter itercopy;
+ 
+     if (!entry || !button)
+         return;
+@@ -853,7 +854,7 @@
+             result = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(CddbAlbumListModel), &iter);
+         }
+ 
+-		  GtkTreeIter itercopy = iter;
++		  itercopy = iter;
+ 
+ 		  /* If list entries follow the previously selected item, loop through them looking for a match */
+ 		  if(result == TRUE) {
+@@ -2084,6 +2085,7 @@
+ 	 GtkTreePath *currentPath = NULL;
+ 	 GtkTreeIter currentIter;
+ 	 GList *selectedrows = NULL;
++	CddbTrackAlbum *cddbtrackalbum = NULL;
+ 
+     if (!ETCore->ETFileDisplayedList) return FALSE;
+ 
+@@ -2164,7 +2166,6 @@
+ 		  }
+ 
+         gtk_tree_model_get_iter(GTK_TREE_MODEL(CddbTrackListModel), &currentIter, currentPath);
+-		  CddbTrackAlbum *cddbtrackalbum = NULL;
+ 		  gtk_tree_model_get(GTK_TREE_MODEL(CddbTrackListModel), &currentIter, CDDB_TRACK_LIST_DATA, &cddbtrackalbum, -1);
+ 		  
+         if (cddbtrackalbum && selected_etfilelist)
+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-22 06:48:52.000000000 -0400
++++ easytag-0.30.2/src/easytag.c	2004-04-22 07:18:41.000000000 -0400
+@@ -1072,6 +1072,7 @@
+ {
+     gint progress_bar_index;
+     GList *etfilelist = NULL;
++    double fraction;
+ 
+     if (!ETCore->ETFileDisplayedList) return;
+ 
+@@ -1098,7 +1099,7 @@
+         Scan_Select_Mode_And_Run_Scanner((ET_File *)etfilelist->data);
+         etfilelist = g_list_next(etfilelist);
+         progress_bar_index++;
+-        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())
+@@ -1126,6 +1127,7 @@
+     GList *etfilelist = NULL;
+     File_Tag *FileTag;
+     gint progress_bar_index;
++    double fraction;
+ 
+     if (!ETCore->ETFileDisplayedList) return;
+ 
+@@ -1143,7 +1145,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())
+@@ -1315,7 +1317,8 @@
+     ET_File   *etfile_save_position = NULL;
+     File_Tag  *FileTag;
+     File_Name *FileNameNew;
+-
++    double fraction;
++    gchar progress_bar_text[30];
+ 
+     if (!ETCore) return FALSE;
+ 
+@@ -1341,7 +1344,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);
+ 
+@@ -1370,7 +1372,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);
+@@ -1451,7 +1453,8 @@
+     gint   nb_files_to_delete;
+     gint   nb_files_deleted = 0;
+     gchar *msg;
+-
++    double fraction;
++    gchar progress_bar_text[30];
+ 
+     if (!ETCore->ETFileDisplayedList) return FALSE;
+ 
+@@ -1464,7 +1467,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_delete);
+     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text);
+ 
+@@ -1485,7 +1487,7 @@
+         ETFile = (ET_File *)etfilelist->data;
+         ET_Display_File_Data_To_UI(ETFile);
+         Browser_List_Select_File_By_Etfile(ETFile,FALSE);
+-        double fraction = (++progress_bar_index) / (double) nb_files_to_delete;
++        fraction = (++progress_bar_index) / (double) nb_files_to_delete;
+         gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction);
+         g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_delete);
+         gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text);
+@@ -1950,8 +1952,11 @@
+ {
+     DIR   *dir;
+     gchar *msg, *tmp;
++    gchar progress_bar_text[30];
++    double fraction;
+     guint  nbrfile = 0;
+     GList *FileList = NULL;
++    gint progress_bar_index = 0;
+ 
+     ReadingDirectory = TRUE;    /* A flag to avoid to start an other reading */
+ 
+@@ -1972,8 +1977,6 @@
+     gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(TBShowBrowserButton),FALSE);
+     Browser_Display_Tree_Or_Artist_Album_List(); // To show the corresponding lists...
+ 
+-    gint progress_bar_index = 0;
+-
+     /* Placed only here, to empty the previous list of files */
+     if (path == NULL) return;
+     if ((dir=opendir(path)) == NULL)
+@@ -2005,7 +2008,6 @@
+     // Search the supported files
+     FileList = Read_Directory_Recursively(FileList,path,BROWSE_SUBDIR);
+     nbrfile = g_list_length(FileList);
+-    gchar progress_bar_text[30];
+     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), 0.0);
+     g_snprintf(progress_bar_text, 30, "%d/%d", 0, nbrfile);
+     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text);
+@@ -2026,7 +2028,7 @@
+         g_free(filename);
+ 
+         // Update the progress bar
+-        double fraction = (++progress_bar_index) / (double) nbrfile;
++        fraction = (++progress_bar_index) / (double) nbrfile;
+         gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction);
+         g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nbrfile);
+         gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text);
+diff -Naur easytag-0.30.2.orig/src/misc.c easytag-0.30.2/src/misc.c
+--- easytag-0.30.2.orig/src/misc.c	2004-04-22 06:48:52.000000000 -0400
++++ easytag-0.30.2/src/misc.c	2004-04-22 07:35:05.000000000 -0400
+@@ -734,13 +734,12 @@
+     GtkTreeIter iter;
+     GtkTreeSelection *selection;
+     GtkTreeModel *artistListModel;
++    GList *AlbumList, *etfilelist;
++    GList *concatenated_list = NULL;
+     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserArtistList));
+     if(!gtk_tree_selection_get_selected(selection, &artistListModel, &iter))
+         return;
+ 
+-    GList *AlbumList, *etfilelist;
+-    GList *concatenated_list = NULL;
+-
+     gtk_tree_model_get(artistListModel, &iter, colnum, &AlbumList, -1);
+ 
+     while (AlbumList)
+@@ -1678,8 +1677,9 @@
+     gchar *temp = NULL;
+     gchar *filename;
+     gchar *filename_base;
+-    gchar *string_to_search2;
+     gint resultCount = 0;
++    gchar *title2, *artist2, *album2, *year2, *track2, *track_total2, *genre2, *comment2, *string_to_search2;
++
+ 
+     if (!SearchStringEntry || !SearchInFilename || !SearchInTag || !SearchResultList)
+         return;
+@@ -1734,15 +1734,15 @@
+             File_Tag *FileTag   = (File_Tag *)ETFile->FileTag->data;
+ 
+             // Duplicate and UTF8-convert the strings
+-            gchar *title2       = g_strdup(FileTag->title);       TRANSLATE_USER(title2,  temp);
+-            gchar *artist2      = g_strdup(FileTag->artist);      TRANSLATE_USER(artist2, temp);
+-            gchar *album2       = g_strdup(FileTag->album);       TRANSLATE_USER(album2, temp);
+-            gchar *year2        = g_strdup(FileTag->year);        TRANSLATE_USER(year2, temp);
+-            gchar *track2       = g_strdup(FileTag->track);       TRANSLATE_USER(track2, temp);
+-            gchar *track_total2 = g_strdup(FileTag->track_total); TRANSLATE_USER(track_total2, temp);
+-            gchar *genre2       = g_strdup(FileTag->genre);       TRANSLATE_USER(genre2, temp);
+-            gchar *comment2     = g_strdup(FileTag->comment);     TRANSLATE_USER(comment2, temp);
+-            gchar *string_to_search2 = g_strdup(string_to_search);TRANSLATE_USER(string_to_search2, temp);
++            title2       = g_strdup(FileTag->title);       TRANSLATE_USER(title2,  temp);
++            artist2      = g_strdup(FileTag->artist);      TRANSLATE_USER(artist2, temp);
++            album2       = g_strdup(FileTag->album);       TRANSLATE_USER(album2, temp);
++            year2        = g_strdup(FileTag->year);        TRANSLATE_USER(year2, temp);
++            track2       = g_strdup(FileTag->track);       TRANSLATE_USER(track2, temp);
++            track_total2 = g_strdup(FileTag->track_total); TRANSLATE_USER(track_total2, temp);
++            genre2       = g_strdup(FileTag->genre);       TRANSLATE_USER(genre2, temp);
++            comment2     = g_strdup(FileTag->comment);     TRANSLATE_USER(comment2, temp);
++            string_to_search2 = g_strdup(string_to_search);TRANSLATE_USER(string_to_search2, temp);
+ 
+             // To search without case sensivity
+             if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive)))