rpms/easytag/F-13 easytag-2.1.6-flac-picture.patch, NONE, 1.1 easytag-2.1.6-load-from-txt.patch, NONE, 1.1 easytag.spec, 1.30, 1.31

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/easytag/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31223/F-13

Modified Files:
	easytag.spec 
Added Files:
	easytag-2.1.6-flac-picture.patch 
	easytag-2.1.6-load-from-txt.patch 
Log Message:
Include 2 patches to fix reported crashes.


easytag-2.1.6-flac-picture.patch:
 picture.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE easytag-2.1.6-flac-picture.patch ---
diff -Naupr easytag-2.1.6.orig/src/picture.c easytag-2.1.6/src/picture.c
--- easytag-2.1.6.orig/src/picture.c	2008-05-18 00:43:28.000000000 +0200
+++ easytag-2.1.6/src/picture.c	2010-04-30 16:56:16.144157741 +0200
@@ -570,7 +570,7 @@ void Picture_Properties_Button_Clicked (
                     pic->description = buffer;
                 }else
                 {
-                    pic->description = 0;
+                    pic->description = strdup( "" );
                     g_free(buffer);
                 }
 

easytag-2.1.6-load-from-txt.patch:
 misc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE easytag-2.1.6-load-from-txt.patch ---
diff -Naupr easytag-2.1.6.orig/src/misc.c easytag-2.1.6/src/misc.c
--- easytag-2.1.6.orig/src/misc.c	2008-05-24 22:59:34.000000000 +0200
+++ easytag-2.1.6/src/misc.c	2010-04-30 16:58:34.465162065 +0200
@@ -3327,7 +3327,7 @@ void Load_Filename_Set_Filenames (void)
         g_free(list_text);
     }
 
-    g_free(currentPath);
+    gtk_tree_path_free(currentPath);
 
     Browser_List_Refresh_Whole_List();
     ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/F-13/easytag.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- easytag.spec	30 Apr 2010 14:27:48 -0000	1.30
+++ easytag.spec	30 Apr 2010 15:21:06 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
 Version: 2.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -15,6 +15,8 @@ Source: easytag-%{version}-patched.tar.b
 Patch0: easytag-2.1.6-id3lib.patch
 Patch1: easytag-2.1.6-cddb_manual_search_fix.patch
 Patch2: easytag-2.1.6-nomimedirs.patch
+Patch3: easytag-2.1.6-flac-picture.patch
+Patch4: easytag-2.1.6-load-from-txt.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: id3lib-devel >= 3.7.12
@@ -36,6 +38,8 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monk
 %patch0 -p1 -b .id3lib
 %patch1 -p1 -b .cddb_manual_search_fix
 %patch2 -p1 -b .nomimedirs
+%patch3 -p1 -b .flac-picture
+%patch4 -p1 -b .load-from-txt
 # With 2.0, the upstream tarball set *LOTS* of files +x :-(
 find . -type f -exec %{__chmod} -x {} \;
 %{__chmod} +x *.sh configure depcomp install-sh missing mkinstalldirs
@@ -67,8 +71,10 @@ find . -type f -exec %{__chmod} -x {} \;
 
 
 %changelog
-* Fri Apr 30 2010 Matthias Saou <http://freshrpms.net/> 2.1.6-4
+* Fri Apr 30 2010 Matthias Saou <http://freshrpms.net/> 2.1.6-5
 - Actually apply the patch to remove x-directory/normal.
+- Include patch to fix empty decription with flac pictures (#559828).
+- Include patch to fix load from txt feature (#562317).
 
 * Thu Apr  8 2010 Matthias Saou <http://freshrpms.net/> 2.1.6-3
 - Remove x-directory/normal from the desktop file (#451823).