Fix compilation

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x84F20B43

4 files changed, 189 insertions, 11 deletions

diff --git a/media-sound/gimmix/ChangeLog b/media-sound/gimmix/ChangeLog
index 0406bb16b451..0c1bc69a2d2b 100644
--- a/media-sound/gimmix/ChangeLog
+++ b/media-sound/gimmix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gimmix
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.33 2012/07/25 11:05:20 angelos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.34 2014/03/22 19:19:27 angelos Exp $
+
+  22 Mar 2014; Christoph Mende <angelos@gentoo.org>
+  +files/gimmix-0.5.7.1-symbol-collision.patch, gimmix-0.5.7.1.ebuild:
+  Fix compilation
 
   25 Jul 2012; Christoph Mende <angelos@gentoo.org>
   +files/gimmix-0.5.7.1-curl-headers.patch, gimmix-0.5.7.1.ebuild:
diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest
index 9ff099adf3ce..c6a900e387d0 100644
--- a/media-sound/gimmix/Manifest
+++ b/media-sound/gimmix/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX gimmix-0.5.7.1-curl-headers.patch 655 SHA256 9145f2d69580d1b0e500d84086e11db44ca53b2c4c958cd7c57407a3eec79352 SHA512 9b0665e8de4670b2dc58940215b883549bddd6d7abd26f604f334034d604689063b3347ba81651b804a430b31ff235c9b65c33ee0d3115c4e2fba2d48d3c56bb WHIRLPOOL 5f7e475aeb539ef08535dce4f1387dfa0c868c8bd7f6045820307a9cef2bcfa5e9e6fa5ae27e56238c2bbc760f4789e88f62c7f87448089ca31e5d565819da23
+AUX gimmix-0.5.7.1-symbol-collision.patch 4532 SHA256 c66f0d581e52fd4f04709104f9ea6519f5d582b92ba07261f568d690869794ae SHA512 aa13ef820381a9c2cfce32eed88e5199a62dc398df7998c1aba16b576fa225963ab4600ca8c458073a22bd85b0e4928f44e8f5f900c5ac48664235afa2294917 WHIRLPOOL 9822abd21971bfdd6349c434e899e3d56edd02725254d1d38a6d9148008c0dcb91325352d0e601066b047a9bf1602332475fa117ed45c2dd2abc93fd3da8280b
 DIST gimmix-0.5.7.1.tar.bz2 330368 SHA256 f504e19615fe2032b958d14a88504fbf9c2684ccad3cbe0b177068173e538cba SHA512 03187d423afc97e9eec014603518a35795ac3d240e68c888a39c97a790be1cf5a838cd70d71df2ee455e5f437bc74689e5fd2cf3695e0e1d805fde60d9b0e26b WHIRLPOOL ace795cf2b588011e7c7a5b3bdcf4043de2f00e101245866a3990550eaa4ed0877c8b7344df1995b5e8e67515278e064b47da0a46dedfbf8ba47755bcdeaf2cb
