rpms/gtk2/devel gtk+-2.6.5-input.patch, NONE, 1.1 gtk2.spec, 1.67, 1.68 gtk+-2.6.5-set_mode.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11459

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.6.5-input.patch 
Removed Files:
	gtk+-2.6.5-set_mode.patch 
Log Message:
Another attempt


gtk+-2.6.5-input.patch:
 gdk.symbols          |   15 +++++++++++++++
 x11/gdkinput-none.c  |    2 +-
 x11/gdkinput-xfree.c |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE gtk+-2.6.5-input.patch ---
--- gtk+-2.6.5/gdk/x11/gdkinput-xfree.c.input	2005-04-09 09:49:44.000000000 -0400
+++ gtk+-2.6.5/gdk/x11/gdkinput-xfree.c	2005-04-09 09:50:07.000000000 -0400
@@ -359,5 +359,5 @@
     }
 }
 
-#define __GDK_INPUT_X11_C__
+#define __GDK_INPUT_XFREE_C__
 #include "gdkaliasdef.c"
--- gtk+-2.6.5/gdk/x11/gdkinput-none.c.input	2005-04-09 09:50:36.000000000 -0400
+++ gtk+-2.6.5/gdk/x11/gdkinput-none.c	2005-04-09 09:50:47.000000000 -0400
@@ -127,5 +127,5 @@
   return FALSE;
 }
 
-#define __GDK_INPUT_X11_C__
+#define __GDK_INPUT_NONE_C__
 #include "gdkaliasdef.c"
--- gtk+-2.6.5/gdk/gdk.symbols.input	2005-04-09 02:40:42.000000000 -0400
+++ gtk+-2.6.5/gdk/gdk.symbols	2005-04-09 09:52:56.000000000 -0400
@@ -370,11 +370,26 @@
 
 #if IN_HEADER(__GDK_INPUT_H__)
 #if IN_FILE(__GDK_INPUT_X11_C__)
+gdk_device_get_history
 gdk_device_get_state
+#endif
+#endif
+
+#if IN_HEADER(__GDK_INPUT_H__)
+#if IN_FILE(__GDK_INPUT_XFREE_C__)
 gdk_device_set_mode
 #endif
 #endif
 
+#if IN_HEADER(__GDK_INPUT_H__)
+#if IN_FILE(__GDK_INPUT_NONE_C__)
+gdk_device_get_history
+gdk_device_get_state
+gdk_device_set_mode
+#endif
+#endif
+
+gdk_device_get_state
 #if IN_HEADER(__GDK_DISPLAY_H__)
 #if IN_FILE(__GDK_EVENTS_X11_C__)
 gdk_display_add_client_message_filter


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gtk2.spec	9 Apr 2005 06:43:06 -0000	1.67
+++ gtk2.spec	9 Apr 2005 13:54:21 -0000	1.68
@@ -25,7 +25,7 @@
 # Biarch changes
 Patch2: gtk+-2.4.1-lib64.patch
 # Fixed in 2.6.6
-Patch3: gtk+-2.6.5-set_mode.patch
+Patch3: gtk+-2.6.5-input.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -85,7 +85,7 @@
 
 %patch1 -p1 -b .themename
 %patch2 -p1 -b .lib64
-%patch3 -p1 -b .set_mode
+%patch3 -p1 -b .input
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .


--- gtk+-2.6.5-set_mode.patch DELETED ---