diff options
| -rw-r--r-- | media-sound/gimmix/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/gimmix/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/gimmix/files/gimmix-0.5.6.1-tag_info_bugfix1.patch | 146 | ||||
| -rw-r--r-- | media-sound/gimmix/gimmix-0.5.6.1-r1.ebuild | 41 |
4 files changed, 198 insertions, 2 deletions
diff --git a/media-sound/gimmix/ChangeLog b/media-sound/gimmix/ChangeLog index 0cea53e7b692..c9b3dcbee9d3 100644 --- a/media-sound/gimmix/ChangeLog +++ b/media-sound/gimmix/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/gimmix # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.24 2009/03/20 16:20:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.25 2009/07/20 08:24:05 ssuominen Exp $ + +*gimmix-0.5.6.1-r1 (20 Jul 2009) + + 20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> + +gimmix-0.5.6.1-r1.ebuild, +files/gimmix-0.5.6.1-tag_info_bugfix1.patch: + Fix song info box opening wrt #264231, thanks to Christopher Head and + Priyank Gosalia (upstream). 20 Mar 2009; Raúl Porcel <armin76@gentoo.org> gimmix-0.5.6.1.ebuild: x86 stable wrt #262681 diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest index cd82b8db09dc..134ff1b05cf7 100644 --- a/media-sound/gimmix/Manifest +++ b/media-sound/gimmix/Manifest @@ -1,4 +1,6 @@ +AUX gimmix-0.5.6.1-tag_info_bugfix1.patch 4539 RMD160 7a702dcfc030aac19df2ae60151c79b1a73bfe9b SHA1 e8cdaef3508a79e99dd0b98388cc1d4a47a2da5d SHA256 8c618abe624e33aad253c5dfd0f965d4896b77a617e7e6092467e97f1d4eeb2a DIST gimmix-0.5.6.1.tar.bz2 338447 RMD160 549eabe9111510907212a6d2eb8ae801bc9e2a1a SHA1 3f9761a65745776d4cd4188756d26500ef6a1f1a SHA256 0f8e855d7ad4860bfac41e4c36d085cee9af60797651838788b047939ddd38f6 +EBUILD gimmix-0.5.6.1-r1.ebuild 1048 RMD160 cd5d4449f56fefab5c2a6505df505150ca4cff4c SHA1 1843028c90ff2ec63bd1773ccc6b0d490e86f199 SHA256 1314c20bb21a65ab7043e92bfa0954d2c1d09efaef32b8928e0397a94879d307 EBUILD gimmix-0.5.6.1.ebuild 959 RMD160 81cef68247d2e9cdf27d0597a630a2528135da75 SHA1 5a66d134ef14947a86ac75bfd6a194371146c675 SHA256 e6f16bf32a6a062267c2bdcd74e081c57059184e445ec0c87368d4d200f67c58 -MISC ChangeLog 2940 RMD160 242ae3efd9c372785f6da227bbf5dc1190e70906 SHA1 ce8e1f23db7fd96b32bed9aaaffeb944a4ef2d4e SHA256 63eb1b70067a3f2c74570ac9ed8e2b7885d6a1a525d2f5636be3404b2fdb5327 +MISC ChangeLog 3208 RMD160 824e8c99ae127ea3a98a7962c2b3425888b03f80 SHA1 8226759087fcbd61ee937b09aef2313c551992d6 SHA256 1e5eba525e4cc57128193e7c33aa0619a68e361fa066a34febdfd808f11fc537 MISC metadata.xml 376 RMD160 bfdde685738f0f2f0cce53990abd22385c27c47f SHA1 ffbd4a4753674f7a308b270528ebf31049b917bd SHA256 37c040ef04939ca3fa73560cec4e28a62208d7c42f8cdf40b32261c678e1d9a2 diff --git a/media-sound/gimmix/files/gimmix-0.5.6.1-tag_info_bugfix1.patch b/media-sound/gimmix/files/gimmix-0.5.6.1-tag_info_bugfix1.patch new file mode 100644 index 000000000000..e2f6cc4ad15b --- /dev/null +++ b/media-sound/gimmix/files/gimmix-0.5.6.1-tag_info_bugfix1.patch @@ -0,0 +1,146 @@ +diff -Naur gimmix-0.5.6.1/src/gimmix-playlist.c gimmix-0.5.6.1.new/src/gimmix-playlist.c +--- gimmix-0.5.6.1/src/gimmix-playlist.c 2009-02-07 02:11:49.000000000 +0530 ++++ gimmix-0.5.6.1.new/src/gimmix-playlist.c 2009-07-20 11:29:31.000000000 +0530 +@@ -667,11 +667,12 @@ + "text", 1, + NULL); + +- dir_store = gtk_list_store_new (4, ++ dir_store = gtk_list_store_new (5, + 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 DIR/SONG (3) */ ++ G_TYPE_INT); /* id (4) */ + + pls_store = gtk_list_store_new (2, + GDK_TYPE_PIXBUF, /* icon (0) */ +@@ -1190,7 +1191,7 @@ + if (data->type == MPD_DATA_TYPE_PLAYLIST) + { + gtk_list_store_append (pls_liststore, &pls_treeiter); +- name = data->playlist; ++ name = (char*) data->playlist; + gtk_list_store_set (pls_liststore, &pls_treeiter, + 0, pls_pixbuf, + 1, name, +@@ -1288,6 +1289,7 @@ + -1); + g_free (title); + } ++ gtk_list_store_set (dir_store, &dir_iter, 4, data->song->id, -1); + } + + mpd_data_free (data); +@@ -1330,31 +1332,43 @@ + GList *list; + GtkTreeIter iter; + gchar *path; +- gchar *song_path; + gint type = -1; ++ guint id; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW(library_treeview)); + + list = gtk_tree_selection_get_selected_rows (library_selection, &model); + gtk_tree_model_get_iter (model, &iter, list->data); +- gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1); ++ gtk_tree_model_get (model, &iter, 2, &path, 3, &type, 4, &id, -1); + + if (type == DIR) + { + g_free (path); + return; + } +- +- song_path = g_strdup_printf ("%s/%s", cfg_get_key_value(conf, "music_directory"), path); ++ #ifdef HAVE_TAGEDITOR ++ gchar *song_path = g_strdup_printf ("%s/%s", cfg_get_key_value(conf, "music_directory"), path); + if (gimmix_tag_editor_populate (song_path)) + { + gtk_widget_show (tag_editor_window); + } + else ++ { + gimmix_tag_editor_error (invalid_dir_error); +- +- g_free (path); ++ } + g_free (song_path); ++ #else ++ if (gimmix_tag_editor_populate (mpd_database_get_fileinfo(gmo,path))) ++ { ++ gtk_widget_show (tag_editor_window); ++ } ++ else ++ { ++ gimmix_tag_editor_error (_("An error occurred while trying to get song information. Please try again.")); ++ } ++ #endif ++ g_free (path); ++ + + /* free the list */ + g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); +@@ -1370,7 +1384,7 @@ + GList *list; + GtkTreeIter iter; + gchar *path; +- gchar *song_path; ++ guint id; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW(current_playlist_treeview)); + if (gtk_tree_selection_count_selected_rows(current_playlist_selection) != 1) +@@ -1378,10 +1392,10 @@ + + list = gtk_tree_selection_get_selected_rows (current_playlist_selection, &model); + gtk_tree_model_get_iter (model, &iter, list->data); +- gtk_tree_model_get (model, &iter, 1, &path, -1); ++ gtk_tree_model_get (model, &iter, 1, &path, 2, &id, -1); + + #ifdef HAVE_TAGEDITOR +- song_path = g_strdup_printf ("%s/%s", cfg_get_key_value(conf, "music_directory"), path); ++ gchar *song_path = g_strdup_printf ("%s/%s", cfg_get_key_value(conf, "music_directory"), path); + if (gimmix_tag_editor_populate (song_path)) + { + gtk_widget_show (tag_editor_window); +@@ -1392,7 +1406,7 @@ + } + g_free (song_path); + #else +- if (gimmix_tag_editor_populate (mpd_playlist_get_current_song(gmo))) ++ if (gimmix_tag_editor_populate (mpd_playlist_get_song(gmo,id))) + { + gtk_widget_show (tag_editor_window); + } +diff -Naur gimmix-0.5.6.1/src/gimmix-tagedit.c gimmix-0.5.6.1.new/src/gimmix-tagedit.c +--- gimmix-0.5.6.1/src/gimmix-tagedit.c 2009-02-07 02:11:49.000000000 +0530 ++++ gimmix-0.5.6.1.new/src/gimmix-tagedit.c 2009-07-20 11:30:33.000000000 +0530 +@@ -278,10 +278,22 @@ + comment = g_strdup (gtk_entry_get_text (GTK_ENTRY(tag_comment))); + genre = gtk_combo_box_get_active_text (GTK_COMBO_BOX(tag_genre)); + +- taglib_tag_set_title (tag, g_strchomp(title)); +- taglib_tag_set_artist (tag, g_strchomp(artist)); +- taglib_tag_set_album (tag, g_strchomp(album)); +- taglib_tag_set_comment (tag, g_strchomp(comment)); ++ if (title) ++ { ++ taglib_tag_set_title (tag, g_strchomp(title)); ++ } ++ if (artist) ++ { ++ taglib_tag_set_artist (tag, g_strchomp(artist)); ++ } ++ if (album) ++ { ++ taglib_tag_set_album (tag, g_strchomp(album)); ++ } ++ if (comment) ++ { ++ taglib_tag_set_comment (tag, g_strchomp(comment)); ++ } + taglib_tag_set_genre (tag, genre); + + /* update the mpd database */ diff --git a/media-sound/gimmix/gimmix-0.5.6.1-r1.ebuild b/media-sound/gimmix/gimmix-0.5.6.1-r1.ebuild new file mode 100644 index 000000000000..942162bd3b19 --- /dev/null +++ b/media-sound/gimmix/gimmix-0.5.6.1-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/gimmix-0.5.6.1-r1.ebuild,v 1.1 2009/07/20 08:24:05 ssuominen Exp $ + +EAPI=2 +inherit eutils + +DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2" +HOMEPAGE="http://gimmix.berlios.de/" +SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="cover lyrics taglib" + +RDEPEND=">=media-libs/libmpd-0.17 + gnome-base/libglade + x11-libs/gtk+:2 + cover? ( net-libs/libnxml net-misc/curl ) + lyrics? ( net-libs/libnxml net-misc/curl ) + taglib? ( >=media-libs/taglib-1.5 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +src_prepare() { + epatch "${FILESDIR}"/${P}-tag_info_bugfix1.patch +} + +src_configure() { + econf \ + $(use_enable cover) \ + $(use_enable lyrics) \ + $(use_enable taglib tageditor) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog README TODO +} |