diff -Naur gtk+-2.0.5.old/configure gtk+-2.0.5.new/configure
--- gtk+-2.0.5.old/configure	Sun Jun 16 13:58:22 2002
+++ gtk+-2.0.5.new/configure	Sun Jun 23 02:06:02 2002
@@ -5160,7 +5160,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -14483,7 +14483,7 @@
 
     if $have_freetype ; then
       gtk_save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+      CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
 
       echo "$as_me:$LINENO: checking For sufficiently new FreeType (at least 2.0.1)" >&5
 echo $ECHO_N "checking For sufficiently new FreeType (at least 2.0.1)... $ECHO_C" >&6
diff -Naur gtk+-2.0.5.old/demos/gtk-demo/main.c gtk+-2.0.5.new/demos/gtk-demo/main.c
--- gtk+-2.0.5.old/demos/gtk-demo/main.c	Fri May 17 04:00:25 2002
+++ gtk+-2.0.5.new/demos/gtk-demo/main.c	Sun Jun 23 02:06:02 2002
@@ -96,7 +96,7 @@
     {
       int c;
       
-#ifndef G_OS_WIN32
+#ifdef HAVE_FLOCKFILE
       c = getc_unlocked (stream);
 #else
       c = getc (stream);
diff -Naur gtk+-2.0.5.old/gdk/x11/gdkdrawable-x11.c gtk+-2.0.5.new/gdk/x11/gdkdrawable-x11.c
--- gtk+-2.0.5.old/gdk/x11/gdkdrawable-x11.c	Thu Apr 18 07:55:01 2002
+++ gtk+-2.0.5.new/gdk/x11/gdkdrawable-x11.c	Sun Jun 23 02:06:02 2002
@@ -853,6 +853,7 @@
     }
   else
     {
+      /* RGBA */
       pf.direct.alpha = 0;
     }
   
@@ -869,10 +870,18 @@
    * RENDER's preferred order
    */
   pf.direct.alphaMask = 0;
-  /* ARGB */
-  pf.direct.red = 16;
-  pf.direct.green = 8;
-  pf.direct.blue = 0;
+  if (ImageByteOrder (xdisplay) == LSBFirst)
+    {
+      /* ARGB */
+      pf.direct.red = 16;
+      pf.direct.green = 8;
+      pf.direct.blue = 0;
+    } else {
+      /* BGRA */
+      pf.direct.red = 8;
+      pf.direct.green = 16;
+      pf.direct.blue = 24;
+    }
   
   *format = XRenderFindFormat (xdisplay,
 			       (PictFormatType | PictFormatDepth |
@@ -884,7 +893,14 @@
 			       0);
 
   pf.direct.alphaMask = 0xff;
-  pf.direct.alpha = 24;
+  if (ImageByteOrder (xdisplay) == LSBFirst)
+    {
+      /* ARGB */
+      pf.direct.alpha = 24;
+    } else {
+      /* BGRA */
+      pf.direct.alpha = 0;
+    }
   
   *mask = XRenderFindFormat (xdisplay,
 			     (PictFormatType | PictFormatDepth |
@@ -901,11 +917,19 @@
 
   pf.type = PictTypeDirect;
   pf.depth = 32;
-  pf.direct.red = 16;
-  pf.direct.green = 8;
-  pf.direct.blue = 0;
+  if (ImageByteOrder (xdisplay) == LSBFirst)
+    {
+      pf.direct.red = 16;
+      pf.direct.green = 8;
+      pf.direct.blue = 0;
+      pf.direct.alpha = 24;
+    } else {
+      pf.direct.red = 8;
+      pf.direct.green = 16;
+      pf.direct.blue = 24;
+      pf.direct.alpha = 0;
+    }
   pf.direct.alphaMask = 0xff;
-  pf.direct.alpha = 24;
 
   *format = XRenderFindFormat (xdisplay,
 			       (PictFormatType | PictFormatDepth |
diff -Naur gtk+-2.0.5.old/ltmain.sh gtk+-2.0.5.new/ltmain.sh
--- gtk+-2.0.5.old/ltmain.sh	Fri Apr 26 18:23:44 2002
+++ gtk+-2.0.5.new/ltmain.sh	Sun Jun 23 02:06:02 2002
@@ -2952,7 +2952,12 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  save_deplibs="$deplibs"
+	  for conv in $convenience; do
+	    deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+	  done
 	  eval cmds=\"$archive_cmds\"
+	  deplibs="$save_deplibs"
 	fi
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
@@ -4006,10 +4011,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
+#	  if test "$installed" = no && test "$need_relink" = yes; then
+#	    $echo >> $output "\
+#relink_command=\"$relink_command\""
+#	  fi
 	done
       fi
 
diff -Naur gtk+-2.0.5.old/modules/input/Makefile.in gtk+-2.0.5.new/modules/input/Makefile.in
--- gtk+-2.0.5.old/modules/input/Makefile.in	Sun Jun 16 14:16:30 2002
+++ gtk+-2.0.5.new/modules/input/Makefile.in	Sun Jun 23 02:06:02 2002
@@ -777,13 +777,13 @@
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-# Running this if DESTDIR is set is going to not work at all, so
-# skip it.
 install-data-local:
-	if [ -z "$(DESTDIR)" ] ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
-        fi
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 &&	\
+	$(top_builddir)/gtk/gtk-query-immodules-2.0		\
+		$(DESTDIR)$(moduledir)/*			\
+		| sed -e 's|$(DESTDIR)||g'			\
+		>$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules	\
+		2>/dev/null
 
 gtk.immodules: Makefile.am $(module_LTLIBRARIES)
 	$(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules