Attachment 907924 Details for Bug 1106620 – Patch for rawhide

[patch] Patch for rawhide

gimmix-1106620.patch (text/plain), 3.80 KB, created by Yaakov Selkowitz on 2014-06-12 02:59:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-12 02:59:15 UTC

Size: 3.80 KB

patch

obsolete

>diff --git a/gimmix-glib241.patch b/gimmix-glib241.patch
>new file mode 100644
>index 0000000..d7eab5e
>--- /dev/null
>+++ b/gimmix-glib241.patch
>@@ -0,0 +1,105 @@
>+https://code.google.com/p/gimmix/source/detail?r=3
>+
>+Index: src/gimmix-playlist.c
>+===================================================================
>+--- src/gimmix-playlist.c	(revision 2)
>++++ src/gimmix-playlist.c	(revision 3)
>+@@ -39,7 +39,7 @@
>+ 
>+ typedef enum {
>+ 	SONG = 1,
>+-	DIR,
>++	GIMMIX_DIR,
>+ 	PLAYLIST
>+ } GimmixFileType;
>+ 
>+@@ -149,7 +149,7 @@
>+ 		gtk_tree_model_get_iter (model, &iter, list->data);
>+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
>+ 		
>+-		if (type == DIR || type == SONG)
>++		if (type == GIMMIX_DIR || type == SONG)
>+ 		{
>+ 			switch (target_type)
>+ 			{
>+@@ -696,7 +696,7 @@
>+ 						0, dir_pixbuf,
>+ 						1, path,
>+ 						2, data->directory,
>+-						3, DIR,
>++						3, GIMMIX_DIR,
>+ 						-1);
>+ 			g_free (path);
>+ 		}
>+@@ -954,7 +954,7 @@
>+ 		gtk_tree_model_get_iter (model, &iter, list->data);
>+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
>+ 		
>+-		if (type == DIR)
>++		if (type == GIMMIX_DIR)
>+ 		{	
>+ 			gimmix_update_library_with_dir (path);
>+ 		}
>+@@ -1005,7 +1005,7 @@
>+ 		gtk_tree_model_get_iter (model, &iter, list->data);
>+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
>+ 		
>+-		if (type == DIR)
>++		if (type == GIMMIX_DIR)
>+ 		{
>+ 			mpd_playlist_queue_add (gmo, path);
>+ 		}
>+@@ -1023,7 +1023,7 @@
>+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
>+ 	
>+ 		
>+-		if (type == DIR)
>++		if (type == GIMMIX_DIR)
>+ 		{	
>+ 			mpd_playlist_queue_add (gmo, path);
>+ 			g_free (path);
>+@@ -1081,7 +1081,7 @@
>+ 		gtk_tree_model_get_iter (model, &iter, list->data);
>+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
>+ 		
>+-		if (type == DIR)
>++		if (type == GIMMIX_DIR)
>+ 		{
>+ 			mpd_playlist_queue_add (gmo, path);
>+ 		}
>+@@ -1099,7 +1099,7 @@
>+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
>+ 	
>+ 		
>+-		if (type == DIR)
>++		if (type == GIMMIX_DIR)
>+ 		{	
>+ 			mpd_playlist_queue_add (gmo, path);
>+ 			g_free (path);
>+@@ -1245,7 +1245,7 @@
>+ 					0, dir_pixbuf,
>+ 					1, "..",
>+ 					2, parent,
>+-					3, DIR,
>++					3, GIMMIX_DIR,
>+ 					-1);
>+ 		g_free (parent);
>+ 	}
>+@@ -1260,7 +1260,7 @@
>+ 								0, dir_pixbuf,
>+ 								1, directory,
>+ 								2, data->directory,
>+-								3, DIR,
>++								3, GIMMIX_DIR,
>+ 								-1);
>+ 			g_free (directory);
>+ 		}
>+@@ -1341,7 +1341,7 @@
>+ 	gtk_tree_model_get_iter (model, &iter, list->data);
>+ 	gtk_tree_model_get (model, &iter, 2, &path, 3, &type, 4, &id, -1);
>+ 
>+-	if (type == DIR)
>++	if (type == GIMMIX_DIR)
>+ 	{
>+ 		g_free (path);
>+ 		return;
>diff --git a/gimmix.spec b/gimmix.spec
>index 9cac103..3ac3449 100644
>--- a/gimmix.spec
>+++ b/gimmix.spec
>@@ -1,6 +1,6 @@
> Name:           gimmix
> Version:        0.5.7.1
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> Summary:        Graphical music player daemon (MPD) client
> 
> Group:          Applications/Multimedia
>@@ -14,6 +14,8 @@ Patch1:         gimmix-Makefile.patch
> # fix curl build
> # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch?revision=1.1
> Patch2:         gimmix-curl.patch
>+# upstream patches
>+Patch100:       gimmix-glib241.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  gtk2-devel
>@@ -35,6 +37,7 @@ your audio experience a pleasant one.
> %setup -q
> %patch1
> %patch2 -p1 -b curl
>+%patch100 -p0 -b .glib241
> 
> %build
> chmod -x src/*
>@@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Wed Jun 11 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.5.7.1-11
>+- Fix FTBFS (#1106620)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.7.1-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1106620: 904830 | 904831 | 904832 | 907924