-EBUILD gimmix-0.5.7.1.ebuild 953 SHA256 ee8c2e2805791a3999e7c564a992e21f399683712fcc590aff9b0b6ce29a97ec SHA512 6bc75b8e50cce76653215a32e3f258a1bc797320220d72ca5177818a8516fc29cee83183677fe42949b51282d04b8ea666c60e198e7542d787e23c0ec4ba0eed WHIRLPOOL f618c77791f42ab990eac2d98dd7205dac0d1f5ac2d2438546491a5f35f0c66f507ec47f013728b9fa6ab17c4b0ce1dfa4d29246c6ac2f1908da2b6076c264d4
-MISC ChangeLog 4182 SHA256 6e6b718dca09206a9534140e46bca2d6e774c0e42e172cca196c0e1dd1de5313 SHA512 f696a06b7934dd921bf307b5e1864c039dff33519b8f1cdbc3c12cf0d0b9627647f7b2a264c972be537ac4ac33b2570fc15f9e48fc50884eb86ae89608415a33 WHIRLPOOL b4324852a442520257ab577e99adda189f54af509fdbf4fa5096c24a61240d650aa09904789830654c65b65c91dbb08206a66cb1d8690a8208534b97d1a1b965
+EBUILD gimmix-0.5.7.1.ebuild 999 SHA256 51c810080766ce3f9599ae1bf85de6d8efa31efaae761267938281fc5d0a3632 SHA512 f851be7051e08cdd048498ff52c749f97d24ee7aa637f5d550ed991617ad2385e7179901f6d53714527dff89411a521035678445297ec165a1841a6a5545733d WHIRLPOOL 8a2d62fe168e0c2fcae7a6df8ce577a217e956390cec8bf67c937ad3e59208456f292bdee5b1cafc3de5e5ffcf43c7df2cf05be52055c146fc556d8f419acaa1
+MISC ChangeLog 4324 SHA256 b033c5b4ce7a26ac0470b830f5f3d9ea5f9dcecf9d90398276c08fc617d0a0ae SHA512 38ae4e8be0ca384ae77c20c7419b08ae0624f21b5ded7101d1eb8907cf808cf1ce98715035ff0754b5e853d9a590e14a456a4f9a491e392db8673430bba45e14 WHIRLPOOL c50f0564efb0cf7c7be32a08d54ee1ad50510301fdfc6320a0277f68d5d0385388ee6d7133e9ddc522147a814432e13a0902573d3fd7c03310875046fe48ed78
 MISC metadata.xml 376 SHA256 37c040ef04939ca3fa73560cec4e28a62208d7c42f8cdf40b32261c678e1d9a2 SHA512 cf2ee2e11da6444ad8dc8e475e11c61e827e094e6e1ca14b34f4498a9de3bc2582470dd77d28ea24eecab91336721f308b66ccce5d75f2f668d481171b1d0a3a WHIRLPOOL 953b9f3dc257dff210632afff971a0ed6277381b1bfdad15ea30d82b1e45f2a42f51cf5203fd2eacea53936679f0740363adab1a8e61fa55b6010e058e372e45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlAP0vYACgkQmWq1bYTyC0P+awEAp4MRq5R9bvhzCqtQE91Ew+1y
