rpms/gtk2/F-10 gtk2.spec, 1.337, 1.338 missing-compose-seqs.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6637

Modified Files:
	gtk2.spec missing-compose-seqs.patch 
Log Message:
make dead keys work again



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- gtk2.spec	28 Nov 2008 00:10:45 -0000	1.337
+++ gtk2.spec	12 Dec 2008 22:55:19 -0000	1.338
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -300,6 +300,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Nov 27 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.5-3
+- Make dead keys work again
+
 * Thu Nov 27 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.5-2
 - Re-add compose sequences that went missing due to the table
   syncing with X.org

missing-compose-seqs.patch:

Index: missing-compose-seqs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/missing-compose-seqs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- missing-compose-seqs.patch	28 Nov 2008 00:10:45 -0000	1.1
+++ missing-compose-seqs.patch	12 Dec 2008 22:55:20 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gtk+-2.14.5/gtk/gtkimcontextsimple.c.compose-seqs gtk+-2.14.5/gtk/gtkimcontextsimple.c
---- gtk+-2.14.5/gtk/gtkimcontextsimple.c.compose-seqs	2008-11-27 19:07:04.000000000 -0500
-+++ gtk+-2.14.5/gtk/gtkimcontextsimple.c	2008-11-27 19:07:26.000000000 -0500
+diff -up gtk+-2.14.5/gtk/gtkimcontextsimple.c.missing-compose-seqs gtk+-2.14.5/gtk/gtkimcontextsimple.c
+--- gtk+-2.14.5/gtk/gtkimcontextsimple.c.missing-compose-seqs	2008-11-24 01:35:35.000000000 -0500
++++ gtk+-2.14.5/gtk/gtkimcontextsimple.c	2008-12-12 17:14:35.000000000 -0500
 @@ -53,7 +53,7 @@ struct _GtkComposeTableCompact
   */
  #include "gtkimcontextsimpleseqs.h"
@@ -19,18 +19,9 @@
    6
  };
  
-@@ -415,7 +415,7 @@ check_normalize_nfc (gunichar* combinati
-  * In future versions it will be just the keysym (no +1).
-  */
- #define IS_DEAD_KEY(k) \
--    ((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1))
-+    ((k) >= GDK_dead_stroke && (k) <= (GDK_dead_dasia+1))
- 
- static gboolean
- check_algorithmically (GtkIMContextSimple    *context_simple,
-diff -up gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h.compose-seqs gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h
---- gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h.compose-seqs	2008-11-27 19:07:16.000000000 -0500
-+++ gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h	2008-11-27 19:07:29.000000000 -0500
+diff -up gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h.missing-compose-seqs gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h
+--- gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h.missing-compose-seqs	2008-11-24 01:35:36.000000000 -0500
++++ gtk+-2.14.5/gtk/gtkimcontextsimpleseqs.h	2008-12-12 16:58:16.000000000 -0500
 @@ -18,9 +18,10 @@
   */