8 files changed, 70 insertions, 86 deletions
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
deleted file mode 100644
index 59fee01c4973..000000000000
--- a/x11-toolkits/gtk20/files/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- gtk/gtkrc.c.orig	Thu Dec 13 21:51:18 2001
-+++ gtk/gtkrc.c	Fri Jan 18 11:14:14 2002
-@@ -336,7 +336,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL);
-     }
- 
-   return result;
-@@ -418,7 +418,7 @@
-     }
-   else
-     {
--      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL);
- 
-       gtk_rc_add_default_file (str);
-       g_free (str);
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
deleted file mode 100644
index b34d2b3f24b6..000000000000
--- a/x11-toolkits/gtk20/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk/Makefile.in.orig	Fri Oct 24 21:45:12 2003
-+++ gtk/Makefile.in	Fri Oct 24 21:46:49 2003
-@@ -301,7 +301,7 @@
- 	-DGTK_LIBDIR=\"$(libdir)\"			\
- 	-DGTK_DATADIR=\"$(datadir)\"			\
- 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
--	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
-+	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DGTK_HOST=\"$(host)\"				\
-@@ -856,6 +856,7 @@
- TEST_DEPS = $(DEPS) gtk.immodules
- 
- LDADDS = \
-+	$(GLIB_LIBS)							\
- 	$(gtktargetlib)							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/$(gdktargetlib)
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
index c2cb10b5478c..1bedfdf55f2c 100644
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -1,13 +1,15 @@
---- gdk-pixbuf/Makefile.in.orig	Thu Nov 20 15:39:55 2003
-+++ gdk-pixbuf/Makefile.in	Thu Nov 20 15:40:17 2003
-@@ -517,7 +517,9 @@
+--- gdk-pixbuf/Makefile.in.orig	Wed Mar  2 15:56:36 2005
++++ gdk-pixbuf/Makefile.in	Wed Mar  2 15:57:08 2005
+@@ -519,10 +519,10 @@
  
+ bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+-gdk_pixbuf_csource_LDADD = $(LDADDS)
++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
  
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
--LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-+LDADDS = \
-+	 $(GLIB_LIBS)				\
-+	 libgdk_pixbuf-$(GTK_API_VERSION).la
+ gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
+-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
  
- noinst_PROGRAMS = test-gdk-pixbuf
- test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
new file mode 100644
index 000000000000..44589795f769
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -0,0 +1,17 @@
+--- gtk/Makefile.in.orig	Wed Mar  2 15:57:44 2005
++++ gtk/Makefile.in	Wed Mar  2 15:58:22 2005
+@@ -887,12 +887,12 @@
+ bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+ 
+ gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
+-gtk_query_immodules_2_0_LDADD = $(LDADDS)
++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ gtk_query_immodules_2_0_SOURCES = queryimmodules.c
+ 
+ gtk_update_icon_cache_DEPENDENCIES = $(DEPS)
+-gtk_update_icon_cache_LDADD = $(LDADDS)
++gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ subdir = gtk
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c
new file mode 100644
index 000000000000..e725de399cff
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c
@@ -0,0 +1,13 @@
+--- gtk/gtkentry.c.orig	Wed Aug 25 12:44:23 2004
++++ gtk/gtkentry.c	Wed Aug 25 12:44:52 2004
+@@ -1670,8 +1670,9 @@
+ 				    event->x + entry->scroll_offset, event->y))
+ 	{
+ 	  GdkDragContext *context;
++	  guint actions;
+ 	  GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
+-	  guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY;
++	  actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY;
+ 
+ 	  gtk_target_list_add_text_targets (target_list);
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
new file mode 100644
index 000000000000..d393bd3dfa8d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
@@ -0,0 +1,20 @@
+--- gtk/gtkiconcache.c.orig	Sun Dec 12 16:09:13 2004
++++ gtk/gtkiconcache.c	Thu Dec 16 17:09:23 2004
+@@ -21,6 +21,8 @@
+ #include "gtkdebug.h"
+ #include "gtkiconcache.h"
+ #include <glib/gstdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #ifdef HAVE_MMAP
+ #include <sys/mman.h>
+@@ -29,8 +31,6 @@
+ #include <windows.h>
+ #include <io.h>
+ #endif
+-#include <sys/types.h>
+-#include <sys/stat.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
deleted file mode 100644
index 07bb57a6d022..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gtk/gtkicontheme.c.orig	Thu Jan 29 16:53:42 2004
-+++ gtk/gtkicontheme.c	Thu Jan 29 16:54:56 2004
-@@ -526,7 +526,7 @@
- 
-   priv->custom_theme = FALSE;
-   priv->current_theme = g_strdup (DEFAULT_THEME_NAME);
--  priv->search_path = g_new (char *, 5);
-+  priv->search_path = g_new (char *, 7);
-   
- 
-   priv->search_path[0] = g_build_filename (g_get_home_dir (),
-@@ -534,9 +534,11 @@
- 					   NULL);
-   priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL);
-   priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL);
--  priv->search_path[3] = g_strdup ("/usr/share/icons");
--  priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
--  priv->search_path_len = 5;
-+  priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL);
-+  priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL);
-+  priv->search_path[5] = g_strdup ("/usr/share/icons");
-+  priv->search_path[6] = g_strdup ("/usr/share/pixmaps");
-+  priv->search_path_len = 7;
- 
-   priv->themes_valid = FALSE;
-   priv->themes = NULL;
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
index 76c5eea6c35b..b39aaedd07b5 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -1,11 +1,11 @@
---- gtk/xdgmime/xdgmime.c.orig	Wed Jun 23 20:19:43 2004
-+++ gtk/xdgmime/xdgmime.c	Wed Jun 23 20:19:56 2004
-@@ -98,7 +98,7 @@
+--- gtk/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
++++ gtk/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
+@@ -204,7 +204,7 @@
  
-       xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-       if (xdg_data_dirs == NULL)
--	xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+	xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
+   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+   if (xdg_data_dirs == NULL)
+-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
  
-       ptr = xdg_data_dirs;
+   ptr = xdg_data_dirs;