rpms/easytag/devel easytag-1.0-gcc4.patch, NONE, 1.1 easytag.spec, 1.8, 1.9

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28263

Modified Files:
	easytag.spec 
Added Files:
	easytag-1.0-gcc4.patch 
Log Message:
GCC4 fix from Michael Schwendt.


easytag-1.0-gcc4.patch:

--- NEW FILE easytag-1.0-gcc4.patch ---
diff -Nur easytag-1.0-orig/src/et_core.c easytag-1.0/src/et_core.c
--- easytag-1.0-orig/src/et_core.c	2004-09-22 19:10:51.000000000 +0200
+++ easytag-1.0/src/et_core.c	2005-04-06 17:31:29.000000000 +0200
@@ -601,8 +601,8 @@
                         // The "AlbumList" item was found!
                         // Add the ETFile to this AlbumList item
                         //g_print(">>>  add to etfile list (%s)\n",g_basename(((File_Name *)ETFile->FileNameCur->data)->value));
-                        (GList *)AlbumList->data = g_list_append((GList *)AlbumList->data,ETFile);
-                        (GList *)AlbumList->data = g_list_sort((GList *)AlbumList->data,(GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
+                        AlbumList->data = g_list_append((GList *)AlbumList->data,ETFile);
+                        AlbumList->data = g_list_sort((GList *)AlbumList->data,(GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
                         return TRUE;
                     }
                     AlbumList = AlbumList->next;
@@ -610,8 +610,8 @@
                 // The "AlbumList" item was NOT found! => Add a new "AlbumList" item (+...) item to the "ArtistList" list
                 etfilelist = g_list_append(NULL,ETFile);
                 //g_print(">>>  add new album (%s)\n",g_basename(((File_Name *)ETFile->FileNameCur->data)->value));
-                (GList *)ArtistList->data = g_list_append((GList *)ArtistList->data,etfilelist);
-                (GList *)ArtistList->data = g_list_sort((GList *)ArtistList->data,(GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
+                ArtistList->data = g_list_append((GList *)ArtistList->data,etfilelist);
+                ArtistList->data = g_list_sort((GList *)ArtistList->data,(GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
                 return TRUE;
             }
             ArtistList = ArtistList->next;
@@ -746,13 +746,13 @@
                     etfilelist = g_list_remove(etfilelist,ETFile);
                     if (etfilelist) // Delete from AlbumList
                     {
-                        (GList *)AlbumList->data = g_list_first(etfilelist);
+                        AlbumList->data = g_list_first(etfilelist);
                     }else
                     {
                         AlbumList = g_list_remove(AlbumList,AlbumList->data);
                         if (AlbumList) // Delete from ArtistList
                         {
-                            (GList *)ArtistList->data = g_list_first(AlbumList);
+                            ArtistList->data = g_list_first(AlbumList);
                         }else
                         {
                             ETCore->ETArtistAlbumFileList = g_list_remove(ArtistList,ArtistList->data); // Delete from the main list


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- easytag.spec	30 Mar 2005 12:24:10 -0000	1.8
+++ easytag.spec	7 Apr 2005 19:19:07 -0000	1.9
@@ -1,11 +1,12 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
 Version: 1.0
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Multimedia
 URL: http://easytag.sourceforge.net/
 Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2
+Patch: easytag-1.0-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel >= 1.2.7, id3lib-devel >= 3.7.12
 BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .gcc4
 
 
 %build
@@ -45,6 +47,9 @@
 
 
 %changelog
+* Thu Apr  7 2005 Matthias Saou <http://freshrpms.net/> 1.0-4
+- Patch to fix gcc4 build issues (#112759 - Michael Schwendt).
+
 * Wed Mar 30 2005 Matthias Saou <http://freshrpms.net/> 1.0-3
 - Update again to 1.0.
 - Remove desktop file patch, the original is now UTF-8.