diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-03-16 13:56:24 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:03:48 +0000 |
commit | f4857dc64065fda9f20ada185b745ccb0c93b484 (patch) | |
tree | 8285b99ac313f3efe99b7233e75ee72eb1467904 /meta/recipes-graphics/xorg-driver/xf86-input-synaptics | |
parent | 8b125fe5a8f7b51f123a9d2103780f723241fdb1 (diff) | |
download | poky-f4857dc64065fda9f20ada185b745ccb0c93b484.tar.gz |
xf86-input-synaptics: drop already applied patch
This patch was part of the 1.8.1 release.
(From OE-Core rev: aa5377fc4cf93678b2fdae86855ea1d6f39fa148)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xf86-input-synaptics')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch deleted file mode 100644 index f36bb7579d..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Hutterer <peter.hutterer@who-t.net> | ||
3 | Date: Fri, 29 Aug 2014 07:57:41 +1000 | ||
4 | Subject: Include xorg-server.h to fix build errors on newest glibc | ||
5 | |||
6 | In file included from /usr/include/string.h:634:0, | ||
7 | from /usr/include/xorg/os.h:53, | ||
8 | from /usr/include/xorg/misc.h:115, | ||
9 | from /usr/include/xorg/xf86str.h:37, | ||
10 | from /usr/include/xorg/xf86Xinput.h:54, | ||
11 | from synproto.h:36, | ||
12 | from synproto.c:24: | ||
13 | /usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' | ||
14 | strndup(const char *str, size_t n); | ||
15 | |||
16 | See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html | ||
17 | |||
18 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
19 | |||
20 | Status: Backport | ||
21 | |||
22 | Index: xf86-input-synaptics-1.8.0/src/eventcomm.h | ||
23 | =================================================================== | ||
24 | --- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700 | ||
25 | +++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700 | ||
26 | @@ -27,6 +27,8 @@ | ||
27 | #ifndef _EVENTCOMM_H_ | ||
28 | #define _EVENTCOMM_H_ | ||
29 | |||
30 | +#include <xorg-server.h> | ||
31 | + | ||
32 | #include <linux/input.h> | ||
33 | #include <linux/version.h> | ||
34 | #include <xf86Xinput.h> | ||
35 | Index: xf86-input-synaptics-1.8.0/src/ps2comm.h | ||
36 | =================================================================== | ||
37 | --- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700 | ||
38 | +++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700 | ||
39 | @@ -22,6 +22,8 @@ | ||
40 | #ifndef _PS2COMM_H_ | ||
41 | #define _PS2COMM_H_ | ||
42 | |||
43 | +#include <xorg-server.h> | ||
44 | + | ||
45 | #include <unistd.h> | ||
46 | #include <sys/ioctl.h> | ||
47 | #include "xf86_OSproc.h" | ||
48 | Index: xf86-input-synaptics-1.8.0/src/synproto.h | ||
49 | =================================================================== | ||
50 | --- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700 | ||
51 | +++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700 | ||
52 | @@ -31,6 +31,8 @@ | ||
53 | #include "config.h" | ||
54 | #endif | ||
55 | |||
56 | +#include <xorg-server.h> | ||
57 | + | ||
58 | #include <unistd.h> | ||
59 | #include <sys/ioctl.h> | ||
60 | #include <xf86Xinput.h> | ||