diff options
author | Christoph Mende <angelos@gentoo.org> | 2011-03-01 09:26:47 +0000 |
---|---|---|
committer | Christoph Mende <angelos@gentoo.org> | 2011-03-01 09:26:47 +0000 |
commit | c636f2f6996600413d665681848362e042f690ea (patch) | |
tree | e6a3a04d50fffee991a6153ce3722e2d7e951fdb /media-sound/gimmix | |
parent | Stable on amd64 wrt bug #355649 (diff) | |
download | historical-c636f2f6996600413d665681848362e042f690ea.tar.gz historical-c636f2f6996600413d665681848362e042f690ea.tar.bz2 historical-c636f2f6996600413d665681848362e042f690ea.zip |
Removed old
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'media-sound/gimmix')
-rw-r--r-- | media-sound/gimmix/ChangeLog | 9 | ||||
-rw-r--r-- | media-sound/gimmix/Manifest | 18 | ||||
-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 | ||||
-rw-r--r-- | media-sound/gimmix/gimmix-0.5.6.1.ebuild | 36 | ||||
-rw-r--r-- | media-sound/gimmix/gimmix-0.5.7.ebuild | 36 |
6 files changed, 13 insertions, 273 deletions
diff --git a/media-sound/gimmix/ChangeLog b/media-sound/gimmix/ChangeLog index 4ffb47ee14fc..e4f7d296e4fd 100644 --- a/media-sound/gimmix/ChangeLog +++ b/media-sound/gimmix/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/gimmix -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.29 2010/07/14 13:24:38 fauli Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.30 2011/03/01 09:26:46 angelos Exp $ + + 01 Mar 2011; <angelos@gentoo.org> -gimmix-0.5.6.1.ebuild, + -gimmix-0.5.6.1-r1.ebuild, -files/gimmix-0.5.6.1-tag_info_bugfix1.patch, + -gimmix-0.5.7.ebuild: + Removed old 14 Jul 2010; Christian Faulhammer <fauli@gentoo.org> gimmix-0.5.7.1.ebuild: diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest index 4765847ad311..2b896ebebddb 100644 --- a/media-sound/gimmix/Manifest +++ b/media-sound/gimmix/Manifest @@ -1,20 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -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 DIST gimmix-0.5.7.1.tar.bz2 330368 RMD160 be664504014a23f3ff7327730508cb18a9e0d356 SHA1 d32f272e4c6b4107081355c19bf813b69096ee7d SHA256 f504e19615fe2032b958d14a88504fbf9c2684ccad3cbe0b177068173e538cba -DIST gimmix-0.5.7.tar.bz2 329042 RMD160 e1194b443698596de7eb021bdf4cff88a4dc518b SHA1 4035713796a881ae5811c3db16f6e033e134f10b SHA256 2e26d7352270e15b39f7603dcc38c91e398a1c031eadee01f86a540c77f07921 -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 EBUILD gimmix-0.5.7.1.ebuild 955 RMD160 4e679432b2e6da63374201428aa828b172c2a49f SHA1 c7513fbb7482c29275cb6eac58a56c998533288d SHA256 17622f5b2197a4b3e1aa8adf93349b695569a7ae275173e4547550e02099f41a -EBUILD gimmix-0.5.7.ebuild 957 RMD160 d2bdd7797b815084070c1224676dd7cc5efaacfb SHA1 b2490582f1e981b5f27138575f0e0d5de3fa8e8a SHA256 938d4a145dad427600e0b5294e07adfaefccf866bd75e67a497c94c5c832f7ae -MISC ChangeLog 3649 RMD160 0f7c23ab961dbcb6591225677e00b342c3b871b5 SHA1 4ec7de26d2f3a9bf7a6be8c0ea51302faefc5e1f SHA256 6b5e5fef2f4b47667dff6439070f2fcb766bea2c04e2489851ffe424adfd8c72 +MISC ChangeLog 3825 RMD160 94cfc30c975f5043d700035addf685a7e2e92fb5 SHA1 e7394cc4eb9c26d632c85cd8e28f7a2274a8e840 SHA256 ad1f3d5c2d3b606bfa556df7bac22db586eff947c8e2038b05a2f02abf265464 MISC metadata.xml 376 RMD160 bfdde685738f0f2f0cce53990abd22385c27c47f SHA1 ffbd4a4753674f7a308b270528ebf31049b917bd SHA256 37c040ef04939ca3fa73560cec4e28a62208d7c42f8cdf40b32261c678e1d9a2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkw9uwYACgkQNQqtfCuFnePXXACghkS7jtmgbvBM7B44eXr731I6 -WbsAnigNX0C3GZGDtP2t30fJBXXpG+qi -=eldd +iF4EAREIAAYFAk1su9oACgkQmWq1bYTyC0MOVwD/TpD6mqJds1NL7WD0v+hAzeEw +mOv0OJE9PJ72csV/Ms8BAJxg4YRDumnRVj5zatkGYHl50SMxnqs5h/bNen48Y+9n +=Adrj -----END PGP SIGNATURE----- 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 deleted file mode 100644 index e2f6cc4ad15b..000000000000 --- a/media-sound/gimmix/files/gimmix-0.5.6.1-tag_info_bugfix1.patch +++ /dev/null @@ -1,146 +0,0 @@ -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 deleted file mode 100644 index 942162bd3b19..000000000000 --- a/media-sound/gimmix/gimmix-0.5.6.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# 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 -} diff --git a/media-sound/gimmix/gimmix-0.5.6.1.ebuild b/media-sound/gimmix/gimmix-0.5.6.1.ebuild deleted file mode 100644 index 8c5de0a8a7d2..000000000000 --- a/media-sound/gimmix/gimmix-0.5.6.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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.ebuild,v 1.6 2009/05/22 11:58:31 ssuominen Exp $ - -EAPI=2 - -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_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 -} diff --git a/media-sound/gimmix/gimmix-0.5.7.ebuild b/media-sound/gimmix/gimmix-0.5.7.ebuild deleted file mode 100644 index 64b3abcf9ceb..000000000000 --- a/media-sound/gimmix/gimmix-0.5.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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.7.ebuild,v 1.1 2009/11/21 19:32:13 angelos Exp $ - -EAPI=2 - -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_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 -} |