[Patch] FTBFS - ia64, s390 and possibly others

Hi, 
  The Debian build machines are having trouble building from source on
some architectures (ia64, s390, and possibly others still waiting to
try). The following patch has been suggested to fix this, with reported
success (both build and running). Please check and apply to cvs.


--- mozilla/FilePicker.cpp.orig 2003-04-16 10:55:09.000000000 -0600
+++ mozilla/FilePicker.cpp      2003-04-16 10:56:19.000000000 -0600
@@ -147,8 +147,8 @@
 {
        guint bytesRead(0), bytesWritten(0);
        gchar *utf8DefaultString = g_filename_to_utf8(mDefaultString.get(), -1,
-                                                     &bytesRead,
-                                                     &bytesWritten, NULL);
+                                                     (gsize *)&bytesRead,
+                                                     (gsize *)&bytesWritten, NULL);
 
        *aDefaultString = ToNewUnicode(NS_ConvertUTF8toUCS2(utf8DefaultString));        g_free(utf8DefaultString);
@@ -162,8 +162,8 @@
                guint bytesRead(0), bytesWritten(0);
                gchar *localeDefaultString =
                        g_filename_from_utf8(NS_ConvertUCS2toUTF8(aDefaultString).get(),
-                                            -1, &bytesRead,
-                                            &bytesWritten, NULL);
+                                            -1, (gsize *)&bytesRead,
+                                            (gsize *)&bytesWritten, NULL);
                mDefaultString = localeDefaultString;                           
             
                g_free(localeDefaultString);
        }

==== tail of build log ====
g++ -DHAVE_CONFIG_H -I. -I../../mozilla -I.. -I../../utils -I../utils
-I../../embed -I../../bookmarks -I../..
-I/usr/include/mozilla/gtkembedmoz -I/usr/include/mozilla/xpcom
-I/usr/include/mozilla/string -I/usr/include/mozilla/nspr
-I/usr/include/mozilla -I/usr/include/mozilla/appcomps
-I/usr/include/mozilla/caps -I/usr/include/mozilla/content
-I/usr/include/mozilla/cookie -I/usr/include/mozilla/docshell
-I/usr/include/mozilla/dom -I/usr/include/mozilla/exthandler
-I/usr/include/mozilla/find -I/usr/include/mozilla/gfx
-I/usr/include/mozilla/helperAppDlg -I/usr/include/mozilla/java
-I/usr/include/mozilla/js -I/usr/include/mozilla/jsconsole
-I/usr/include/mozilla/layout -I/usr/include/mozilla/mimetype
-I/usr/include/mozilla/mozxfer -I/usr/include/mozilla/necko
-I/usr/include/mozilla/necko2 -I/usr/include/mozilla/nkcache
-I/usr/include/mozilla/oji -I/usr/include/mozilla/pref
-I/usr/include/mozilla/progressDlg -I/usr/include/mozilla/sidebar
-I/usr/include/mozilla/shistory -I/usr/
 include/mozilla/typeaheadfind -I/usr/include/mozilla/uconv
-I/usr/include/mozilla/uriloader -I/usr/include/mozilla/unicharutil
-I/usr/include/mozilla/wallet -I/usr/include/mozilla/webbrowserpersist
-I/usr/include/mozilla/webbrwsr -I/usr/include/mozilla/webshell
-I/usr/include/mozilla/widget -I/usr/include/mozilla/windowwatcher
-I/usr/include/mozilla/xpconnect -DORBIT2=1 -pthread
-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0
-I/usr/include/pango-1.0 -I/usr/include/freetype2
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0
-I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0
-I/usr/include/libart-2.0 -I/usr/include/gconf/2
-I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0
-I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0
-I/usr/lib/gnome-vfs-2.0/include -I/usr/include/linc-1.0
-I/usr/include/bonobo-activation-2.0 -I/usr/include/libglade-2.0
-I/usr/include/gnome-vfs-module-
 2.0 -I/usr/include/eel-2 -I/usr/include/gail-1.0
-DLIB_DIR=\"/usr/lib/galeon\" -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-DSHARE_DIR=\"/usr/share/galeon\" -D_GNU_SOURCE=1 -include
/usr/include/mozilla/mozilla-config.h -fno-rtti -g -O2
-DDEBIAN_VERSION=\"1.3.3.20030414-1\" -Wall -Wmissing-declarations
-Wmissing-prototypes -Wsign-compare -Wno-deprecated -fshort-wchar -c
../../mozilla/FilePicker.cpp -MT FilePicker.lo -MD -MP -MF
.deps/FilePicker.TPlo  -fPIC -DPIC -o FilePicker.lo
../../mozilla/FilePicker.cpp: In member function `virtual nsresult 
   GFilePicker::GetDefaultString(PRUnichar**)':
../../mozilla/FilePicker.cpp:151: cannot convert `guint*' to `gsize*'
for 
   argument `3' to `gchar* g_filename_to_utf8(const gchar*, long int,
gsize*, 
   gsize*, GError**)'
make[3]: *** [FilePicker.lo] Error 1
make[3]: Leaving directory `/tmp/galeon-1.3.3.20030414/build/mozilla'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/galeon-1.3.3.20030414/build'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/galeon-1.3.3.20030414/build'
make: *** [build-stamp] Error 2

-- 
  .''`. Mark Howard
 : :' :
 `. `'  http://www.tildemh.com 
   `-   [email protected] | [email protected] | [email protected] 



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf