- Fix xim fd leak.

This commit is contained in:
Adam Jackson 2007-01-30 00:41:53 +00:00
parent 6f6f4a7020
commit 5857ebce46
2 changed files with 17 additions and 1 deletions

11
libX11-fd-leak.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urNad libx11-1.0.3~/modules/im/ximcp/imLcIm.c libx11-1.0.3/modules/im/ximcp/imLcIm.c
--- libx11-1.0.3~/modules/im/ximcp/imLcIm.c 2006-06-29 19:41:44.000000000 -0700
+++ libx11-1.0.3/modules/im/ximcp/imLcIm.c 2006-10-14 17:52:08.945540956 -0700
@@ -617,7 +617,6 @@
}
#endif
- fp = _XFopenFile (name, "r");
if (! (fp = _XFopenFile (name, "r"))) {
if (tmpcachedir)
Xfree (tmpcachedir);

View File

@ -1,7 +1,7 @@
Summary: X.Org X11 libX11 runtime library Summary: X.Org X11 libX11 runtime library
Name: libX11 Name: libX11
Version: 1.0.3 Version: 1.0.3
Release: 6%{?dist} Release: 7%{?dist}
License: MIT/X11 License: MIT/X11
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
@ -16,6 +16,7 @@ Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
Patch1: libX11-nls-indic-locales-bug185376.patch Patch1: libX11-nls-indic-locales-bug185376.patch
Patch2: dont-forward-keycode-0.patch Patch2: dont-forward-keycode-0.patch
Patch3: bug-201284.patch Patch3: bug-201284.patch
Patch4: libX11-fd-leak.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
# xproto >= 7.0.6 required # xproto >= 7.0.6 required
@ -57,6 +58,7 @@ X.Org X11 libX11 development package
%patch1 -p1 -b .nls-indic-locales-bug185376 %patch1 -p1 -b .nls-indic-locales-bug185376
%patch2 -p1 -b .dont-forward-keycode-0 %patch2 -p1 -b .dont-forward-keycode-0
%patch3 -p1 -b .3-bug201284 %patch3 -p1 -b .3-bug201284
%patch4 -p1 -b .xim-fd-leak
# Disable static library creation by default. # Disable static library creation by default.
%define with_static 0 %define with_static 0
@ -249,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3x* %{_mandir}/man3/*.3x*
%changelog %changelog
* Mon Jan 29 2007 Adam Jackson <ajax@redhat.com> 1.0.3-7
- Fix xim fd leak.
* Thu Nov 09 2006 Caius Chance <cchance@redhat.com> 1.0.3-6.fc7 * Thu Nov 09 2006 Caius Chance <cchance@redhat.com> 1.0.3-6.fc7
- Fix XIM hangs when switching input context (Soren Sandmann, #201284) - Fix XIM hangs when switching input context (Soren Sandmann, #201284)