and ofc the patches got lost again

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

10 files changed, 138 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..f989c6a24
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-05-27 23:51:40.000000000 +0200
++++ Makefile.in	2010-05-27 23:52:39.000000000 +0200
+@@ -477,7 +477,7 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-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 build
+ 
+ # 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..b6a6a7172
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	2009-12-25 20:26:59.000000000 +0100
++++ docs/Makefile.in	2009-12-25 20:27:35.000000000 +0100
+@@ -241,7 +241,7 @@
+ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+ LT_VERSION_INFO = @LT_VERSION_INFO@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
new file mode 100644
index 000000000..0a4e1022f
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig	2009-09-05 11:17:44.000000000 +0200
++++ docs/reference/Makefile.in	2009-09-05 11:18:15.000000000 +0200
+@@ -359,7 +359,7 @@ XVFB_START = \
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
++SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+ GITIGNOREFILES = */*.1
+ all: all-recursive
+ 
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
new file mode 100644
index 000000000..7f8e0eb0c
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,11 @@
+--- 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-configure b/x11-toolkits/gtk20/files/patch-configure
new file mode 100644
index 000000000..06a6f7b9f
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2009-12-26 21:41:27.000000000 +0100
++++ configure	2009-12-26 21:51:04.000000000 +0100
+@@ -33884,9 +33884,9 @@
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
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..04ce78984
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,14 @@
+--- gdk-pixbuf/Makefile.in.orig	2009-09-05 11:19:07.000000000 +0200
++++ gdk-pixbuf/Makefile.in	2009-09-05 11:20:19.000000000 +0200
+@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ test_gdk_pixbuf_LDADD = $(LDADDS)
+ 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-gdk-pixbuf_io-png.c b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
new file mode 100644
index 000000000..cca139d6b
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
@@ -0,0 +1,26 @@
+--- gdk-pixbuf/io-png.c.orig	2010-05-02 05:14:27.000000000 +0200
++++ gdk-pixbuf/io-png.c	2010-05-15 17:30:35.000000000 +0200
+@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
+         gchar *icc_profile_base64;
+         const gchar *icc_profile_title;
+         const gchar *icc_profile;
++#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
++        guint icc_profile_size;
++#else
+         gulong icc_profile_size;
++#endif
+         guint32 retval;
+         gint compression_type;
+ 
+@@ -607,7 +611,11 @@ png_info_callback   (png_structp png_rea
+         gchar *icc_profile_base64;
+         const gchar *icc_profile_title;
+         const gchar *icc_profile;
++#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
++        guint icc_profile_size;
++#else
+         gulong icc_profile_size;
++#endif
+         guint32 retval;
+         gint compression_type;
+ 
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..25056ecf7
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -0,0 +1,16 @@
+--- gtk/Makefile.in.orig	2009-12-25 20:27:57.000000000 +0100
++++ gtk/Makefile.in	2009-12-25 20:29:14.000000000 +0100
+@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+ # gtk-update-icon-cache.exe doesn't require any special privileges.
+ @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+ 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 \
+-	$(GDK_PIXBUF_DEP_LIBS)
++	$(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
+ 
+ gtk_update_icon_cache_SOURCES = \
+ 	updateiconcache.c 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
new file mode 100644
index 000000000..c687dec40
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
@@ -0,0 +1,13 @@
+--- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+ 
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+ 
+ G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
new file mode 100644
index 000000000..206257551
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
@@ -0,0 +1,11 @@
+--- gtk/updateiconcache.c.orig	2009-05-11 18:05:35.000000000 +0200
++++ gtk/updateiconcache.c	2009-05-30 12:03:39.000000000 +0200
+@@ -1505,7 +1505,7 @@ opentmp:
+   if (!validate_file (tmp_cache_path))
+     {
+       g_printerr (_("The generated cache was invalid.\n"));
+-      /*g_unlink (tmp_cache_path);*/
++      g_unlink (tmp_cache_path);
+       exit (1);
+     }
+