diff --git a/libX11-1.1.99.2-compose-updates.patch b/libX11-1.1.99.2-compose-updates.patch new file mode 100644 index 0000000..37ae75f --- /dev/null +++ b/libX11-1.1.99.2-compose-updates.patch @@ -0,0 +1,13 @@ +diff -up libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre.jx libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre +--- libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre.jx 2008-11-05 16:09:37.000000000 -0500 ++++ libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre 2009-02-04 10:28:08.000000000 -0500 +@@ -215,6 +215,9 @@ XCOMM Other symbols + : "‽" U203D # INTERROBANG + : "‽" U203D # INTERROBANG + ++

: "☭" U262D # HAMMER AND SICKLE ++ <3> : "♥" U2665 # BLACK HEART SUIT ++ + XCOMM Part 2 + + XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically diff --git a/libX11.spec b/libX11.spec index de4ce40..b17ab86 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 Version: 1.1.99.2 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,6 +17,8 @@ Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch Patch2: dont-forward-keycode-0.patch #http://lists.freedesktop.org/archives/xorg/2009-January/043133.html Patch3: libX11-1.1.99.2.hang.patch +# f052665394f3f0319e93a98f1d5d4ea287e1dd07 +Patch4: libX11-1.1.99.2-compose-updates.patch BuildRequires: pkgconfig autoconf automake libtool # xproto >= 7.0.6 required @@ -59,6 +61,7 @@ X.Org X11 libX11 development package #%patch0 -p0 -b .datadir-locale-dir-fix %patch2 -p1 -b .dont-forward-keycode-0 %patch3 -p1 -b .dont-hang +%patch4 -p1 -b .compose %build ./autogen.sh @@ -120,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Feb 04 2009 Adam Jackson 1.1.99.2-4 +- libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git) + * Mon Feb 02 2009 Caolán McNamara 1.1.99.2-3 - Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc.