[Pkg-mpd-commits] [gimmix] 01/01: Add ftbfs_glib.patch

[Vincent Legout]

This is an automated email from the git hooks/post-receive script.

vlegout pushed a commit to branch master
in repository gimmix.

commit 3141cb3d793812c8d486fd3c10363368f201e042
Author: Vincent Legout <vincent at legout.info>
Date:   Thu Mar 20 11:45:34 2014 +0100

    Add ftbfs_glib.patch
---
 debian/changelog                |   7 +++
 debian/patches/ftbfs_glib.patch | 107 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |   1 +
 3 files changed, 115 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2f7d19d..daf6b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gimmix (0.5.7.1-5) unstable; urgency=medium
+
+  * Add debian/patches/ftbfs_glib.patch Fix FTBFS with new glib-2.0
+    (Closes: #741790)
+
+ -- Vincent Legout <vlegout at debian.org>  Thu, 20 Mar 2014 11:20:02 +0100
+
 gimmix (0.5.7.1-4) unstable; urgency=low
 
   * Use my debian.org email address
diff --git a/debian/patches/ftbfs_glib.patch b/debian/patches/ftbfs_glib.patch
new file mode 100644
index 0000000..63fd747
--- /dev/null
+++ b/debian/patches/ftbfs_glib.patch
@@ -0,0 +1,107 @@
+Description: Fix FTBFS with new glib-2.0
+Origin: http://code.google.com/p/gimmix/source/detail?r=3
+Bug-Debian: http://bugs.debian.org/741790
+
+Index: gimmix/src/gimmix-playlist.c
+===================================================================
+--- gimmix.orig/src/gimmix-playlist.c	2014-03-20 11:21:33.543082329 +0100
++++ gimmix/src/gimmix-playlist.c	2014-03-20 11:23:11.309823346 +0100
+@@ -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/debian/patches/series b/debian/patches/series
index ffb4a83..b67a27e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 ftbfs-curl-types.patch
 ftbfs-hardening.patch
 fix_curl_segfault.patch
+ftbfs_glib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/gimmix.git