From b1b2efae110e7b9533a056b32b48d6654d081cee Mon Sep 17 00:00:00 2001
From: Francisco Alecrim <francisco.alecrim@openbossa.org>
Date: Fri, 13 Nov 2009 09:45:39 -0400
Subject: [PATCH 081/118] xpext: include missing variables

Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org>
---
 recipes/maemo/xpext/xpext-missing-variables.patch |   77 +++++++++++++++++++++
 recipes/maemo/xpext_1.0-5.bb                      |    5 +-
 2 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 recipes/maemo/xpext/xpext-missing-variables.patch

diff --git a/recipes/maemo/xpext/xpext-missing-variables.patch b/recipes/maemo/xpext/xpext-missing-variables.patch
new file mode 100644
index 0000000..0ac7cac
--- /dev/null
+++ b/recipes/maemo/xpext/xpext-missing-variables.patch
@@ -0,0 +1,77 @@
+diff --git a/xspproto.h b/xspproto.h
+index 365a51a..7c3bf71 100644
+--- a/xspproto.h
++++ b/xspproto.h
+@@ -2,7 +2,7 @@
+ #define _XSPPROTO_H_
+ 
+ #define XSP_VERSION_MAJOR   1
+-#define XSP_VERSION_MINOR   0
++#define XSP_VERSION_MINOR   2
+ 
+ #define XSP_NAME    "XSP"
+ 
+@@ -148,6 +148,38 @@ typedef struct {
+ 
+ 
+ 
++typedef struct {
++    CARD8   reqType;
++    CARD8   xspReqType;
++    CARD16  length B16;
++    CARD32  screen_num B32;
++    CARD32  state;
++} xXSPSetPixelDoublingReq;
++#define sz_xXSPSetPixelDoublingReq 12
++
++typedef struct {
++	BYTE	type;
++	BYTE	pad1;
++	CARD16	sequenceNumber B16;
++	CARD32	status B32;
++	CARD32	pad2 B32;
++	CARD32	pad3 B32;
++	CARD32	pad4 B32;
++	CARD32	pad5 B32;
++	CARD32	pad6 B32;
++	CARD32	pad7 B32;
++} xXSPSetPixelDoublingReply;
++#define sz_xXSPSetPixelDoublingReply 32
++
++typedef struct {
++   CARD8   reqType;
++   CARD8   xspReqType;
++   CARD16  length B16;
++   CARD32  screen_num B32;
++   CARD32  pressure;
++} xXSPSetThumbPressureReq;
++#define sz_xXSPSetThumbPressureReq 12
++
+ /* Events */
+ 
+ typedef struct {
+diff --git a/xspwire.h b/xspwire.h
+index 9115ba7..700d251 100644
+--- a/xspwire.h
++++ b/xspwire.h
+@@ -3,7 +3,7 @@
+ 
+ #define SP_NAME 	"SP"
+ #define SP_MAJOR	1
+-#define SP_MINOR	0
++#define SP_MINOR	2
+ 
+ /************ Version 1 **********/
+ 
+@@ -18,8 +18,9 @@
+ #define X_XSPSetTSRawMode		2
+ #define X_XSPRegisterDSPArea	 	3
+ #define X_XSPCancelDSPArea		4
+-
+-#define XSPNumberRequests		5
++#define X_XSPSetPixelDoubling           5
++#define X_XSPSetThumbPressure		6
++#define XSPNumberRequests		7
+ 
+ /* Events */
+ 
diff --git a/recipes/maemo/xpext_1.0-5.bb b/recipes/maemo/xpext_1.0-5.bb
index 71fcad2..2b46b7d 100644
--- a/recipes/maemo/xpext_1.0-5.bb
+++ b/recipes/maemo/xpext_1.0-5.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
@@ -6,7 +6,8 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libxext"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
-           file://auxdir.patch;patch=1;pnum=0"
+           file://auxdir.patch;patch=1;pnum=0 \
+           file://xpext-missing-variables.patch;patch=1"
 S = "${WORKDIR}/xpext-1.0"
 
 inherit autotools pkgconfig
-- 
1.6.3.3