rpms/gtk2/F-12 o-minus.patch,NONE,1.1 gtk2.spec,1.440,1.441

Tue Dec 1 17:54:14 UTC 2009

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	o-minus.patch 
Log Message:
Make compose sequences more consistent


o-minus.patch:
 gtk-compose-lookaside.txt |    8 ++++----
 gtkimcontextsimpleseqs.h  |   14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE o-minus.patch ---

diff --git a/gtk/gtk-compose-lookaside.txt b/gtk/gtk-compose-lookaside.txt
index d222101..df0367b 100644
--- a/gtk/gtk-compose-lookaside.txt
+++ b/gtk/gtk-compose-lookaside.txt
@@ -186,8 +186,8 @@
 <Multi_key> <greater> <a> 			: "â" U00E2
 <Multi_key> <a> <greater> 			: "â" U00E2
 <Multi_key> <a> <asciicircum> 			: "â" U00E2
-<Multi_key> <minus> <a> 			: "ã" U00E3
-<Multi_key> <a> <minus> 			: "ã" U00E3
+<Multi_key> <minus> <a> 			: "ā" U0101
+<Multi_key> <a> <minus> 			: "ā" U0101
 <Multi_key> <a> <asciitilde> 			: "ã" U00E3
 <Multi_key> <a> <quotedbl> 			: "ä" U00E4
 <Multi_key> <a> <diaeresis> 			: "ä" U00E4
@@ -223,8 +223,8 @@
 <Multi_key> <greater> <o> 			: "ô" U00F4
 <Multi_key> <o> <greater> 			: "ô" U00F4
 <Multi_key> <o> <asciicircum> 			: "ô" U00F4
-<Multi_key> <minus> <o> 			: "õ" U00F5
-<Multi_key> <o> <minus> 			: "õ" U00F5
+<Multi_key> <minus> <o> 			: "ō" U014D
+<Multi_key> <o> <minus> 			: "ō" U014D
 <Multi_key> <o> <asciitilde> 			: "õ" U00F5
 <Multi_key> <o> <quotedbl> 			: "ö" U00F6
 <Multi_key> <o> <diaeresis> 			: "ö" U00F6
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index 131b3db..6cf3cc4 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -90,7 +90,7 @@ GDK_dead_hook, 3454, 3532, 3532, 3588, 3588,
 GDK_dead_horn, 3588, 3598, 3598, 3598, 3598, 
 GDK_dead_psili, 3598, 3626, 3626, 3626, 3626, 
 GDK_dead_dasia, 3626, 3658, 3658, 3658, 3658, 
-GDK_Multi_key, 3658, 3658, 9658, 13366, 15231, 
+GDK_Multi_key, 3658, 3658, 9664, 13372, 15237, 
 GDK_space, 0x002F, 
 GDK_2, 0x01BB, 
 GDK_A, 0x023A, 
@@ -781,7 +781,7 @@ GDK_5, 0x2085,
 GDK_6, 0x2086, 
 GDK_7, 0x2087, 
 GDK_8, 0x2088, 
-GDK_9, 0x2088, 
+GDK_9, 0x2089, 
 GDK_equal, 0x208C, 
 GDK_V, 0x01D9, 
 GDK_v, 0x01DA, 
@@ -1561,13 +1561,13 @@ GDK_minus, GDK_O, 0x00D5,
 GDK_minus, GDK_U, 0x016A, 
 GDK_minus, GDK_Y, 0x00A5, 
 GDK_minus, GDK_asciicircum, 0x00AF, 
-GDK_minus, GDK_a, 0x00E3, 
+GDK_minus, GDK_a, 0x0101, 
 GDK_minus, GDK_d, 0x0111, 
 GDK_minus, GDK_e, 0x0113, 
 GDK_minus, GDK_i, 0x012B, 
 GDK_minus, GDK_l, 0x00A3, 
 GDK_minus, GDK_n, 0x00F1, 
-GDK_minus, GDK_o, 0x00F5, 
+GDK_minus, GDK_o, 0x014D, 
 GDK_minus, GDK_u, 0x016B, 
 GDK_minus, GDK_y, 0x00A5, 
 GDK_period, GDK_minus, 0x00B7, 
@@ -1691,6 +1691,8 @@ GDK_4, GDK_5, 0x2158,
 GDK_5, GDK_6, 0x215A, 
 GDK_5, GDK_8, 0x215D, 
 GDK_7, GDK_8, 0x215E, 
+GDK_colon, GDK_parenleft, 0x2639, 
+GDK_colon, GDK_parenright, 0x263A, 
 GDK_colon, GDK_minus, 0x00F7, 
 GDK_semicolon, GDK_A, 0x0104, 
 GDK_semicolon, GDK_E, 0x0118, 
@@ -2223,7 +2225,7 @@ GDK_a, GDK_apostrophe, 0x00E1,
 GDK_a, GDK_parenleft, 0x0103, 
 GDK_a, GDK_asterisk, 0x00E5, 
 GDK_a, GDK_comma, 0x0105, 
-GDK_a, GDK_minus, 0x00E3, 
+GDK_a, GDK_minus, 0x0101, 
 GDK_a, GDK_greater, 0x00E2, 
 GDK_a, GDK_asciicircum, 0x00E2, 
 GDK_a, GDK_underscore, 0x00AA, 
@@ -2369,7 +2371,7 @@ GDK_n, GDK_g, 0x014B,
 GDK_n, GDK_asciitilde, 0x00F1, 
 GDK_o, GDK_quotedbl, 0x00F6, 
 GDK_o, GDK_apostrophe, 0x00F3, 
-GDK_o, GDK_minus, 0x00F5, 
+GDK_o, GDK_minus, 0x014D, 
 GDK_o, GDK_slash, 0x00F8, 
 GDK_o, GDK_greater, 0x00F4, 
 GDK_o, GDK_A, 0x00C5, 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -p -r1.440 -r1.441
--- gtk2.spec	1 Dec 2009 14:39:52 -0000	1.440
+++ gtk2.spec	1 Dec 2009 17:54:14 -0000	1.441
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -44,6 +44,8 @@ Patch13: gtk2-rotate-layout.patch
 Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=600992
 Patch15: filesystemref.patch
+# from upstream
+Patch16: o-minus.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -165,6 +167,7 @@ This package contains developer document
 %patch13 -p1 -b .rotate-layout
 %patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .filesystemref
+%patch16 -p1 -b .o-minus
 
 %build
 %configure --with-xinput=xfree 		\
@@ -392,6 +395,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-2
+- Make compose sequences for āō consistent (#510741)
+
 * Tue Dec  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
 - Update to 2.18.4
 - See http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.4.news


