summaryrefslogtreecommitdiff
path: root/audio/gmpc/patches
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2008-05-30 17:32:28 +0000
committerdrochner <drochner@pkgsrc.org>2008-05-30 17:32:28 +0000
commitebe84f6dc412f805bfcc0b6bdb47e393fda51bc7 (patch)
tree009733b08a2ffbd322e1fd5dbd3d2a6b075e9c93 /audio/gmpc/patches
parent27ad63656b9d144714a4494d26ee2b798fd9a999 (diff)
downloadpkgsrc-ebe84f6dc412f805bfcc0b6bdb47e393fda51bc7.tar.gz
update to 0.15.5.0
sorry, no useful changelog available pkgsrc note: reset maintainer (mail bounces)
Diffstat (limited to 'audio/gmpc/patches')
-rw-r--r--audio/gmpc/patches/patch-aa12
-rw-r--r--audio/gmpc/patches/patch-ab47
-rw-r--r--audio/gmpc/patches/patch-ac22
-rw-r--r--audio/gmpc/patches/patch-ad22
-rw-r--r--audio/gmpc/patches/patch-ae12
-rw-r--r--audio/gmpc/patches/patch-af14
6 files changed, 7 insertions, 122 deletions
diff --git a/audio/gmpc/patches/patch-aa b/audio/gmpc/patches/patch-aa
deleted file mode 100644
index 0e49c0ca2f4..00000000000
--- a/audio/gmpc/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/Makefile.in.orig 2006-04-07 18:20:35.000000000 +0100
-+++ src/Makefile.in 2006-04-07 18:20:45.000000000 +0100
-@@ -198,6 +198,7 @@ LIBS = \
-
-
- LDFLAGS = \
-+ @LDFLAGS@ \
- @EXTRA_LDFLAGS@
-
-
diff --git a/audio/gmpc/patches/patch-ab b/audio/gmpc/patches/patch-ab
deleted file mode 100644
index 883f879990f..00000000000
--- a/audio/gmpc/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/main.c.orig 2006-02-14 18:04:43.000000000 +0000
-+++ src/main.c 2006-04-06 21:53:15.000000000 +0100
-@@ -378,6 +378,7 @@ int update_interface ()
- void playlist_changed(MpdObj *mi)
- {
- MpdData *data = NULL;
-+ char *string;
- long long new_playlist_id = mpd_playlist_get_playlist_id(connection);
- /*
- * so I don't have to check all the time
-@@ -387,7 +388,7 @@ void playlist_changed(MpdObj *mi)
- gchar buffer[1024];
- debug_printf(DEBUG_INFO, "playlist changed length: %i %i\n",info.playlist_length, mpd_playlist_get_playlist_length(mi));
- old_length = info.playlist_length;
-- char *string = cfg_get_single_value_as_string_with_default(config,
-+ string = cfg_get_single_value_as_string_with_default(config,
- "playlist","markup", DEFAULT_PLAYLIST_MARKUP);
-
- data = mpd_playlist_get_changes(mi,info.playlist_id);
-@@ -804,6 +805,7 @@ void password_dialog(int failed)
- void error_callback(MpdObj *mi, int error_id, char *error_msg, gpointer data)
- {
- int autoconnect = cfg_get_single_value_as_int_with_default(config, "connection","autoconnect", DEFAULT_AUTOCONNECT);
-+ GtkWidget *dialog;
- /* if we are not connected we show a reconnect */
- if(!mpd_check_connected(mi))
- {
-@@ -816,7 +818,7 @@ void error_callback(MpdObj *mi, int erro
- gchar *path = gmpc_get_full_glade_path("gmpc.glade");
- xml_error_window = glade_xml_new(path,"error_dialog",NULL);
- g_free(path);
-- GtkWidget *dialog = glade_xml_get_widget(xml_error_window, "error_dialog");
-+ dialog = glade_xml_get_widget(xml_error_window, "error_dialog");
- gtk_label_set_markup(GTK_LABEL(glade_xml_get_widget(xml_error_window,"em_label")), str);
- gtk_widget_show_all(dialog);
- g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(error_window_destroy), GINT_TO_POINTER(autoconnect));
-@@ -842,7 +844,7 @@ void error_callback(MpdObj *mi, int erro
- }
- else {
-
-- GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL,
-+ dialog = gtk_message_dialog_new_with_markup(NULL,
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
diff --git a/audio/gmpc/patches/patch-ac b/audio/gmpc/patches/patch-ac
deleted file mode 100644
index 54e187d29ec..00000000000
--- a/audio/gmpc/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/18 20:24:46 rillig Exp $
-
-Keywords: c90
-
---- src/misc.c.orig Tue May 3 10:40:16 2005
-+++ src/misc.c Sun Dec 18 21:06:07 2005
-@@ -87,12 +87,14 @@ gchar * format_time(unsigned long second
- int houres = (seconds % 86400)/3600;
- int minutes = (seconds % 3600)/60;
- char *ret;
-+ GString *str;
-+
- if(seconds == 0)
- {
- GString *str = g_string_new(NULL);
- return str->str;
- }
-- GString *str = g_string_new(" Total time: ");
-+ str = g_string_new(" Total time: ");
- if(days != 0)
- {
- g_string_append_printf(str, "%i days ", days);
diff --git a/audio/gmpc/patches/patch-ad b/audio/gmpc/patches/patch-ad
deleted file mode 100644
index 03573cf2f0e..00000000000
--- a/audio/gmpc/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
-
---- src/player.c.orig 2006-02-06 18:46:50.000000000 +0000
-+++ src/player.c 2006-04-06 21:49:45.000000000 +0100
-@@ -300,6 +300,8 @@ int msg_pop_popup()
-
- int update_player()
- {
-+ GtkRange *scale;
-+
- if(!xml_main_window) return FALSE;
- if(!mpd_check_connected(connection)) return FALSE;
- /* things that only need to be updated during playing */
-@@ -308,7 +310,7 @@ int update_player()
- int elapsedTime = mpd_status_get_elapsed_song_time(connection);
- /* update the progress bar */
- if(!seek){
-- GtkRange *scale = (GtkRange *)glade_xml_get_widget(xml_main_window, "progress_slider");
-+ scale = (GtkRange *)glade_xml_get_widget(xml_main_window, "progress_slider");
- gdouble prog = ((double)elapsedTime/(double)totalTime)*100;
- gtk_range_set_value(scale, prog);
- }
diff --git a/audio/gmpc/patches/patch-ae b/audio/gmpc/patches/patch-ae
deleted file mode 100644
index 25f55bc9ed5..00000000000
--- a/audio/gmpc/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/28 11:09:37 joerg Exp $
-
---- src/cover-art-manager.c.orig 2006-04-28 10:34:30.000000000 +0000
-+++ src/cover-art-manager.c
-@@ -13,7 +13,6 @@
-
- GladeXML *cam_pref_xml = NULL;
- extern config_obj *cover_index;
--extern int errno;
-
- void cover_art_manager_close(GtkWidget *widget);
- void cover_art_pref_construct(GtkWidget *container);
diff --git a/audio/gmpc/patches/patch-af b/audio/gmpc/patches/patch-af
index 0d5965c1e58..9dcfeadaa41 100644
--- a/audio/gmpc/patches/patch-af
+++ b/audio/gmpc/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
+$NetBSD: patch-af,v 1.3 2008/05/30 17:32:28 drochner Exp $
---- src/playlist3.c.orig 2006-02-15 21:09:17.000000000 +0000
-+++ src/playlist3.c 2006-04-06 21:51:40.000000000 +0100
-@@ -105,10 +105,12 @@ int pl3_cat_get_selected_browser()
- void pl3_initialize_tree()
+--- src/playlist3.c.orig 2007-11-29 14:52:03.000000000 +0100
++++ src/playlist3.c
+@@ -146,10 +146,12 @@ int pl3_cat_get_selected_browser()
+ static void pl3_initialize_tree()
{
int i;
+ GtkTreePath *path;
@@ -14,6 +14,6 @@ $NetBSD: patch-af,v 1.2 2006/04/07 17:40:22 rpaulo Exp $
- GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(pl3_xml, "cat_tree")));
+ path = gtk_tree_path_new_from_string("0");
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(pl3_xml, "cat_tree")));
- if((old_type&PLUGIN_ID_MARK || old_type&PLUGIN_ID_INTERNALL) != 0)
+ if(old_type >= 0)
{
- if(old_type >= 0)
+ GtkWidget *container = glade_xml_get_widget(pl3_xml, "browser_container");