summaryrefslogtreecommitdiffstats
path: root/x11-toolkits/gtk20/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/gtk20/files')
-rw-r--r--x11-toolkits/gtk20/files/patch-ad23
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c12
2 files changed, 6 insertions, 29 deletions
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
deleted file mode 100644
index e9e4f314a..000000000
--- a/x11-toolkits/gtk20/files/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ad,v 1.13 2004/04/05 03:11:37 marcus Exp $
-
---- 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-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
index 9100294fe..d393bd3df 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
@@ -1,16 +1,16 @@
---- gtk/gtkiconcache.c.orig Mon Nov 22 21:39:32 2004
-+++ gtk/gtkiconcache.c Mon Nov 22 21:39:53 2004
-@@ -20,6 +20,8 @@
- #include <config.h>
+--- 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>
-@@ -27,8 +29,6 @@
- #ifdef G_OS_WIN32
+@@ -29,8 +31,6 @@
+ #include <windows.h>
#include <io.h>
#endif
-#include <sys/types.h>