Update to 2.21.3.

Clean up Makefile. add depend on gdk-pixbuf2. Use correct license.


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

5 files changed, 18 insertions, 77 deletions

diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
index f989c6a24..f2ac7216d 100644
--- a/x11-toolkits/gtk20/files/patch-Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -1,11 +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 @@
+--- Makefile.in.orig	2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in	2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,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
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  
  # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index 0a4e1022f..a9d1d5f21 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +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 = \
+--- docs/reference/Makefile.in.orig	2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in	2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
  	|| { 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
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #gdk gtk libgail-util
  GITIGNOREFILES = */*.1
  all: all-recursive
  
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
deleted file mode 100644
index 04ce78984..000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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_drag-context b/x11-toolkits/gtk20/files/patch-gdk_drag-context
deleted file mode 100644
index 5e2e8967c..000000000
--- a/x11-toolkits/gtk20/files/patch-gdk_drag-context
+++ /dev/null
@@ -1,43 +0,0 @@
---- gdk/gdk.symbols.orig	2010-05-30 08:52:43.000000000 +0200
-+++ gdk/gdk.symbols	2010-06-10 12:33:53.000000000 +0200
-@@ -535,8 +535,8 @@ gdk_drop_reply
- 
- #if IN_HEADER(__GDK_DND_H__)
- #if IN_FILE(__GDK_DND_C__)
--gdk_drag_context_get_action
- gdk_drag_context_get_actions
-+gdk_drag_context_get_selected_action
- gdk_drag_context_get_suggested_action
- gdk_drag_context_list_targets
- gdk_drag_find_window
---- gdk/gdkdnd.h.orig	2010-05-30 08:52:43.000000000 +0200
-+++ gdk/gdkdnd.h	2010-06-10 12:33:53.000000000 +0200
-@@ -109,7 +109,7 @@ GdkDragContext * gdk_drag_context_new   
- GList           *gdk_drag_context_list_targets         (GdkDragContext *context);
- GdkDragAction    gdk_drag_context_get_actions          (GdkDragContext *context);
- GdkDragAction    gdk_drag_context_get_suggested_action (GdkDragContext *context);
--GdkDragAction    gdk_drag_context_get_action           (GdkDragContext *context);
-+GdkDragAction    gdk_drag_context_get_selected_action  (GdkDragContext *context);
- 
- #ifndef GDK_DISABLE_DEPRECATED
- void             gdk_drag_context_ref        (GdkDragContext *context);
---- gdk/gdkdnd.c.orig	2010-05-30 08:18:44.000000000 +0200
-+++ gdk/gdkdnd.c	2010-06-10 12:33:53.000000000 +0200
-@@ -133,7 +133,7 @@ gdk_drag_context_get_suggested_action (G
- }
- 
- /**
-- * gdk_drag_context_get_action:
-+ * gdk_drag_context_selected_get_action:
-  * @context: a #GdkDragContext
-  *
-  * Determines the action chosen by the drag destination.
-@@ -143,7 +143,7 @@ gdk_drag_context_get_suggested_action (G
-  * Since: 2.22
-  **/
- GdkDragAction
--gdk_drag_context_get_action (GdkDragContext *context)
-+gdk_drag_context_get_selected_action (GdkDragContext *context)
- {
-   g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), 0);
- 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 25056ecf7..60254041d 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- 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/Makefile.in.orig	2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in	2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
  # 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 
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c 
+ STOCK_ICONS = \
+ 	stock-icons/16/document-open-recent.png		\