Suppress xkbcomp spew

This commit is contained in:
Matthias Clasen 2009-03-07 20:18:50 +00:00
parent 0575ee827a
commit 0a7d7115e2
2 changed files with 24 additions and 1 deletions

View File

@ -1,7 +1,7 @@
Summary: High-level API for X Keyboard Extension
Name: libxklavier
Version: 3.8
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://gswitchit.sourceforge.net/
@ -18,6 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# https://bugs.freedesktop.org/show_bug.cgi?id=17651
Patch0: sax-leak.patch
Patch1: xkbcomp-spew.patch
%description
libxklavier is a library providing a high-level API for the X Keyboard
@ -40,6 +41,7 @@ needed to develop libxklavier applications.
%prep
%setup -q
%patch0 -p1 -b .sax-leak
%patch1 -p1 -b .xkbcomp-spew
%build
@ -75,6 +77,9 @@ rm -rf %{buildroot}
%{_datadir}/gtk-doc/html/libxklavier/
%changelog
* Sat Mar 7 2009 Matthias Clasen <mclasen@redhat.com> - 3.8-4
- Suppress xkbcomp spew in .xsession-errors
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

18
xkbcomp-spew.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up libxklavier-3.8/libxklavier/xklavier_config_xkb.c.warn-spew libxklavier-3.8/libxklavier/xklavier_config_xkb.c
--- libxklavier-3.8/libxklavier/xklavier_config_xkb.c.warn-spew 2009-03-07 15:11:15.940524703 -0500
+++ libxklavier-3.8/libxklavier/xklavier_config_xkb.c 2009-03-07 15:14:27.436489725 -0500
@@ -243,11 +243,11 @@ xkl_config_get_keyboard(XklEngine * engi
case 0:
/* child */
xkl_debug(160, "Executing %s\n", XKBCOMP);
- xkl_debug(160, "%s %s %s %s %s %s %s\n",
- XKBCOMP, XKBCOMP, "-I",
+ xkl_debug(160, "%s %s %s %s %s %s %s %s\n",
+ XKBCOMP, XKBCOMP, "-w0", "-I",
"-I" XKB_BASE, "-xkm", xkb_fn,
xkm_fn);
- execl(XKBCOMP, XKBCOMP, "-I",
+ execl(XKBCOMP, XKBCOMP, "-w0", "-I",
"-I" XKB_BASE, "-xkm", xkb_fn,
xkm_fn, NULL);
xkl_debug(0, "Could not exec %s: %d\n",