[libX11/f14/master] Add XF86TouchpadOn/Off to KeysymDB (#683950)

[Peter Hutterer]

commit 8d7be798e03eb501663bec12008005e3812ab4ac
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Mar 22 11:41:17 2011 +1000

    Add XF86TouchpadOn/Off to KeysymDB  (#683950)

 ...ouchpadOn-and-XF86TouchpadOff-to-keysymdb.patch |   29 ++++++++++++++++++++
 libX11.spec                                        |    8 +++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-XF86TouchpadOn-and-XF86TouchpadOff-to-keysymdb.patch b/0001-Add-XF86TouchpadOn-and-XF86TouchpadOff-to-keysymdb.patch
new file mode 100644
index 0000000..aed31f3
--- /dev/null
+++ b/0001-Add-XF86TouchpadOn-and-XF86TouchpadOff-to-keysymdb.patch
@@ -0,0 +1,29 @@
+From f5b6c3f955ea7b65d2506a3c4a7111166f003704 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Tue, 22 Mar 2011 11:28:56 +1000
+Subject: [PATCH] Add XF86TouchpadOn and XF86TouchpadOff to keysymdb
+
+This patch isn't necessary in Xlib 1.4 and later since the keysymdb has been
+made redunant. While we're on 1.3.x, we need it.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/XKeysymDB |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/XKeysymDB b/src/XKeysymDB
+index 45d8929..28718b4 100644
+--- a/src/XKeysymDB
++++ b/src/XKeysymDB
+@@ -352,6 +352,8 @@ XF86Blue             	:1008FFA6
+ XF86Suspend		:1008FFA7
+ XF86Hibernate		:1008FFA8
+ XF86TouchpadToggle	:1008FFA9
++XF86TouchpadOn		:1008FFB0
++XF86TouchpadOff	:1008FFB1
+
+ ! XFree86 special action keys
+ XF86_Switch_VT_1	:1008FE01
+--
+1.7.4
+
diff --git a/libX11.spec b/libX11.spec
index c9f4ea7..25dc2f6 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -4,7 +4,7 @@
 Summary: Core X11 protocol client library
 Name: libX11
 Version: 1.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -17,6 +17,8 @@ Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.t
 
 Patch2: dont-forward-keycode-0.patch
 Patch3: 54a963608d23d35cd9233b2223f880ac3671f10b.patch
+Patch4: 0001-Add-XF86TouchpadOn-and-XF86TouchpadOff-to-keysymdb.patch
+
 BuildRequires: xorg-x11-util-macros
 BuildRequires: pkgconfig(xproto) >= 7.0.15
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
@@ -49,6 +51,7 @@ X.Org X11 libX11 development package
 #setup -q -n %{tarball}-%{gitdate}
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1
+%patch4 -p1
 
 %build
 # sodding libtool
@@ -115,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*.5*
 
 %changelog
+* Tue Mar 22 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.3.4-4
+- Add XF86TouchpadOn/Off to KeysymDB  (#683950)
+
 * Tue Aug 10 2010 Bill Nottingham <notting at redhat.com> - 1.3.4-3
 - Merge upstream commit 54a96360, fixes use-after-free (fd.o 29412)