Re: [Rhythmbox-devel] Rhythmbox on amd64

[Benjamin Schindler <config gmx ch>]

On Sat, 2004-02-14 at 01:08, Colin Walters wrote:
> On Fri, 2004-02-13 at 18:50, Benjamin Schindler wrote:
> > I've attached a patch for 0.6.5 for those who want it. 
> 
> The libintl changes aren't part of the fix - that was just something I
> needed to do on your machine to get Rhythmbox to compile with -Wall
> -Werror.
> 
> ngettext for some reason wasn't being prototyped by
> <libgnome/gnome-i18n.h> on your machine.

Ok, here is a corrected version... I'm sorry - didn't know about this.
Only in rhythmbox-0.6.5/help/C: authors.xml
diff -ur rhythmbox-0.6.5/lib/rb-util.c rhythmbox-0.6.5-patched/lib/rb-util.c
--- rhythmbox-0.6.5/lib/rb-util.c	2004-01-18 03:57:40.000000000 +0100
+++ rhythmbox-0.6.5-patched/lib/rb-util.c	2004-02-13 22:52:14.000000000 +0100
@@ -22,13 +22,13 @@
 #include "rb-util.h"
 
 gboolean
-rb_true_function (gpointer dummy, ...)
+rb_true_function (gpointer dummy)
 {
 	return TRUE;
 }
 
 gboolean
-rb_false_function (gpointer dummy, ...)
+rb_false_function (gpointer dummy)
 {
 	return FALSE;
 }
diff -ur rhythmbox-0.6.5/lib/rb-util.h rhythmbox-0.6.5-patched/lib/rb-util.h
--- rhythmbox-0.6.5/lib/rb-util.h	2004-01-18 03:57:40.000000000 +0100
+++ rhythmbox-0.6.5-patched/lib/rb-util.h	2004-02-13 22:51:45.000000000 +0100
@@ -28,8 +28,8 @@
 
 G_BEGIN_DECLS
 
-gboolean rb_true_function (gpointer dummy, ...);
-gboolean rb_false_function (gpointer dummy, ...);
+gboolean rb_true_function (gpointer dummy);
+gboolean rb_false_function (gpointer dummy);
 
 gboolean rb_gvalue_compare (GValue *a, GValue *b);
 
Only in rhythmbox-0.6.5/monkey-media: monkey-media-includes.h
Only in rhythmbox-0.6.5/monkey-media: monkey-media-marshal.c
Only in rhythmbox-0.6.5/monkey-media: monkey-media-marshal.h
diff -ur rhythmbox-0.6.5/monkey-media/monkey-media-player-gst-tmp.c rhythmbox-0.6.5-patched/monkey-media/monkey-media-player-gst-tmp.c
--- rhythmbox-0.6.5/monkey-media/monkey-media-player-gst-tmp.c	2004-01-18 03:57:40.000000000 +0100
+++ rhythmbox-0.6.5-patched/monkey-media/monkey-media-player-gst-tmp.c	2004-02-13 21:12:12.000000000 +0100
@@ -347,7 +347,7 @@
 {
 	char *ret = NULL, *cset;
 	va_list args;
-	int bytes_read, bytes_written;
+	gsize bytes_read, bytes_written;
 
 	if (g_utf8_validate (str, len, NULL))
 		return g_strndup (str, len >= 0 ? len : strlen (str));
@@ -356,10 +356,10 @@
 	while ((cset = va_arg (args, char *)) != NULL)
 	{
 		if (!strcmp (cset, "locale"))
-			ret = g_locale_to_utf8 (str, len, &bytes_read,
+			ret = g_locale_to_utf8 (str, (gsize) len, &bytes_read,
 						&bytes_written, NULL);
 		else
-			ret = g_convert (str, len, "UTF-8", cset,
+			ret = g_convert (str, (gsize) len, "UTF-8", cset,
 					 &bytes_read, &bytes_written, NULL);
 		if (ret)
 			break;
Only in rhythmbox-0.6.5-patched: readme
Only in rhythmbox-0.6.5: rhythmbox.spec