rpms/xorg-x11-proto-devel/devel x11proto-7.0.14-XF86XK_Suspend.patch, NONE, 1.1 xorg-x11-proto-devel.spec, 1.81, 1.82

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5729

Modified Files:
	xorg-x11-proto-devel.spec 
Added Files:
	x11proto-7.0.14-XF86XK_Suspend.patch 
Log Message:
* Tue Nov 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.4-5
- x11proto-7.0.14-XF86XK_Suspend.patch: add XF86XK_Suspend and
  XF86XK_Hibernate to keysyms.



x11proto-7.0.14-XF86XK_Suspend.patch:

--- NEW FILE x11proto-7.0.14-XF86XK_Suspend.patch ---
>From 1e33337d4dd151da4f0898a86608a1ee67588163 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 27 Oct 2008 16:36:34 +1030
Subject: [PATCH] Add XF86XK_Suspend and XF86XK_Hibernate keysym defs.

At the moment, we have the following keysyms defined to put a computer into a
sleep state:

XF86XK_Standby    0x1008FF10   /* System into standby mode   */
XF86XK_PowerDown  0x1008FF21   /* Deep sleep the system      */
XF86XK_Sleep      0x1008FF2F   /* Put system to sleep        */

Proposed change by Richard Hughes:
    "The nomenclature I've been trying to make stick
    (most projects now use this) for a few years now is:

    standby: high sleep state, nobody uses this any more
    hibernate: sleep to disk - slow, but can remove power
    suspend: sleep to ram - fast, but can't remove power
    hybrid sleep: sleep to both, slow, and can remove power, but quick to
    resume if you don't - most users don't use this"

This patch adds XF86XK_Suspend and XF86XK_Hibernate. The behaviour of
XF86XK_Sleep can then be configured on a per-session basis.

Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
---
 XF86keysym.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git xproto-7.0.14/XF86keysym.h xproto-7.0.14/XF86keysym.h
index 2a39f4e..072807e 100644
--- xproto-7.0.14/XF86keysym.h
+++ xproto-7.0.14/XF86keysym.h
@@ -206,6 +206,9 @@
 #define XF86XK_Yellow		0x1008FFA5   /* Yellow button               */
 #define XF86XK_Blue             0x1008FFA6   /* Blue button                 */
 
+#define XF86XK_Suspend		0x1008FFA7   /* Sleep to RAM                */
+#define XF86XK_Hibernate	0x1008FFA8   /* Sleep to disk               */
+
 /* Keys for special action keys (hot keys) */
 /* Virtual terminals on some operating systems */
 #define XF86XK_Switch_VT_1	0x1008FE01
-- 
1.6.0.3



Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- xorg-x11-proto-devel.spec	10 Nov 2008 23:22:29 -0000	1.81
+++ xorg-x11-proto-devel.spec	19 Nov 2008 01:50:17 -0000	1.82
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -42,6 +42,9 @@
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.14.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
+# Pushed upstream, will be x11proto-7.0.15
+Patch1: x11proto-7.0.14-XF86XK_Suspend.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -57,6 +60,8 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
 
+%patch1 -p0 -b .xf86suspend
+
 %build
 
 # Proceed through each proto package directory, building them all
@@ -259,6 +264,10 @@
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Nov 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.4-5
+- x11proto-7.0.14-XF86XK_Suspend.patch: add XF86XK_Suspend and
+  XF86XK_Hibernate to keysyms.
+
 * Mon Nov 10 2008 Adam Jackson <ajax at redhat.com> 7.4-5
 - Drop explicit virtual Provides, we get them for free from pkgconfig
 - Drop some ancient upgrade Prov/Req/Obs