diff --git a/0001--XIM-Revert-commit-1a1a42a3.patch b/0001--XIM-Revert-commit-1a1a42a3.patch deleted file mode 100644 index de30db3..0000000 --- a/0001--XIM-Revert-commit-1a1a42a3.patch +++ /dev/null @@ -1,96 +0,0 @@ -From f0bad274d885da555c25437614aea0882d1a9986 Mon Sep 17 00:00:00 2001 -From: Egbert Eich -Date: Wed, 29 Jun 2011 10:35:58 +0200 -Subject: [PATCH] [XIM] Revert commit 1a1a42a3. -Patch-mainline: To be upstreamed - -According to https://bugs.freedesktop.org/show_bug.cgi?id=7869 -this patch did not resolve the issue. -The ticket suggests another solution to this problem however -this solution has the side effect that a 'FABLICATED' event -may be delivered to the wron input context. -The real problem however seems to reside on the client side: -as comment #12 of this ticket: -"So the client should not change the focus between XNextEvent() and -XFilterEvent(), if they pass the ic client window to XFilterEvent()." -It seems to be wrong to fix a client issue on the library side. -As no more comments have appeard on this bug over the past 2 -years I expect that this is what has happened already. - -Signed-off-by: Egbert Eich ---- - modules/im/ximcp/imDefIc.c | 4 ---- - modules/im/ximcp/imDefLkup.c | 8 ++------ - src/xlibi18n/XimintP.h | 8 -------- - 3 files changed, 2 insertions(+), 18 deletions(-) - -diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c -index 7b36659..2e71d84 100644 ---- a/modules/im/ximcp/imDefIc.c -+++ b/modules/im/ximcp/imDefIc.c -@@ -993,8 +993,6 @@ _XimProtoSetFocus( - (void)_XimWrite(im, len, (XPointer)buf); - _XimFlush(im); - -- MARK_FOCUSED(ic); -- - _XimRegisterFilter(ic); - return; - } -@@ -1042,8 +1040,6 @@ _XimProtoUnsetFocus( - (void)_XimWrite(im, len, (XPointer)buf); - _XimFlush(im); - -- UNMARK_FOCUSED(ic); -- - _XimUnregisterFilter(ic); - return; - } -diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c -index 45c46e6..29b45db 100644 ---- a/modules/im/ximcp/imDefLkup.c -+++ b/modules/im/ximcp/imDefLkup.c -@@ -213,12 +213,8 @@ _XimRespSyncReply( - Xic ic, - BITMASK16 mode) - { -- if (mode & XimSYNCHRONUS) /* SYNC Request */ { -- if (IS_FOCUSED(ic)) -- MARK_NEED_SYNC_REPLY(ic); -- else -- _XimProcSyncReply((Xim)ic->core.im, ic); -- } -+ if (mode & XimSYNCHRONUS) /* SYNC Request */ -+ MARK_NEED_SYNC_REPLY(ic); - - return True; - } -diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h -index 0e384ab..8ea06ba 100644 ---- a/src/xlibi18n/XimintP.h -+++ b/src/xlibi18n/XimintP.h -@@ -261,7 +261,6 @@ typedef struct _XicProtoPrivateRec { - #define IC_CONNECTED (1L) - #define FABLICATED (1L << 1) - #define NEED_SYNC_REPLY (1L << 2) --#define FOCUSED (1L << 3) - - /* - * macro for the flag of XICPrivateRec -@@ -287,13 +286,6 @@ typedef struct _XicProtoPrivateRec { - #define UNMARK_NEED_SYNC_REPLY(ic) \ - (((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY) - --#define IS_FOCUSED(ic) \ -- (((Xic)ic)->private.proto.flag & FOCUSED) --#define MARK_FOCUSED(ic) \ -- (((Xic)ic)->private.proto.flag |= FOCUSED) --#define UNMARK_FOCUSED(ic) \ -- (((Xic)ic)->private.proto.flag &= ~FOCUSED) -- - /* - * macro for the filter_event_mask of XICPrivateRec - */ --- -1.6.0.2 - diff --git a/Xcms.diff b/Xcms.diff index 3c21c08..f0daf53 100644 --- a/Xcms.diff +++ b/Xcms.diff @@ -6,7 +6,7 @@ diff -u -p src/xcms.orig//Makefile.am src/xcms/Makefile.am Xcmsint.h -X11dir = $(libdir)/X11 -+X11dir = /usr/share/X11 ++X11dir = $(datadir)/X11 dist_X11_DATA = Xcms.txt diff --git a/bug-239698_libx11.diff b/bug-239698_libx11.diff index b714414..38074c7 100644 --- a/bug-239698_libx11.diff +++ b/bug-239698_libx11.diff @@ -14,10 +14,10 @@ index aa1aaaf..b3b7a9f 100644 (void)_XimRespSyncReply(ic, flag); -- MARK_FABLICATED(ic); +- MARK_FABRICATED(im); + if (ic->private.proto.registed_filter_event + & (KEYPRESS_MASK | KEYRELEASE_MASK)) -+ MARK_FABLICATED(ic); ++ MARK_FABRICATED(im); ev.type = KeyPress; ev.send_event = False; diff --git a/bug153744.diff b/bug153744.diff index 693a747..745cedd 100644 --- a/bug153744.diff +++ b/bug153744.diff @@ -1,13 +1,13 @@ -diff -u -r nls.orig/Makefile.am nls/Makefile.am ---- nls.orig/Makefile.am 2006-07-21 14:40:44.000000000 +0200 -+++ nls/Makefile.am 2006-07-21 14:41:08.000000000 +0200 -@@ -38,9 +38,7 @@ - ja \ - ja.JIS \ - ja_JP.UTF-8 \ -- ja.S90 \ - ja.SJIS \ -- ja.U90 \ - ko \ - koi8-c \ - koi8-r \ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -427,7 +427,7 @@ locales="\ + iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ + iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \ + iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\ +- ja.S90 ja.SJIS ja.U90 ko koi8-c koi8-r \ ++ ja.SJIS ko koi8-c koi8-r \ + koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \ + microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \ + tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \ diff --git a/libX11-1.4.0.tar.bz2 b/libX11-1.4.0.tar.bz2 deleted file mode 100644 index 9921523..0000000 --- a/libX11-1.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cb3c22a352190e7a426ac5874354ad27e93d994db5518674f2cb60e9c35a94b -size 2086239 diff --git a/libX11-1.4.99.901.tar.bz2 b/libX11-1.4.99.901.tar.bz2 new file mode 100644 index 0000000..c8cee66 --- /dev/null +++ b/libX11-1.4.99.901.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56e085d4f488853f8aaf368a428f980711f89bc5128500a65d40f73112ee924c +size 2313780 diff --git a/libX11.changes b/libX11.changes index d25de0b..6fb11d9 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Thu Apr 12 08:19:14 UTC 2012 - vuntz@opensuse.org + +- Update to version 1.4.99.901: + + Allow modifier releases in compose sequences + + XQueryColors: Split a request into multiple requests if + necessary + + Revert "xcb: Add TCP fallback" + + Block for other threads in _XUserLockDisplay + + Fixes for compiler warnings and problems found by code static + analysis tools + + New compose sequences + + Documentation fixes and improvements +- Changes from version 1.4.99.1: + + New macro/API added: GetRequestSized to get a request of a + specific size + + New compose sequences + + Various bug fixes, including: + - Fix for pasting more than 1024 bytes into xterm + - Make Xim handle NEED_SYNC_REPLY flag + - Fix modifier key range in Xutil.h + - Fix build/target word size mismatch when cross-compiling in + makekeys + + Cleanup of specs +- Changes from version 1.4.4: + + Fixes for problems found by static analysis or to ease further + static analysis + + Documentation fixes and improvements + + Improved assertions to help users and developers figure out why + Xlib just crashed on them +- Changes from version 1.4.3: + + Add support for the Sinhala keysyms +- Changes from version 1.4.2: + + Fixes for problems found by code static analysis tools + + Fixes for Display lock handling that caused some deadlocks when + using xcb for transport + + Build configuration improvements +- Changes from version 1.4.1: + + Fix two issues in Xlib event handling + + Convert the XKB API spec to DocBook format +- Drop 0001--XIM-Revert-commit-1a1a42a3.patch: a fix was committed + according to latest comments in fdo#7869. +- Drop p_sr_CS-compose.diff: some (Serbian) Cyrillic NFD sequences + were added in git commit fa2eecca, so we don't need our own patch + anymore. Fix bnc#95813. +- Rewrite bug153744.diff after build system change. +- Rebase p_new-locales.diff: some of it was integrated upstream. +- Rebase p_khmer-compose.diff: some of it was integrated upstream. +- Rebase bug-239698_libx11.diff: fix for fdo#7869 (commit 738f7b86) + changed the macro to be used. +- Update Xcms.diff to use $(datadir) instead of /usr/share so that + it's upstreamable. + ------------------------------------------------------------------- Sat Feb 11 19:01:37 UTC 2012 - jengelh@medozas.de diff --git a/libX11.spec b/libX11.spec index b5f2852..3086329 100644 --- a/libX11.spec +++ b/libX11.spec @@ -16,9 +16,8 @@ # - Name: libX11 -Version: 1.4.0 +Version: 1.4.99.901 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -27,27 +26,40 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libX11 #Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/ -Source: %name-%version.tar.bz2 +Source: %{name}-%{version}.tar.bz2 +# make legal department happy Patch1: bug153744.diff +# PATCH-FIX-UPSTREAM p_new-locales.diff fdo#48594 bnc#98262 -- Add missing locale aliases for bn_IN gu_IN kn_IN pa_IN Patch4: p_new-locales.diff -Patch6: p_sr_CS-compose.diff +# PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer Patch7: p_khmer-compose.diff +# PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- km_KH locale support Patch8: p_khmer-locale.diff +# PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables Patch9: p_xlib_skip_ext_env.diff Patch10: bug-239698_libx11.diff Patch13: bug-221326-xim-sync.patch +# PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales Patch15: en-locales.diff +# PATCH-FIX-UPSTREAM Xcms.diff fdo#48590 bnc#419548 -- Install Xcms.txt in $(datadir) not $(libdir) Patch17: Xcms.diff +# PATCH-FIX-UPSTREAM compose-zh_CN.UTF-8.diff fdo#48591 bnc#461243 -- Missing entry in compose.dir for zh_CN.UTF-8 Patch18: compose-zh_CN.UTF-8.diff -Patch19: 0001--XIM-Revert-commit-1a1a42a3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf >= 2.60 automake libtool -BuildRequires: pkgconfig pkgconfig(xorg-macros) >= 1.11 -BuildRequires: pkgconfig(xextproto) pkgconfig(xproto) >= 7.0.13 -BuildRequires: pkgconfig(xcb) >= 1.1.92 pkgconfig(xtrans) -BuildRequires: pkgconfig(xf86bigfontproto) pkgconfig(xproto) -BuildRequires: pkgconfig(inputproto) pkgconfig(kbproto) +BuildRequires: autoconf >= 2.60 +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(inputproto) +BuildRequires: pkgconfig(kbproto) +BuildRequires: pkgconfig(xcb) >= 1.1.92 +BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(xf86bigfontproto) +BuildRequires: pkgconfig(xorg-macros) >= 1.11 +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xproto) >= 7.0.13 +BuildRequires: pkgconfig(xtrans) %description The X Window System is a network-transparent window system that was @@ -110,7 +122,8 @@ stream connection. %package devel Summary: Development files for the Core X11 protocol library Group: Development/Libraries/C and C++ -Requires: libX11-6 = %version, libX11-xcb1 = %version +Requires: libX11-6 = %version +Requires: libX11-xcb1 = %version # O/P added for 12.2 Provides: xorg-x11-libX11-devel = 7.6_%version-%release Obsoletes: xorg-x11-libX11-devel < 7.6_%version-%release @@ -133,10 +146,9 @@ in libX11-6 and libX11-xcb1. # make legal department happy (Bug #153744) test -f nls/ja.U90/XLC_LOCALE.pre && exit 1 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 -%patch -P 1 -P 4 -P 6 -P 7 -P 8 -P 9 -p0 +%patch -P 1 -P 4 -P 7 -P 8 -P 9 -p0 %patch -P 10 -P 13 -p1 %patch -P 15 -P 17 -P 18 -p0 -%patch -P 19 -p1 %build # Got patches which change auto*files diff --git a/p_khmer-compose.diff b/p_khmer-compose.diff index 73ae90f..0165a99 100644 --- a/p_khmer-compose.diff +++ b/p_khmer-compose.diff @@ -1,15 +1,3 @@ ---- nls/en_US.UTF-8/Compose.pre.orig 2006-12-03 16:58:03.000000000 +0100 -+++ nls/en_US.UTF-8/Compose.pre 2006-12-03 17:00:09.000000000 +0100 -@@ -5704,3 +5704,9 @@ - : "у̏" - : "У̏" - : "У̏" -+# Khmer digraphs -+ : "ាំ" -+ : "ោះ" -+ : "េះ" -+ : "ុំ" -+ : "ុះ" --- nls/compose.dir.pre.orig 2007-10-26 10:38:23.854146750 +0200 +++ nls/compose.dir.pre 2007-10-26 10:38:51.159853250 +0200 @@ -141,6 +141,7 @@ diff --git a/p_new-locales.diff b/p_new-locales.diff index 37016cc..bbc60ac 100644 --- a/p_new-locales.diff +++ b/p_new-locales.diff @@ -1,55 +1,36 @@ -diff -u -r -p ../libX11-1.2.2.orig//nls/compose.dir.pre ./nls/compose.dir.pre ---- ../libX11-1.2.2.orig//nls/compose.dir.pre 2009-11-14 02:01:41.000000000 +0000 -+++ ./nls/compose.dir.pre 2009-11-14 02:01:54.000000000 +0000 -@@ -342,6 +342,7 @@ en_US.UTF-8/Compose: iu_CA.UTF-8 - en_US.UTF-8/Compose: ja_JP.UTF-8 - en_US.UTF-8/Compose: ka_GE.UTF-8 - en_US.UTF-8/Compose: kl_GL.UTF-8 -+en_US.UTF-8/Compose: kn_IN.UTF-8 - en_US.UTF-8/Compose: kk_KZ.UTF-8 - en_US.UTF-8/Compose: kn_IN.UTF-8 - en_US.UTF-8/Compose: ko_KR.UTF-8 -Only in ./nls: compose.dir.pre.orig -diff -u -r -p ../libX11-1.2.2.orig//nls/locale.alias.pre ./nls/locale.alias.pre ---- ../libX11-1.2.2.orig//nls/locale.alias.pre 2009-11-14 02:01:41.000000000 +0000 -+++ ./nls/locale.alias.pre 2009-11-14 02:01:54.000000000 +0000 -@@ -131,8 +131,8 @@ bg_BG.iso88595: bg_BG.ISO8859-5 +Index: nls/locale.alias.pre +=================================================================== +--- nls/locale.alias.pre.orig ++++ nls/locale.alias.pre +@@ -128,6 +128,7 @@ bg_BG.iso88595: bg_BG.ISO8859-5 bg_BG.ISO-8859-5: bg_BG.ISO8859-5 bg_BG.koi8r: bg_BG.KOI8-R be_BG.utf8: bg_BG.UTF-8 +bn_IN: bn_IN.UTF-8 bn_IN.utf8: bn_IN.UTF-8 --bn_IN.UTF-8: bn_IN.UTF-8 bo_IN.utf8: bo_IN.UTF-8 - bo_IN.UTF-8: bo_IN.UTF-8 br: br_FR.ISO8859-1 -@@ -607,8 +607,8 @@ gl_ES.ISO-8859-15@euro: gl_ES.ISO8859 +@@ -602,6 +603,7 @@ gl_ES.ISO-8859-15@euro: gl_ES.ISO8859 gl_ES@euro: gl_ES.ISO8859-15 gl_ES.UTF-8@euro: gl_ES.UTF-8 gl_ES.utf8: gl_ES.UTF-8 +gu_IN: gu_IN.UTF-8 gu_IN.utf8: gu_IN.UTF-8 --gu_IN.UTF-8: gu_IN.UTF-8 gv: gv_GB.ISO8859-1 gv_GB: gv_GB.ISO8859-1 - gv_GB.iso88591: gv_GB.ISO8859-1 -@@ -729,8 +729,8 @@ kl_GL.ISO-8859-1: kl_GL.ISO8859-1 +@@ -722,6 +724,7 @@ kl_GL.ISO-8859-1: kl_GL.ISO8859-1 kl_GL.iso885915: kl_GL.ISO8859-15 kl_GL.utf8: kl_GL.UTF-8 kn: kn_IN.UTF-8 +kn_IN: kn_IN.UTF-8 kn_IN.utf8: kn_IN.UTF-8 --kn_IN.UTF-8: kn_IN.UTF-8 ko: ko_KR.eucKR ko.UTF-8: ko_KR.UTF-8 - ko_KR: ko_KR.eucKR -@@ -896,8 +896,8 @@ or: or_IN.UTF-8 +@@ -882,6 +885,7 @@ oc_FR@euro: oc_FR.ISO8859-15 + or: or_IN.UTF-8 or_IN.utf8: or_IN.UTF-8 - or_IN.UTF-8: or_IN.UTF-8 pa: pa_IN.UTF-8 +pa_IN: pa_IN.UTF-8 pa_IN.utf8: pa_IN.UTF-8 --pa_IN.UTF-8: pa_IN.UTF-8 pa_PK.utf8: pa_PK.UTF-8 pd: pd_US.ISO8859-1 - pd_DE: pd_DE.ISO8859-1 diff --git a/p_sr_CS-compose.diff b/p_sr_CS-compose.diff deleted file mode 100644 index 1832886..0000000 --- a/p_sr_CS-compose.diff +++ /dev/null @@ -1,133 +0,0 @@ ---- nls/en_US.UTF-8/Compose.pre.orig 2010-08-11 02:42:18.000000000 +0200 -+++ nls/en_US.UTF-8/Compose.pre 2010-09-04 05:52:23.000000000 +0200 -@@ -5379,3 +5379,130 @@ - : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT - - : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION -+ -+# Serbian accented Cyrillic -+# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A -+# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E -+# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O -+# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U -+# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I -+# -+# ̀ - U+0300 , , -+# ́ - U+0301 , , , -+# ̂ - U+0302 , -+# ̏ - U+030F , -+# ̀ - kratkouzlazni, U+0300 , , -+ : "а̀" -+ : "а̀" -+ : "а̀" -+ : "А̀" -+ : "А̀" -+ : "А̀" -+ : "ѐ" -+ : "ѐ" -+ : "ѐ" -+ : "Ѐ" -+ : "Ѐ" -+ : "Ѐ" -+ : "ѝ" -+ : "ѝ" -+ : "ѝ" -+ : "Ѝ" -+ : "Ѝ" -+ : "Ѝ" -+ : "о̀" -+ : "о̀" -+ : "о̀" -+ : "О̀" -+ : "О̀" -+ : "О̀" -+ : "у̀" -+ : "у̀" -+ : "у̀" -+ : "У̀" -+ : "У̀" -+ : "У̀" -+# ́ - dugouzlazni, U+0301 , , , -+ : "а́" -+ : "а́" -+ : "а́" -+ : "а́" -+ : "А́" -+ : "А́" -+ : "А́" -+ : "А́" -+ : "е́" -+ : "е́" -+ : "е́" -+ : "е́" -+ : "Е́" -+ : "Е́" -+ : "Е́" -+ : "Е́" -+ : "и́" -+ : "и́" -+ : "и́" -+ : "и́" -+ : "И́" -+ : "И́" -+ : "И́" -+ : "И́" -+ : "о́" -+ : "о́" -+ : "о́" -+ : "о́" -+ : "О́" -+ : "О́" -+ : "О́" -+ : "О́" -+ : "у́" -+ : "у́" -+ : "у́" -+ : "у́" -+ : "У́" -+ : "У́" -+ : "У́" -+ : "У́" -+# ̂ - dugosilazni, U+0302 , -+ : "а̂" -+ : "а̂" -+ : "А̂" -+ : "А̂" -+ : "е̂" -+ : "е̂" -+ : "Е̂" -+ : "Е̂" -+ : "и̂" -+ : "и̂" -+ : "И̂" -+ : "И̂" -+ : "о̂" -+ : "о̂" -+ : "О̂" -+ : "О̂" -+ : "у̂" -+ : "у̂" -+ : "У̂" -+ : "У̂" -+# ̏ - kratkosilazni, U+030F , -+# there's no appropriate dead_doublegrave, so we use these two dead keys -+ : "а̏" -+ : "а̏" -+ : "А̏" -+ : "А̏" -+ : "е̏" -+ : "е̏" -+ : "Е̏" -+ : "Е̏" -+ : "и̏" -+ : "и̏" -+ : "И̏" -+ : "И̏" -+ : "о̏" -+ : "о̏" -+ : "О̏" -+ : "О̏" -+ : "у̏" -+ : "у̏" -+ : "У̏" -+ : "У̏"