Fix a typo in Makefile.am and add files missing due to it. These files

don't affect the current gtk2+ package, but are required to build the
quartz backend, for which an option will be added. Patch obtained from the
GNOME CVS.

5 files changed, 357 insertions, 1 deletions

diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 20c38b57969..4ec2c239c5c 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.75 2006/10/06 18:05:56 wiz Exp $
+$NetBSD: distinfo,v 1.76 2006/12/01 08:15:38 minskim Exp $
 
 SHA1 (gtk+-2.10.6.tar.bz2) = aad6e1ef964d8acb8a04942b8dd2e00a9db56450
 RMD160 (gtk+-2.10.6.tar.bz2) = 929386610a634e82b7ddb10f43930b27194fa67b
 Size (gtk+-2.10.6.tar.bz2) = 14561124 bytes
 SHA1 (patch-aa) = 7efcbf733e3459fd3853c0d49842136b434ca983
+SHA1 (patch-ab) = 1762c9e3361c071c632cd7eb2af7b17ca3078e5b
 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
+SHA1 (patch-ae) = f64113f824efced935f2c464c340cf0ab1c0b460
+SHA1 (patch-af) = 36734d064fc2b103755cf86bea85a0dc33154f90
+SHA1 (patch-ag) = 1df97f257dc4a170d0ad37eb6755fc5ba327b6a9
 SHA1 (patch-ai) = 7eb2545ee97b8841f8f575890d4e167fbe856e58
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
new file mode 100644
index 00000000000..6c52d4e6069
--- /dev/null
+++ b/x11/gtk2/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.14 2006/12/01 08:15:38 minskim Exp $
+
+http://cvs.gnome.org/viewcvs/gtk%2B/gtk/Makefile.am?r1=1.315&r2=1.316
+
+--- gtk/Makefile.am.orig	2006-10-02 10:27:53.000000000 -0700
++++ gtk/Makefile.am
+@@ -635,10 +635,10 @@ gtk_use_win32_c_sources = \
+ 	gtksocket-win32.c \
+ 	gtkwin32embed.c   \
+ 	gtkwin32embedwidget.c
+-gtk_use_stuc_c_sources = \
++gtk_use_stub_c_sources = \
+ 	gtkplug-stub.c   \
+ 	gtksocket-stub.c
+-gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
++gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stub_c_sources)
+ if USE_X11
+ gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
+ gtk_c_sources += $(gtk_use_x11_c_sources)
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
new file mode 100644
index 00000000000..ae76ef860d6
--- /dev/null
+++ b/x11/gtk2/patches/patch-ae
@@ -0,0 +1,114 @@
+$NetBSD: patch-ae,v 1.12 2006/12/01 08:15:38 minskim Exp $
+
+http://cvs.gnome.org/viewcvs/gtk%2B/gtk/Makefile.am?r1=1.315&r2=1.316
+
+--- gtk/Makefile.in.orig	2006-10-03 09:57:51.000000000 -0700
++++ gtk/Makefile.in
+@@ -853,7 +853,7 @@ gtk_base_c_sources = \
+ 	$(gtk_clipboard_dnd_c_sources)
+ 
+ gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) $(am__append_9) $(am__append_11) $(am__append_12)
+-gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
++gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stub_c_sources)
+ 
+ gtk_os_unix_c_sources = \
+ 	gtkfilesystemunix.c		\
+@@ -886,7 +886,7 @@ gtk_use_win32_c_sources = \
+ 	gtkwin32embed.c   \
+ 	gtkwin32embedwidget.c
+ 
+-gtk_use_stuc_c_sources = \
++gtk_use_stub_c_sources = \
+ 	gtkplug-stub.c   \
+ 	gtksocket-stub.c
+ 
+@@ -1343,7 +1343,8 @@ am__libgtk_directfb_2_0_la_SOURCES_DIST 
+ 	gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
+ 	gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
+ 	gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+-	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
++	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
++	gtkplug-stub.c gtksocket-stub.c
+ @USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \
+ @USE_QUARTZ_TRUE@	gtkquartz.lo
+ @USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo
+@@ -1428,6 +1429,7 @@ am__objects_7 = gtkplug-x11.lo gtksocket
+ am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \
+ 	gtkwin32embedwidget.lo
+ @USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9)
++am__objects_11 = gtkplug-stub.lo gtksocket-stub.lo
+ @USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = $(am__objects_11)
+ am__objects_13 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \
+ 	$(am__objects_8) $(am__objects_10) $(am__objects_12)
+@@ -1509,7 +1511,8 @@ am__libgtk_linux_fb_2_0_la_SOURCES_DIST 
+ 	gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
+ 	gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
+ 	gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+-	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
++	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
++	gtkplug-stub.c gtksocket-stub.c
+ am_libgtk_linux_fb_2_0_la_OBJECTS = $(am__objects_13)
+ libgtk_linux_fb_2_0_la_OBJECTS = $(am_libgtk_linux_fb_2_0_la_OBJECTS)
+ @OS_UNIX_TRUE@libgtk_quartz_2_0_la_DEPENDENCIES = \
+@@ -1588,7 +1591,8 @@ am__libgtk_quartz_2_0_la_SOURCES_DIST = 
+ 	gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
+ 	gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
+ 	gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+-	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
++	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
++	gtkplug-stub.c gtksocket-stub.c
+ am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_13)
+ libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS)
+ am__libgtk_win32_2_0_la_SOURCES_DIST = fnmatch.c gtkaboutdialog.c \
+@@ -1660,7 +1664,8 @@ am__libgtk_win32_2_0_la_SOURCES_DIST = f
+ 	gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
+ 	gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
+ 	gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+-	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
++	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
++	gtkplug-stub.c gtksocket-stub.c
+ am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_13)
+ libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS)
+ @OS_UNIX_TRUE@libgtk_x11_2_0_la_DEPENDENCIES = \
+@@ -1739,7 +1744,8 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = fnm
+ 	gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
+ 	gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
+ 	gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
+-	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
++	gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
++	gtkplug-stub.c gtksocket-stub.c
+ am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_13)
+ libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS)
+ bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \
+@@ -1872,6 +1878,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/gtkpapersize.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtkpathbar.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtkpixmap.Plo \
++@AMDEP_TRUE@	./$(DEPDIR)/gtkplug-stub.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtkplug-win32.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtkplug-x11.Plo ./$(DEPDIR)/gtkplug.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtkpreview.Plo \
+@@ -1918,6 +1925,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/gtksettings.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtksignal.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtksizegroup.Plo \
++@AMDEP_TRUE@	./$(DEPDIR)/gtksocket-stub.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtksocket-win32.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtksocket-x11.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/gtksocket.Plo \
+@@ -2232,6 +2240,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkpapersize.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkpathbar.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkpixmap.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug-stub.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug-win32.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug-x11.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug.Plo@am__quote@
+@@ -2281,6 +2290,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksettings.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksignal.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksizegroup.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket-stub.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket-win32.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket-x11.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket.Plo@am__quote@
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
new file mode 100644
index 00000000000..1f63faac7fb
--- /dev/null
+++ b/x11/gtk2/patches/patch-af
@@ -0,0 +1,91 @@
+$NetBSD: patch-af,v 1.14 2006/12/01 08:15:38 minskim Exp $
+
+http://cvs.gnome.org/viewcvs/gtk%2B/gtk/Makefile.am?r1=1.315&r2=1.316
+
+--- gtk/gtkplug-stub.c.orig	2006-11-30 23:33:00.000000000 -0800
++++ gtk/gtkplug-stub.c
+@@ -0,0 +1,84 @@
++/* GTK - The GIMP Toolkit
++ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++/* Stub implementation of backend-specific GtkPlug functions. */
++
++/*
++ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
++ * file for a list of people on the GTK+ Team.  See the ChangeLog
++ * files for a list of changes.  These files are distributed with
++ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
++ */
++
++#include "gtkplug.h"
++#include "gtkplugprivate.h"
++#include "gtkalias.h"
++
++GdkNativeWindow
++_gtk_plug_windowing_get_id (GtkPlug *plug)
++{
++  return 0;
++}
++
++void
++_gtk_plug_windowing_realize_toplevel (GtkPlug *plug)
++{
++}
++
++void
++_gtk_plug_windowing_map_toplevel (GtkPlug *plug)
++{
++}
++
++void
++_gtk_plug_windowing_unmap_toplevel (GtkPlug *plug)
++{
++}
++
++void
++_gtk_plug_windowing_set_focus (GtkPlug *plug)
++{
++}
++
++void
++_gtk_plug_windowing_add_grabbed_key (GtkPlug        *plug,
++				     guint           accelerator_key,
++				     GdkModifierType accelerator_mods)
++{
++}
++
++void
++_gtk_plug_windowing_remove_grabbed_key (GtkPlug        *plug,
++					guint           accelerator_key,
++					GdkModifierType accelerator_mods)
++{
++}
++
++void
++_gtk_plug_windowing_focus_to_parent (GtkPlug         *plug,
++				     GtkDirectionType direction)
++{
++}
++
++GdkFilterReturn
++_gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
++				 GdkEvent  *event,
++				 gpointer   data)
++{
++  return GDK_FILTER_CONTINUE;
++}
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
new file mode 100644
index 00000000000..538bd23088a
--- /dev/null
+++ b/x11/gtk2/patches/patch-ag
@@ -0,0 +1,128 @@
+$NetBSD: patch-ag,v 1.10 2006/12/01 08:15:38 minskim Exp $
+
+http://cvs.gnome.org/viewcvs/gtk%2B/gtk/Makefile.am?r1=1.315&r2=1.316
+
+--- gtk/gtksocket-stub.c.orig	2006-11-30 23:34:06.000000000 -0800
++++ gtk/gtksocket-stub.c
+@@ -0,0 +1,121 @@
++/* GTK - The GIMP Toolkit
++ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++/* Stub implementation of backend-specific GtkPlug functions. */
++
++/*
++ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
++ * file for a list of people on the GTK+ Team.  See the ChangeLog
++ * files for a list of changes.  These files are distributed with
++ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
++ */
++
++#include "gtksocket.h"
++#include "gtksocketprivate.h"
++#include "gtkalias.h"
++
++GdkNativeWindow
++_gtk_socket_windowing_get_id (GtkSocket *socket)
++{
++  return 0;
++}
++
++void
++_gtk_socket_windowing_realize_window (GtkSocket *socket)
++{
++}
++
++void
++_gtk_socket_windowing_end_embedding_toplevel (GtkSocket *socket)
++{
++}
++
++void
++_gtk_socket_windowing_size_request (GtkSocket *socket)
++{
++}
++
++void
++_gtk_socket_windowing_send_key_event (GtkSocket *socket,
++				      GdkEvent  *gdk_event,
++				      gboolean   mask_key_presses)
++{
++}
++
++void
++_gtk_socket_windowing_focus_change (GtkSocket *socket,
++				    gboolean   focus_in)
++{
++}
++
++void
++_gtk_socket_windowing_update_active (GtkSocket *socket,
++				     gboolean   active)
++{
++}
++
++void
++_gtk_socket_windowing_update_modality (GtkSocket *socket,
++				       gboolean   modality)
++{
++}
++
++void
++_gtk_socket_windowing_focus (GtkSocket       *socket,
++			     GtkDirectionType direction)
++{
++}
++
++void
++_gtk_socket_windowing_send_configure_event (GtkSocket *socket)
++{
++}
++
++void
++_gtk_socket_windowing_select_plug_window_input (GtkSocket *socket)
++{
++}
++
++void
++_gtk_socket_windowing_embed_get_info (GtkSocket *socket)
++{
++}
++
++void
++_gtk_socket_windowing_embed_notify (GtkSocket *socket)
++{
++}
++
++gboolean
++_gtk_socket_windowing_embed_get_focus_wrapped (void)
++{
++  return FALSE;
++}
++
++void
++_gtk_socket_windowing_embed_set_focus_wrapped (void)
++{
++}
++
++GdkFilterReturn
++_gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
++				   GdkEvent  *event,
++				   gpointer   data)
++{
++  return GDK_FILTER_CONTINUE;
++}