ports/131712: [patch] audio/rhythmbox-devel fix build with libmtp

[Junji NAKANISHI]

>Number:         131712
>Category:       ports
>Synopsis:       [patch] audio/rhythmbox-devel fix build with libmtp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 15 14:40:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Junji NAKANISHI
>Release:        FreeBSD 7.1-STABLE i386
>Organization:
>Environment:


System: FreeBSD 7.1-STABLE #1: Thu Jan 22 18:11:04 JST 2009
    root at blackmagic.daemonfreaks.local:/usr/src/sys/i386/compile/BLACKMAGIC



>Description:


rhythmobox-devel does not compile if libmtp installed.
I created a patch.


>How-To-Repeat:


cd /usr/ports/audio/libmtp && make install
cd /usr/ports/audio/rhythmbox-devel && make install


>Fix:


--- rhythmbox-devel.patch begins here ---
diff -urN rhythmbox-devel.orig/files/patch-plugins_mtpdevice_rb-mtp-source.c rhythmbox-devel/files/patch-plugins_mtpdevice_rb-mtp-source.c
--- rhythmbox-devel.orig/files/patch-plugins_mtpdevice_rb-mtp-source.c	1970-01-01 09:00:00.000000000 +0900
+++ rhythmbox-devel/files/patch-plugins_mtpdevice_rb-mtp-source.c	2009-02-15 23:17:44.000000000 +0900
@@ -0,0 +1,20 @@
+--- plugins/mtpdevice/rb-mtp-source.c.orig	2009-02-15 22:33:07.000000000 +0900
++++ plugins/mtpdevice/rb-mtp-source.c	2009-02-15 22:35:14.000000000 +0900
+@@ -357,7 +357,7 @@
+ 
+ 	g_assert (db != NULL);
+ 
+-	tracks = LIBMTP_Get_Tracklisting (priv->device);
++	tracks = LIBMTP_Get_Tracklisting_With_Callback (priv->device, NULL, NULL);
+ 	if (tracks != NULL) {
+ 		LIBMTP_track_t *track, *tmp = NULL;
+ 		for (track = tracks; track != NULL; track = track->next) {
+@@ -714,7 +714,7 @@
+ 		trackmeta->filetype = mimetype_to_filetype (mimetype);
+ 	}
+ 
+-	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL, 0) != 0) {
++	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL) != 0) {
+ 		LIBMTP_destroy_track_t (trackmeta);
+ 		rb_debug ("Tracktransfer failed\n");
+ 		return NULL;
--- rhythmbox-devel.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: