libX11 1.6.3
This commit is contained in:
parent
7b73f4071c
commit
0635bb79dd
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ libX11-1.3.99.901.tar.bz2
|
|||||||
/libX11-1.6.0.tar.bz2
|
/libX11-1.6.0.tar.bz2
|
||||||
/libX11-1.6.1.tar.bz2
|
/libX11-1.6.1.tar.bz2
|
||||||
/libX11-1.6.2.tar.bz2
|
/libX11-1.6.2.tar.bz2
|
||||||
|
/libX11-1.6.3.tar.bz2
|
||||||
|
@ -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
|
diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c
|
||||||
+++ libX11-1.0.3/modules/im/ximcp/imDefLkup.c 2006-09-20 17:57:49.000000000 -0400
|
--- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx 2015-03-09 18:28:45.000000000 -0400
|
||||||
@@ -332,6 +332,17 @@
|
+++ 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,
|
XEvent *ev,
|
||||||
Bool sync)
|
Bool sync)
|
||||||
{
|
{
|
||||||
@ -18,8 +31,8 @@
|
|||||||
#ifdef EXT_FORWARD
|
#ifdef EXT_FORWARD
|
||||||
if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
|
if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
|
||||||
if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
|
if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
|
||||||
@@ -605,6 +616,19 @@
|
@@ -604,6 +615,19 @@ _XimUnregCommitInfo(
|
||||||
Xfree(info->keysym);
|
Xfree(info->keysym);
|
||||||
ic->private.proto.commit_info = info->next;
|
ic->private.proto.commit_info = info->next;
|
||||||
Xfree(info);
|
Xfree(info);
|
||||||
+
|
+
|
||||||
@ -38,16 +51,3 @@
|
|||||||
return;
|
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;
|
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
Summary: Core X11 protocol client library
|
Summary: Core X11 protocol client library
|
||||||
Name: libX11
|
Name: libX11
|
||||||
Version: 1.6.2
|
Version: 1.6.3
|
||||||
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
@ -18,7 +18,6 @@ Source2: commitid
|
|||||||
Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
|
Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Patch0: 0001-Fix-XNextRequest-after-direct-usage-of-XCB.patch
|
|
||||||
Patch2: dont-forward-keycode-0.patch
|
Patch2: dont-forward-keycode-0.patch
|
||||||
BuildRequires: xorg-x11-util-macros >= 1.11
|
BuildRequires: xorg-x11-util-macros >= 1.11
|
||||||
BuildRequires: pkgconfig(xproto) >= 7.0.15
|
BuildRequires: pkgconfig(xproto) >= 7.0.15
|
||||||
@ -50,7 +49,6 @@ X.Org X11 libX11 development package
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
||||||
%patch0 -p1 -b .xcb
|
|
||||||
%patch2 -p1 -b .dont-forward-keycode-0
|
%patch2 -p1 -b .dont-forward-keycode-0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -115,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man5/*.5*
|
%{_mandir}/man5/*.5*
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user