From 0635bb79ddd82d818abc744992afac9a2cd64cb6 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 10 Mar 2015 12:35:44 -0400
Subject: [PATCH] libX11 1.6.3

---
 .gitignore                   |  1 +
 dont-forward-keycode-0.patch | 36 ++++++++++++++++++------------------
 libX11.spec                  |  9 +++++----
 sources                      |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 846e99b..91cfd85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ libX11-1.3.99.901.tar.bz2
 /libX11-1.6.0.tar.bz2
 /libX11-1.6.1.tar.bz2
 /libX11-1.6.2.tar.bz2
+/libX11-1.6.3.tar.bz2
diff --git a/dont-forward-keycode-0.patch b/dont-forward-keycode-0.patch
index 989bf7d..c16d874 100644
--- a/dont-forward-keycode-0.patch
+++ b/dont-forward-keycode-0.patch
@@ -1,6 +1,19 @@
---- libX11-1.0.3/modules/im/ximcp/imDefLkup.c.dont-forward-keycode-0	2006-06-22 17:22:22.000000000 -0400
-+++ libX11-1.0.3/modules/im/ximcp/imDefLkup.c	2006-09-20 17:57:49.000000000 -0400
-@@ -332,6 +332,17 @@
+diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c
+--- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx	2015-03-09 18:28:45.000000000 -0400
++++ libX11-1.6.3/modules/im/ximcp/imDefFlt.c	2015-03-10 12:32:31.912149644 -0400
+@@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
+ {
+     Xim		im = (Xim)ic->core.im;
+ 
+-    if (IS_FABRICATED(im)) {
++    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
+ 	_XimPendingFilter(ic);
+ 	UNMARK_FABRICATED(im);
+ 	return NOTFILTERD;
+diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/ximcp/imDefLkup.c
+--- libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx	2015-03-09 18:28:45.000000000 -0400
++++ libX11-1.6.3/modules/im/ximcp/imDefLkup.c	2015-03-10 12:32:31.911149637 -0400
+@@ -332,6 +332,17 @@ _XimForwardEvent(
      XEvent	*ev,
      Bool	 sync)
  {
@@ -18,8 +31,8 @@
  #ifdef EXT_FORWARD
      if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
  	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
-@@ -605,6 +616,19 @@
- 	Xfree(info->keysym);
+@@ -604,6 +615,19 @@ _XimUnregCommitInfo(
+     Xfree(info->keysym);
      ic->private.proto.commit_info = info->next;
      Xfree(info);
 +
@@ -38,16 +51,3 @@
      return;
  }
  
-diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c
-index 1e4f389..09df352 100644
---- a/modules/im/ximcp/imDefFlt.c
-+++ b/modules/im/ximcp/imDefFlt.c
-@@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
- {
-     Xim		im = (Xim)ic->core.im;
- 
--    if (IS_FABRICATED(im)) {
-+    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
- 	_XimPendingFilter(ic);
- 	UNMARK_FABRICATED(im);
- 	return NOTFILTERD;
diff --git a/libX11.spec b/libX11.spec
index a98922f..a2ddcee 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -4,8 +4,8 @@
 
 Summary: Core X11 protocol client library
 Name: libX11
-Version: 1.6.2
-Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version: 1.6.3
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,7 +18,6 @@ Source2:    commitid
 Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 %endif
 
-Patch0: 0001-Fix-XNextRequest-after-direct-usage-of-XCB.patch
 Patch2: dont-forward-keycode-0.patch
 BuildRequires: xorg-x11-util-macros >= 1.11
 BuildRequires: pkgconfig(xproto) >= 7.0.15
@@ -50,7 +49,6 @@ X.Org X11 libX11 development package
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch0 -p1 -b .xcb
 %patch2 -p1 -b .dont-forward-keycode-0
 
 %build
@@ -115,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*.5*
 
 %changelog
+* Tue Mar 10 2015 Adam Jackson <ajax@redhat.com> 1.6.3-1
+- libX11 1.6.3
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index e13b3bd..133755c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c35d6ad95b06635a524579e88622fdb5  libX11-1.6.2.tar.bz2
+2e36b73f8a42143142dda8129f02e4e0  libX11-1.6.3.tar.bz2