Actually help these guys out as work will allow, and convert gtk20 from

share/gnome to share/ .


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8631 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 181 insertions, 0 deletions

diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
new file mode 100644
index 000000000..307fd6fc2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Aug  3 18:09:32 2005
++++ Makefile.in	Wed Aug  3 18:10:01 2005
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
new file mode 100644
index 000000000..88bfe209d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in	Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
new file mode 100644
index 000000000..a04d08ef5
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig	Fri Oct 24 23:38:06 2003
++++ docs/reference/Makefile.in	Fri Oct 24 23:48:00 2003
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk
++SUBDIRS = #gdk-pixbuf gdk gtk
+ subdir = docs/reference
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
new file mode 100644
index 000000000..2043ab10f
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.10 2006/10/14 08:35:01 marcus Exp $
+  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+
+--- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
++++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
+@@ -315,7 +315,7 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0
+ 
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
new file mode 100644
index 000000000..1bedfdf55
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,15 @@
+--- 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)
+ 
+ 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
+ 
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 000000000..610ece8f3
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -0,0 +1,16 @@
+--- gtk/Makefile.in.orig	Sat May  6 04:47:11 2006
++++ gtk/Makefile.in	Sat May  6 04:48:06 2006
+@@ -1009,11 +1009,11 @@ LDADDS = \
+ 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_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+ 
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ 
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 000000000..f875c2e79
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
@@ -0,0 +1,49 @@
+--- gtk/gtkiconcache.c.orig	Mon Aug 29 07:05:13 2005
++++ gtk/gtkiconcache.c	Sat Nov 19 19:14:10 2005
+@@ -75,6 +75,37 @@
+     }
+ }
+ 
++static gboolean
++is_uptodate (const char *dirname, time_t cache_mtime)
++{
++  GDir *dir;
++  const char *filename;
++  gboolean uptodate = TRUE;
++
++  dir = g_dir_open (dirname, 0, NULL);
++  if (! dir)
++    return TRUE;
++
++  while (uptodate && (filename = g_dir_read_name (dir)))
++    if (filename[0] != '.')
++      {
++	char *pathname;
++	struct stat st;
++
++	pathname = g_build_filename (dirname, filename, NULL);
++	if (g_stat (pathname, &st) >= 0
++	    && (cache_mtime < st.st_mtime
++		|| (S_ISDIR (st.st_mode)
++		    && ! is_uptodate (pathname, cache_mtime))))
++	    uptodate = FALSE;
++	g_free(pathname);
++      }
++
++  g_dir_close(dir);
++
++  return uptodate;
++}
++
+ GtkIconCache *
+ _gtk_icon_cache_new_for_path (const gchar *path)
+ {
+@@ -106,7 +137,7 @@
+     goto done;
+ 
+   /* Verify cache is uptodate */
+-  if (st.st_mtime < path_st.st_mtime)
++  if (st.st_mtime < path_st.st_mtime || ! is_uptodate(path, st.st_mtime))
+     {
+       GTK_NOTE (ICONTHEME, 
+ 		g_print ("cache outdated\n"));
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
new file mode 100644
index 000000000..1dbbaf471
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -0,0 +1,11 @@
+--- 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 = "/usr/local/share/:%%X11BASE%%/share/";
+ 
+   ptr = xdg_data_dirs;
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
new file mode 100644
index 000000000..ed81f9280
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
@@ -0,0 +1,17 @@
+--- gtk/xdgmime/xdgmime.h.orig	Sat Oct  7 10:42:32 2006
++++ gtk/xdgmime/xdgmime.h	Sat Oct  7 11:01:57 2006
+@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy)  (void *u
+ #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
+ #define xdg_mime_is_valid_mime_type           XDG_ENTRY(is_valid_mime_type)
+ #define xdg_mime_mime_type_equal              XDG_ENTRY(mime_type_equal)
++#define _xdg_mime_mime_type_equal             XDG_ENTRY(mime_type_equal_p)
+ #define xdg_mime_media_type_equal             XDG_ENTRY(media_type_equal)
+ #define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_type_subclass)
++#define _xdg_mime_mime_type_subclass          XDG_ENTRY(mime_type_subclass_p)
+ #define xdg_mime_get_mime_parents             XDG_ENTRY(get_mime_parents)
+ #define xdg_mime_list_mime_parents            XDG_ENTRY(list_mime_parents)
+ #define xdg_mime_unalias_mime_type            XDG_ENTRY(unalias_mime_type)
++#define _xdg_mime_unalias_mime_type           XDG_ENTRY(unalias_mime_type_p)
+ #define xdg_mime_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
+ #define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
+ #define xdg_mime_dump                         XDG_ENTRY(dump)
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
new file mode 100644
index 000000000..266d74c22
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -0,0 +1,25 @@
+--- gtk/xdgmime/xdgmimecache.h.orig	Mon May 29 20:04:24 2006
++++ gtk/xdgmime/xdgmimecache.h	Mon May 29 20:11:42 2006
+@@ -32,9 +32,19 @@
+ typedef struct _XdgMimeCache XdgMimeCache;
+ 
+ #ifdef XDG_PREFIX
+-#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
+-#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
+-#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
++#define _xdg_mime_cache_new_from_file                XDG_ENTRY(cache_new_from_file)
++#define _xdg_mime_cache_ref                          XDG_ENTRY(cache_ref)
++#define _xdg_mime_cache_unref                        XDG_ENTRY(cache_unref)
++#define _xdg_mime_cache_get_mime_type_for_data       XDG_ENTRY(cache_get_mime_type_for_data)
++#define _xdg_mime_cache_get_mime_type_for_file       XDG_ENTRY(cache_get_mime_type_for_file)
++#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
++#define _xdg_mime_cache_is_valid_mime_type           XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal              XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal             XDG_ENTRY(cache_media_type_equal)
++#define _xdg_mime_cache_mime_type_subclass           XDG_ENTRY(cache_mime_type_subclass)
++#define _xdg_mime_cache_list_mime_parents            XDG_ENTRY(cache_list_mime_parents)
++#define _xdg_mime_cache_unalias_mime_type            XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_get_max_buffer_extents       XDG_ENTRY(cache_get_max_buffer_extents)
+ #endif
+ 
+ extern XdgMimeCache **_caches;