-3N1n04Ul6EQFVNR43t0A/jclDAA/dsQ6ZAsvbEw13hJZJk72p4ZvK44hbEoQdaUx
-=Vgw4
+iF4EAREIAAYFAlMt4kAACgkQmWq1bYTyC0Pq2AEAgIR81TYNw09Z3Witn33gbJK6
+QIlkmE/3ls2Ui1M9vOkA/10Q5az8LbjDBf/SLASkVecmoAqdHqy5TZEhxy38wdoP
+=C2Z2
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch b/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch
new file mode 100644
index 000000000000..631a891647bf
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch
@@ -0,0 +1,172 @@
+diff --git a/src/gimmix-playlist.c b/src/gimmix-playlist.c
+index cd63f58..661a47f 100644
+--- a/src/gimmix-playlist.c
++++ b/src/gimmix-playlist.c
+@@ -38,9 +38,9 @@ typedef enum {
+ } GimmixColumnType;
+ 
+ typedef enum {
+-	SONG = 1,
+-	DIR,
+-	PLAYLIST
++	GFT_SONG = 1,
++	GFT_DIR,
++	GFT_PLAYLIST
+ } GimmixFileType;
+ 
+ enum { TARGET_STRING, TARGET_ROOTWIN };
+@@ -149,7 +149,7 @@ on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *
+ 		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 == GFT_DIR || type == GFT_SONG)
+ 		{
+ 			switch (target_type)
+ 			{
+@@ -671,7 +671,7 @@ gimmix_library_and_playlists_populate (void)
+ 						GDK_TYPE_PIXBUF, 	/* icon (0) */
+ 						G_TYPE_STRING, 		/* name (1) */
+ 						G_TYPE_STRING,		/* path (2) */
+-						G_TYPE_INT,			/* type DIR/SONG (3) */
++						G_TYPE_INT,			/* type GFT_DIR/GFT_SONG (3) */
+ 						G_TYPE_INT);		/* id (4) */
+ 	
+ 	pls_store 	= gtk_list_store_new (2, 
+@@ -696,7 +696,7 @@ gimmix_library_and_playlists_populate (void)
+ 						0, dir_pixbuf,
+ 						1, path,
+ 						2, data->directory,
+-						3, DIR,
++						3, GFT_DIR,
+ 						-1);
+ 			g_free (path);
+ 		}
+@@ -722,7 +722,7 @@ gimmix_library_and_playlists_populate (void)
+ 						0, song_pixbuf,
+ 						1, title,
+ 						2, data->song->file,
+-						3, SONG,
++						3, GFT_SONG,
+ 						-1);
+ 			g_free (title);
+ 		}
+@@ -838,7 +838,7 @@ gimmix_library_search (gint type, gchar *text)
+ 								0, song_pixbuf,
+ 								1, title,
+ 								2, data->song->file,
+-								3, SONG,
++								3, GFT_SONG,
+ 								-1);
+ 			g_free (title);
+ 		}
+@@ -954,11 +954,11 @@ cb_library_dir_activated (gpointer data)
+ 		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 == GFT_DIR)
+ 		{	
+ 			gimmix_update_library_with_dir (path);
+ 		}
+-		else if (type == SONG)
++		else if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_add (gmo, path);
+ 			added = true;
+@@ -1005,11 +1005,11 @@ cb_library_popup_add_clicked (GtkWidget *widget, gpointer data)
+ 		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 == GFT_DIR)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 		}
+-		else if (type == SONG)
++		else if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_add (gmo, path);
+ 		}
+@@ -1023,13 +1023,13 @@ cb_library_popup_add_clicked (GtkWidget *widget, gpointer data)
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 	
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{	
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+ 		}
+ 		
+-		if (type == SONG)
++		if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+@@ -1081,11 +1081,11 @@ cd_library_popup_replace_clicked (GtkWidget *widget, gpointer data)
+ 		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 == GFT_DIR)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 		}
+-		else if (type == SONG)
++		else if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_add (gmo, path);
+ 		}
+@@ -1099,13 +1099,13 @@ cd_library_popup_replace_clicked (GtkWidget *widget, gpointer data)
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 	
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{	
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+ 		}
+ 		
+-		if (type == SONG)
++		if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+@@ -1245,7 +1245,7 @@ gimmix_update_library_with_dir (gchar *dir)
+ 					0, dir_pixbuf,
+ 					1, "..",
+ 					2, parent,
+-					3, DIR,
++					3, GFT_DIR,
+ 					-1);
+ 		g_free (parent);
+ 	}
+@@ -1260,7 +1260,7 @@ gimmix_update_library_with_dir (gchar *dir)
+ 								0, dir_pixbuf,
+ 								1, directory,
+ 								2, data->directory,
+-								3, DIR,
++								3, GFT_DIR,
+ 								-1);
+ 			g_free (directory);
+ 		}
+@@ -1285,7 +1285,7 @@ gimmix_update_library_with_dir (gchar *dir)
+ 								0, song_pixbuf,
+ 								1, title,
+ 								2, data->song->file,
+-								3, SONG,
++								3, GFT_SONG,
+ 								-1);
+ 			g_free (title);
+ 		}
+@@ -1341,7 +1341,7 @@ gimmix_library_song_info (void)
+ 	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 == GFT_DIR)
+ 	{
+ 		g_free (path);
+ 		return;
diff --git a/media-sound/gimmix/gimmix-0.5.7.1.ebuild b/media-sound/gimmix/gimmix-0.5.7.1.ebuild
index ee6353062892..08f93d63a320 100644
--- a/media-sound/gimmix/gimmix-0.5.7.1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/gimmix-0.5.7.1.ebuild,v 1.6 2012/07/25 11:05:20 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/gimmix-0.5.7.1.ebuild,v 1.7 2014/03/22 19:19:27 angelos Exp $
 
 EAPI=4
 inherit eutils
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-curl-headers.patch
+	epatch "${FILESDIR}"/${P}-curl-headers.patch \
+		"${FILESDIR}"/${P}-symbol-collision.patch
 }
 
 src_configure() {