summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/gimmix/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/gimmix/files')
-rw-r--r--media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch24
-rw-r--r--media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch172
2 files changed, 196 insertions, 0 deletions
diff --git a/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch b/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch
new file mode 100644
index 000000000000..990165725dc2
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gimmix-covers.c b/src/gimmix-covers.c
+index f2524c4..2dc37f3 100644
+--- a/src/gimmix-covers.c
++++ b/src/gimmix-covers.c
+@@ -29,7 +29,6 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <nxml.h>
+ #include <libxml/xmlreader.h>
+diff --git a/src/gimmix-lyrics.c b/src/gimmix-lyrics.c
+index ff58954..01990e2 100644
+--- a/src/gimmix-lyrics.c
++++ b/src/gimmix-lyrics.c
+@@ -30,7 +30,6 @@
+ #include <nxml.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <libxml/xmlreader.h>
+ #include "gimmix-lyrics.h"
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;