From eff834deb6e475c05a52a2a2c2f149a1e25552d7 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 30 May 2008 17:32:28 +0000 Subject: update to 0.15.5.0 sorry, no useful changelog available pkgsrc note: reset maintainer (mail bounces) --- audio/gmpc/Makefile | 15 ++++----- audio/gmpc/PLIST | 78 ++++++++++++++++++++++++++++++++++++--------- audio/gmpc/distinfo | 15 +++------ audio/gmpc/patches/patch-aa | 12 ------- audio/gmpc/patches/patch-ab | 47 --------------------------- audio/gmpc/patches/patch-ac | 22 ------------- audio/gmpc/patches/patch-ad | 22 ------------- audio/gmpc/patches/patch-ae | 12 ------- audio/gmpc/patches/patch-af | 14 ++++---- 9 files changed, 82 insertions(+), 155 deletions(-) delete mode 100644 audio/gmpc/patches/patch-aa delete mode 100644 audio/gmpc/patches/patch-ab delete mode 100644 audio/gmpc/patches/patch-ac delete mode 100644 audio/gmpc/patches/patch-ad delete mode 100644 audio/gmpc/patches/patch-ae diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile index 62ff95797b6..48d43e403b2 100644 --- a/audio/gmpc/Makefile +++ b/audio/gmpc/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.25 2008/03/06 14:53:47 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2008/05/30 17:32:28 drochner Exp $ # -DISTNAME= gmpc-0.13.0 -PKGREVISION= 7 +DISTNAME= gmpc-0.15.5.0 CATEGORIES= audio -MASTER_SITES= # -# http://sarine.nl/index.php?mact=Uploads,cntnt01,getfile,0&cntnt01showtemplate=false&cntnt01upload_id=1&cntnt01returnid=71 +MASTER_SITES= http://download.qballcow.nl/gmpc-0.15.5/ -MAINTAINER= pkg@burningsoda.com +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sarine.nl/gmpc COMMENT= GNOME client for the Music Player Daemon USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_TOOLS+= intltool msgfmt pkg-config +USE_TOOLS+= intltool msgfmt pkg-config gmake PKGCONFIG_OVERRIDE= data/gmpc.pc.in USE_DIRS+= xdg-1.1 @@ -21,7 +19,8 @@ USE_DIRS+= xdg-1.1 .include "../../audio/libmpd/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" -.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gmpc/PLIST b/audio/gmpc/PLIST index b3501975e7b..9f1ef6c81e3 100644 --- a/audio/gmpc/PLIST +++ b/audio/gmpc/PLIST @@ -1,34 +1,82 @@ -@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:11 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/05/30 17:32:28 drochner Exp $ bin/gmpc +include/gmpc/TreeSearchWidget.h include/gmpc/config1.h -include/gmpc/cover-art.h +include/gmpc/gmpc-clicklabel.h +include/gmpc/gmpc-connection.h +include/gmpc/gmpc-meta-watcher.h +include/gmpc/gmpc-metaimage.h +include/gmpc/gmpc-mpddata-model-sort.h +include/gmpc/gmpc-mpddata-model.h +include/gmpc/gmpc-mpddata-treeview.h +include/gmpc/gmpc-profiles.h +include/gmpc/gmpc-signals.h +include/gmpc/gmpc_easy_download.h +include/gmpc/metadata.h +include/gmpc/misc.h +include/gmpc/playlist3-messages.h include/gmpc/plugin.h -include/gmpc/qthread.h +lib/pkgconfig/gmpc.pc share/applications/gmpc.desktop -share/gmpc/add-browser.glade +share/gmpc/gmpc-add-url.png +share/gmpc/gmpc-loading-cover.png +share/gmpc/gmpc-no-cover.png +share/gmpc/gmpc-tray-disconnected.png +share/gmpc/gmpc-tray-pause.png +share/gmpc/gmpc-tray-play.png share/gmpc/gmpc-tray.png +share/gmpc/gmpc-volume.png share/gmpc/gmpc.glade share/gmpc/gmpc.png -share/gmpc/icecast.png +share/gmpc/hicolor/16x16/actions/media-playlist.png +share/gmpc/hicolor/16x16/actions/media-tag.png +share/gmpc/hicolor/16x16/actions/playlist-browser.png +share/gmpc/hicolor/16x16/actions/playlist-search-browser.png +share/gmpc/hicolor/16x16/actions/tag-browser.png +share/gmpc/hicolor/22x22/actions/gmpc-tray-disconnected.png +share/gmpc/hicolor/22x22/actions/gmpc-tray-pause.png +share/gmpc/hicolor/22x22/actions/gmpc-tray-play.png +share/gmpc/hicolor/22x22/actions/gmpc-tray.png +share/gmpc/hicolor/22x22/actions/media-playlist.png +share/gmpc/hicolor/32x32/actions/media-playlist.png +share/gmpc/hicolor/32x32/actions/media-tag.png +share/gmpc/hicolor/32x32/actions/playlist-browser.png +share/gmpc/hicolor/32x32/actions/playlist-search-browser.png +share/gmpc/hicolor/32x32/actions/tag-browser.png +share/gmpc/hicolor/48x48/actions/media-playlist.png +share/gmpc/hicolor/48x48/actions/media-tag.png +share/gmpc/hicolor/48x48/actions/tag-browser.png +share/gmpc/hicolor/scalable/actions/gmpc-tray-disconnected.svg +share/gmpc/hicolor/scalable/actions/gmpc-tray-pause.svg +share/gmpc/hicolor/scalable/actions/gmpc-tray-play.svg +share/gmpc/hicolor/scalable/actions/gmpc-tray.svg share/gmpc/media-album.png share/gmpc/media-artist.png share/gmpc/media-audiofile.png -share/gmpc/media-next.png -share/gmpc/media-pause.png -share/gmpc/media-play.png -share/gmpc/media-playlist.png -share/gmpc/media-prev.png -share/gmpc/media-stop.png +share/gmpc/media-playback-start.png share/gmpc/media-stream.png -share/gmpc/open-location.glade -share/gmpc/player-repeat.png -share/gmpc/player-shuffle.png share/gmpc/playlist3.glade +share/locale/de/LC_MESSAGES/gmpc.mo share/locale/fr/LC_MESSAGES/gmpc.mo +share/locale/gl/LC_MESSAGES/gmpc.mo +share/locale/it/LC_MESSAGES/gmpc.mo +share/locale/nb_NO/LC_MESSAGES/gmpc.mo +share/locale/nl/LC_MESSAGES/gmpc.mo +share/locale/pl/LC_MESSAGES/gmpc.mo share/locale/ru/LC_MESSAGES/gmpc.mo share/pixmaps/gmpc.png -lib/pkgconfig/gmpc.pc @comment in xdg-dirs: @dirrm share/pixmaps +@dirrm share/gmpc/hicolor/scalable/actions +@dirrm share/gmpc/hicolor/scalable +@dirrm share/gmpc/hicolor/48x48/actions +@dirrm share/gmpc/hicolor/48x48 +@dirrm share/gmpc/hicolor/32x32/actions +@dirrm share/gmpc/hicolor/32x32 +@dirrm share/gmpc/hicolor/22x22/actions +@dirrm share/gmpc/hicolor/22x22 +@dirrm share/gmpc/hicolor/16x16/actions +@dirrm share/gmpc/hicolor/16x16 +@dirrm share/gmpc/hicolor @dirrm share/gmpc @comment in xdg-dirs: @dirrm share/applications @dirrm include/gmpc diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo index 8c1d1ffcc1d..298c860f313 100644 --- a/audio/gmpc/distinfo +++ b/audio/gmpc/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.10 2006/05/15 16:52:42 joerg Exp $ +$NetBSD: distinfo,v 1.11 2008/05/30 17:32:28 drochner Exp $ -SHA1 (gmpc-0.13.0.tar.gz) = 587adeb34786cad639dd426be864fe6be4398db1 -RMD160 (gmpc-0.13.0.tar.gz) = bcc9444346406d6a22a72e994bd183c6ede7c437 -Size (gmpc-0.13.0.tar.gz) = 476926 bytes -SHA1 (patch-aa) = 14134100c0deb0f3cb031e327f844b1a1154198d -SHA1 (patch-ab) = 91ed0e58cc8403f7e65df6ed5245b4e1e27ebfb3 -SHA1 (patch-ac) = a88c2782233136e4ad50ba183e5b53278a69b755 -SHA1 (patch-ad) = 5685d0065100b3dcfe96aec773d38d8c70dad783 -SHA1 (patch-ae) = c9e881619a00a037a2b8b8fc6a1e4f26c7a15fe5 -SHA1 (patch-af) = c6993d734c1ac8e8dd41376f50bf31c2abd74036 +SHA1 (gmpc-0.15.5.0.tar.gz) = 3ac0755da2215b0d037427ee50bea55d953e2454 +RMD160 (gmpc-0.15.5.0.tar.gz) = 5f7f8b4809cc6e3248cd0a9951d5b5e4f18975cc +Size (gmpc-0.15.5.0.tar.gz) = 893886 bytes +SHA1 (patch-af) = b15ed261dc255d751dbd09f468590db47fe61a05 SHA1 (patch-ag) = 16a41bf8acfac8738a1cc589aeae102a3f9ccecb 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"); -- cgit v1.2.3