--- ./demos/gtk-demo/Makefile.in	Tue Mar 16 12:26:54 2004
+++ ../gtk+-2.4.0/./demos/gtk-demo/Makefile.in	Tue May 11 17:07:55 2004
@@ -338,7 +338,7 @@
 
 
 gtk_demo_DEPENDENCIES = $(DEPS)
-gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDADD = $(LDADDS) -lpango-1.0 -lpangox-1.0
 
 IMAGEFILES = alphatest.png		\
 	        apple-red.png		\
--- ./gdk-pixbuf/io-png.c	Wed Jan  7 12:41:23 2004
+++ ../gtk+-2.4.0/./gdk-pixbuf/io-png.c	Tue May 11 17:11:03 2004
@@ -216,7 +216,11 @@
                 *key = g_strconcat ("tEXt::", text_ptr.key, NULL);
                 return TRUE;
         } else {
-                g_warning ("Couldn't convert text chunk value to UTF-8.");
+                /*
+                 * Remove this annoying warning until UTF
+                 * is fixed in libiconv.
+                 */
+                /* g_warning ("Couldn't convert text chunk value to UTF-8."); */
                 *key = NULL;
                 return FALSE;
         }
@@ -316,10 +320,12 @@
 
         if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_texts)) {
                 for (i = 0; i < num_texts; i++) {
-                        png_text_to_pixbuf_option (text_ptr[i], &key, &value);
-                        gdk_pixbuf_set_option (pixbuf, key, value);
-                        g_free (key);
-                        g_free (value);
+                        if (png_text_to_pixbuf_option (text_ptr[i],
+                                                       &key, &value)) {
+                                gdk_pixbuf_set_option (pixbuf, key, value);
+                                g_free (key);
+                                g_free (value);
+                        }
                 }
         }
 
--- ./gdk-pixbuf/pixops/Makefile.in	Tue Mar 16 12:26:56 2004
+++ ../gtk+-2.4.0/./gdk-pixbuf/pixops/Makefile.in	Tue May 11 17:07:55 2004
@@ -315,7 +315,7 @@
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 
 libpixops_la_LDFLAGS =
-libpixops_la_LIBADD =
+libpixops_la_LIBADD = -static
 am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \
 	have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \
 	composite_line_color_22_4a4_mmx.S
--- ./gdk/x11/Makefile.in	Tue Mar 16 12:26:59 2004
+++ ../gtk+-2.4.0/./gdk/x11/Makefile.in	Tue May 11 17:07:55 2004
@@ -356,7 +356,7 @@
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 
 libgdk_x11_la_LDFLAGS =
-libgdk_x11_la_LIBADD =
+libgdk_x11_la_LIBADD = @GDK_PIXBUF_XLIB_DEP_LIBS@ -static
 am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkasync.c gdkasync.h \
 	gdkcolor-x11.c gdkcursor-x11.c gdkdisplay-x11.c \
 	gdkdisplay-x11.h gdkdnd-x11.c gdkdrawable-x11.c \
--- ./gtk/Makefile.in	Tue Mar 16 12:26:59 2004
+++ ../gtk+-2.4.0/./gtk/Makefile.in	Tue May 11 17:07:55 2004
@@ -839,7 +839,7 @@
 libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
 
-libgtk_x11_2_0_la_LIBADD = $(libadd)
+libgtk_x11_2_0_la_LIBADD = $(libadd) -latk-1.0
 libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
 libgtk_win32_2_0_la_LIBADD = $(libadd) $(gtk_win32res_lo)
 libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
@@ -863,7 +863,7 @@
 bin_PROGRAMS = gtk-query-immodules-2.0
 
 gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS) -lpango-1.0 -lpangox-1.0
 
 gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 subdir = gtk
--- ./gtk/xdgmime/Makefile.in	Tue Mar 16 12:27:00 2004
+++ ../gtk+-2.4.0/./gtk/xdgmime/Makefile.in	Tue May 11 17:07:55 2004
@@ -300,7 +300,7 @@
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 
 libxdgmime_la_LDFLAGS =
-libxdgmime_la_LIBADD =
+libxdgmime_la_LIBADD = -static
 am_libxdgmime_la_OBJECTS = xdgmime.lo xdgmimeglob.lo xdgmimeint.lo \
 	xdgmimemagic.lo
 libxdgmime_la_OBJECTS = $(am_libxdgmime_la_OBJECTS)
--- ./ltmain.sh	Tue Feb 17 11:55:01 2004
+++ ../gtk+-2.4.0/./ltmain.sh	Tue May 11 17:07:55 2004
@@ -64,7 +64,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./tests/Makefile.in	Tue Mar 16 12:27:02 2004
+++ ../gtk+-2.4.0/./tests/Makefile.in	Tue May 11 17:07:55 2004
@@ -370,13 +370,13 @@
 testactions_DEPENDENCIES = $(TEST_DEPS)
 
 simple_LDADD = $(LDADDS)
-testcalendar_LDADD = $(LDADDS)
+testcalendar_LDADD = $(LDADDS) -lpango-1.0 -lpangox-1.0
 testcombo_LDADD = $(LDADDS)
 testcombochange_LDADD = $(LDADDS)
 testdnd_LDADD = $(LDADDS)
 testentrycompletion_LDADD = $(LDADDS)
 testfilechooser_LDADD = $(LDADDS)
-testgtk_LDADD = $(LDADDS)
+testgtk_LDADD = $(LDADDS) -lpango-1.0 -lpangox-1.0
 testicontheme_LDADD = $(LDADDS)
 testinput_LDADD = $(LDADDS)
 testmenus_LDADD = $(LDADDS)
@@ -391,12 +391,12 @@
 testtoolbar_LDADD = $(LDADDS)
 stresstest_toolbar_LDADD = $(LDADDS)
 testtreeedit_LDADD = $(LDADDS)
-testtreeview_LDADD = $(LDADDS)
+testtreeview_LDADD = $(LDADDS) -lpango-1.0 -lpangox-1.0
 testtreefocus_LDADD = $(LDADDS)
 testtreeflow_LDADD = $(LDADDS)
 testtreecolumns_LDADD = $(LDADDS)
 testtreesort_LDADD = $(LDADDS)
-testtext_LDADD = $(LDADDS)
+testtext_LDADD = $(LDADDS) -lpango-1.0 -lpangox-1.0
 treestoretest_LDADD = $(LDADDS)
 testxinerama_LDADD = $(LDADDS)
 pixbuf_read_LDADD = $(LDADDS)