--- a/open-src/xserver/xorg/6835232.patch	Thu May 14 20:00:54 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-###############################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# 
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-
-6835232 remote Motif app crashes on keyboard input in snv_111a
-
-ProcXkbSetNamedIndicator should skip devices without LED's, not report failure.
-
-Integrated upstream in git commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65
-(surrounding code changed too much between 1.5 & pre-1.7-master to use that
- patch as is).
-
---- xkb/xkb.c	2009-05-01 02:08:37.816994000 -0700
-+++ xkb/xkb.c	2009-05-01 23:54:12.172096000 -0700
-@@ -3438,6 +3438,7 @@ ProcXkbSetNamedIndicator(ClientPtr clien
-         for (other = inputInfo.devices; other; other = other->next)
-         {
-             if ((other != dev) && other->coreEvents &&
-+                (other->kbdfeed || other->leds) &&
-                 (XaceHook(XACE_DEVICE_ACCESS, client, other, DixSetAttrAccess) == Success))
-             {
-                 rc = _XkbCreateIndicatorMap(other, stuff->indicator,
-@@ -3461,6 +3462,7 @@ ProcXkbSetNamedIndicator(ClientPtr clien
-         for (other = inputInfo.devices; other; other = other->next)
-         {
-             if ((other != dev) && other->coreEvents &&
-+                (other->kbdfeed || other->leds) &&
-                 (XaceHook(XACE_DEVICE_ACCESS, client, other, DixSetAttrAccess) == Success))
-             {
-                 _XkbSetNamedIndicator(client, other, stuff);