Update to 0.6.0.

8 files changed, 58 insertions, 32 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index cd62632a7f4e..197109570324 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.5.88
+PORTVERSION=	0.6.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@freebsd.org
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index af3cca36ef4d..e82342d64f5a 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/rhythmbox-0.5.88.tar.bz2) = b45000cc256f8ff31c5e2b1ebcf6c315
+MD5 (gnome2/rhythmbox-0.6.0.tar.bz2) = 4b2f613f3a9f0e66facdc571867093c1
diff --git a/audio/rhythmbox-devel/files/patch-lib_rb-tree-dnd.c b/audio/rhythmbox-devel/files/patch-lib_rb-tree-dnd.c
new file mode 100644
index 000000000000..5ce40a753dd3
--- /dev/null
+++ b/audio/rhythmbox-devel/files/patch-lib_rb-tree-dnd.c
@@ -0,0 +1,26 @@
+--- lib/rb-tree-dnd.c.orig	Tue Nov 11 20:58:54 2003
++++ lib/rb-tree-dnd.c	Tue Nov 11 20:59:17 2003
+@@ -710,9 +710,10 @@
+ 				 gint n_targets,
+ 				 GdkDragAction actions)
+ {
++    	RbTreeDndData *priv_data;
+  	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ 
+-	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
++	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
+ 
+ 	if (!priv_data->button_press_event_handler) {
+ 
+@@ -746,9 +747,10 @@
+ 			       gint n_targets,
+ 			       GdkDragAction actions)
+ {
++    	RbTreeDndData *priv_data;
+ 	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ 
+-	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
++	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
+ 
+ 	if (!priv_data->drag_leave_handler) {
+ 
diff --git a/audio/rhythmbox-devel/files/patch-sources_rb-library-source.c b/audio/rhythmbox-devel/files/patch-sources_rb-library-source.c
deleted file mode 100644
index 9872b5751d18..000000000000
--- a/audio/rhythmbox-devel/files/patch-sources_rb-library-source.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sources/rb-library-source.c.orig	Thu Oct 23 22:18:14 2003
-+++ sources/rb-library-source.c	Thu Oct 23 22:18:24 2003
-@@ -1358,9 +1358,9 @@
- static void
- query_complete_cb (RhythmDBQueryModel *model, RBLibrarySource *source)
- {
--	rb_debug ("query complete");
- 	struct RBLibrarySourceQueryCompleteData *data
- 		= g_new0 (struct RBLibrarySourceQueryCompleteData, 1);
-+	rb_debug ("query complete");
- 	data->model = model;
- 	data->source = source;
- 	g_object_ref (G_OBJECT (model));
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index cd62632a7f4e..197109570324 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.5.88
+PORTVERSION=	0.6.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@freebsd.org
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index af3cca36ef4d..e82342d64f5a 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1 +1 @@
-MD5 (gnome2/rhythmbox-0.5.88.tar.bz2) = b45000cc256f8ff31c5e2b1ebcf6c315
+MD5 (gnome2/rhythmbox-0.6.0.tar.bz2) = 4b2f613f3a9f0e66facdc571867093c1
diff --git a/audio/rhythmbox/files/patch-lib_rb-tree-dnd.c b/audio/rhythmbox/files/patch-lib_rb-tree-dnd.c
new file mode 100644
index 000000000000..5ce40a753dd3
--- /dev/null
+++ b/audio/rhythmbox/files/patch-lib_rb-tree-dnd.c
@@ -0,0 +1,26 @@
+--- lib/rb-tree-dnd.c.orig	Tue Nov 11 20:58:54 2003
++++ lib/rb-tree-dnd.c	Tue Nov 11 20:59:17 2003
+@@ -710,9 +710,10 @@
+ 				 gint n_targets,
+ 				 GdkDragAction actions)
+ {
++    	RbTreeDndData *priv_data;
+  	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ 
+-	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
++	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
+ 
+ 	if (!priv_data->button_press_event_handler) {
+ 
+@@ -746,9 +747,10 @@
+ 			       gint n_targets,
+ 			       GdkDragAction actions)
+ {
++    	RbTreeDndData *priv_data;
+ 	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ 
+-	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
++	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
+ 
+ 	if (!priv_data->drag_leave_handler) {
+ 
diff --git a/audio/rhythmbox/files/patch-sources_rb-library-source.c b/audio/rhythmbox/files/patch-sources_rb-library-source.c
deleted file mode 100644
index 9872b5751d18..000000000000
--- a/audio/rhythmbox/files/patch-sources_rb-library-source.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sources/rb-library-source.c.orig	Thu Oct 23 22:18:14 2003
-+++ sources/rb-library-source.c	Thu Oct 23 22:18:24 2003
-@@ -1358,9 +1358,9 @@
- static void
- query_complete_cb (RhythmDBQueryModel *model, RBLibrarySource *source)
- {
--	rb_debug ("query complete");
- 	struct RBLibrarySourceQueryCompleteData *data
- 		= g_new0 (struct RBLibrarySourceQueryCompleteData, 1);
-+	rb_debug ("query complete");
- 	data->model = model;
- 	data->source = source;
- 	g_object_ref (G_OBJECT (model));