diff --git a/bug-221326-xim-sync.patch b/bug-221326-xim-sync.patch deleted file mode 100644 index 335f843..0000000 --- a/bug-221326-xim-sync.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c -index cb30ac2..31e9150 100644 ---- a/modules/im/ximcp/imDefIc.c -+++ b/modules/im/ximcp/imDefIc.c -@@ -920,6 +930,30 @@ _XimProtoDestroyIC( - return; - } - -+/* -+ * Some functions require the request queue from the server to be flushed -+ * so that the ordering of client initiated status changes and those requested -+ * by the server is well defined. -+ * _XimSync() would be the function of choice here as it should get a -+ * XIM_SYNC_REPLY back from the server. -+ * This however isn't implemented in the piece of junk that is used by most -+ * input servers as the server side protocol if to XIM. -+ * Since this code is not shipped as a library together with the client side -+ * XIM code but is duplicated by every input server around the world there -+ * is no easy fix to this but this ugly hack below. -+ * Obtaining an IC value from the server sends a request and empties out the -+ * event/server request queue until the answer to this request is found. -+ * Thus it is guaranteed that any pending server side request gets processed. -+ * This is what the hack below is doing. -+ */ -+ -+static void -+BrokenSyncWithServer(XIC xic) -+{ -+ CARD32 dummy; -+ XGetICValues(xic, XNFilterEvents, &dummy, NULL); -+} -+ - static void - _XimProtoSetFocus( - XIC xic) -@@ -938,7 +962,8 @@ #else - } - } - #endif /* XIM_CONNECTABLE */ -- -+ BrokenSyncWithServer(xic); -+ - buf_s[0] = im->private.proto.imid; /* imid */ - buf_s[1] = ic->private.proto.icid; /* icid */ - -@@ -984,6 +1009,8 @@ #else - } - #endif /* XIM_CONNECTABLE */ - -+ BrokenSyncWithServer(xic); -+ - buf_s[0] = im->private.proto.imid; /* imid */ - buf_s[1] = ic->private.proto.icid; /* icid */ - -diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c diff --git a/bug-239698_libx11.diff b/bug-239698_libx11.diff deleted file mode 100644 index 836bdc2..0000000 --- a/bug-239698_libx11.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c -index aa1aaaf..b3b7a9f 100644 ---- a/modules/im/ximcp/imDefLkup.c -+++ b/modules/im/ximcp/imDefLkup.c -@@ -704,7 +706,9 @@ _XimCommitRecv( - - (void)_XimRespSyncReply(ic, flag); - -- MARK_FABRICATED(im); -+ if (ic->private.proto.registed_filter_event -+ & (KEYPRESS_MASK | KEYRELEASE_MASK)) -+ MARK_FABRICATED(im); - - ev.type = KeyPress; - ev.send_event = False; diff --git a/libX11-1.6.1.tar.bz2 b/libX11-1.6.1.tar.bz2 deleted file mode 100644 index 080c2e7..0000000 --- a/libX11-1.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892 -size 2356196 diff --git a/libX11-1.6.2.tar.bz2 b/libX11-1.6.2.tar.bz2 new file mode 100644 index 0000000..c14693b --- /dev/null +++ b/libX11-1.6.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16 +size 2339981 diff --git a/libX11.changes b/libX11.changes index 0e500ec..31b6c09 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 9 13:56:14 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 1.6.2: + This release of libX11 includes a number of fixes to handle realloc() failure + better, resolves a number of compiler & static analyzer warnings, fixes several + bugs in the X Input Method framework, and cleans up the XKB code to be a little + more maintainable. +- Drop upstreamed patches: + + Patch10: bug-239698_libx11.diff + + Patch13: bug-221326-xim-sync.patch + ------------------------------------------------------------------- Tue Jul 30 12:37:20 UTC 2013 - tobias.johannes.klausmann@mni.thm.de diff --git a/libX11.spec b/libX11.spec index 287d1a1..7ba40de 100644 --- a/libX11.spec +++ b/libX11.spec @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -31,8 +31,6 @@ Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{ver Patch7: p_khmer-compose.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 @@ -141,8 +139,6 @@ test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 # %patch7 -p0 %patch9 -p0 -%patch10 -p1 -%patch13 -p1 %patch15 -p0 %build