rpms/libX11/F-10 libX11-1.1.5-rm-long-composites.patch, NONE, 1.1 libX11.spec, 1.54, 1.55

[Peter Hutterer]

Author: whot

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

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.5-rm-long-composites.patch 
Log Message:
* Tue Mar 31 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-3
- libX11-1.1.5-rm-long-composites.patch: Re-remove long compositions that
  override shorter (#491813).



libX11-1.1.5-rm-long-composites.patch:

--- NEW FILE libX11-1.1.5-rm-long-composites.patch ---
>From 8502e2567e9550b0800ee83d36ef2f248800ebc1 Mon Sep 17 00:00:00 2001
From: James Cloos <cloos at jhcloos.com>
Date: Wed, 20 Aug 2008 15:28:07 -0400
Subject: [PATCH] nls (en_US) Re-remove long compositions that override shorter
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

As reported in <https://bugs.freedesktop.org/show_bug.cgi?id=17228>:

  Commit a6f4bbf7
    nls (en_US): remove long compositions that override shorter [...]
    removed some longer compose sequences because there are shorter
    ones which take preference over the longer. For example the
    sequences:

      <Multi_key> <apostrophe> <comma> <c>   : U1E09 # ḉ
      <Multi_key> <apostrophe> <comma> <C>   : U1E08 # Ḉ

    were removed becase there already was:

      <Multi_key> <apostrophe> <comma>       : U201A # ‚

  Then commit 4ba09125
    Work on making the en_US and pt_BR UTF-8 Compose as similar as
    possible added exactly the same key sequences again. Obviusly
    they won't work.
(cherry picked from commit a788792e9de95f8db0639557859722a35087481d)
---
 nls/en_US.UTF-8/Compose.pre |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 12806fb..b7df9b6 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1734,7 +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
@@ -1750,7 +1749,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
-- 
1.6.0.6



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-10/libX11.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libX11.spec	26 Mar 2009 03:46:02 -0000	1.54
+++ libX11.spec	6 Apr 2009 01:11:33 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,7 +21,7 @@
 Patch5: libX11-1.1.4-XF86Suspend.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=491813
-Patch6: libX11-1.1.5-revert-compose.patch
+Patch7: libX11-1.1.5-rm-long-composites.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -65,7 +65,7 @@
 %patch3 -p1 -b .xcb-xreply-leak
 %patch4 -p1 -b .keysyms
 %patch5 -p1 -b .xf86suspend
-%patch6 -p1 -b .revert-compose
+%patch7 -p1 -b .rm-long-composites
 
 %build
 %configure \
@@ -126,6 +126,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Mar 31 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-3
+- libX11-1.1.5-rm-long-composites.patch: Re-remove long compositions that
+  override shorter (#491813).
+
 * 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.