rpms/libX11/F-10 libX11-1.1.5-revert-compose.patch, NONE, 1.1 libX11.spec, 1.53, 1.54

[Peter Hutterer]

Author: whot

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

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.5-revert-compose.patch 
Log Message:
* Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-2
- libX11-1.1.5-revert-compose.patch: revert an upstream commit in the compose
  table (???) that causes #491813.
  I don't know why this is an issue, but we bisected it on IRC to this commit.




libX11-1.1.5-revert-compose.patch:

--- NEW FILE libX11-1.1.5-revert-compose.patch ---
>From 046ccdfe7dc939e9a0c95d1d0c2747568443b50f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 26 Mar 2009 11:43:48 +1000
Subject: [PATCH] Revert "Work on making the en_US and pt_BR UTF-8 Compose as similar as possible."

This reverts commit b11ea7ab3a436745e5244599048516600e47ab5d.
---
 nls/en_US.UTF-8/Compose.pre |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 12806fb..db6053a 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1734,8 +1734,6 @@ XCOMM Part 3
 <Multi_key> <acute> <comma> <C>  	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <cedilla> <C>  	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <dead_cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <cedilla> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <Ccedilla>     	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <dead_cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <Multi_key> <comma> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
@@ -1750,8 +1748,6 @@ XCOMM Part 3
 <Multi_key> <acute> <comma> <c>  	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <cedilla> <c>  	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <dead_cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <cedilla> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <ccedilla>     	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <dead_cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <combining_acute> <Multi_key> <comma> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-- 
1.6.0.6



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-10/libX11.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libX11.spec	1 Mar 2009 23:09:18 -0000	1.53
+++ libX11.spec	26 Mar 2009 03:46:02 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -20,6 +20,9 @@
 Patch4: libX11-1.1.4-keysyms.patch
 Patch5: libX11-1.1.4-XF86Suspend.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=491813
+Patch6: libX11-1.1.5-revert-compose.patch
+
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
 BuildRequires: xorg-x11-proto-devel >= 7.1-2
@@ -62,6 +65,7 @@
 %patch3 -p1 -b .xcb-xreply-leak
 %patch4 -p1 -b .keysyms
 %patch5 -p1 -b .xf86suspend
+%patch6 -p1 -b .revert-compose
 
 %build
 %configure \
@@ -122,6 +126,11 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-2
+- libX11-1.1.5-revert-compose.patch: revert an upstream commit in the compose
+  table (???) that causes #491813.
+  I don't know why this is an issue, but we bisected it on IRC to this commit.
+
 * Mon Mar 02 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-1
 - libX11 1.1.5