From f4857dc64065fda9f20ada185b745ccb0c93b484 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 16 Mar 2015 13:56:24 +0000 Subject: 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 Signed-off-by: Richard Purdie --- .../always_include_xorg_server.h.patch | 60 ---------------------- .../xorg-driver/xf86-input-synaptics_1.8.1.bb | 4 -- 2 files changed, 64 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch (limited to 'meta/recipes-graphics') 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 f36bb75..0000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 29 Aug 2014 07:57:41 +1000 -Subject: Include xorg-server.h to fix build errors on newest glibc - -In file included from /usr/include/string.h:634:0, - from /usr/include/xorg/os.h:53, - from /usr/include/xorg/misc.h:115, - from /usr/include/xorg/xf86str.h:37, - from /usr/include/xorg/xf86Xinput.h:54, - from synproto.h:36, - from synproto.c:24: -/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - -See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html - -Signed-off-by: Peter Hutterer - -Status: Backport - -Index: xf86-input-synaptics-1.8.0/src/eventcomm.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700 -@@ -27,6 +27,8 @@ - #ifndef _EVENTCOMM_H_ - #define _EVENTCOMM_H_ - -+#include -+ - #include - #include - #include -Index: xf86-input-synaptics-1.8.0/src/ps2comm.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700 -@@ -22,6 +22,8 @@ - #ifndef _PS2COMM_H_ - #define _PS2COMM_H_ - -+#include -+ - #include - #include - #include "xf86_OSproc.h" -Index: xf86-input-synaptics-1.8.0/src/synproto.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700 -@@ -31,6 +31,8 @@ - #include "config.h" - #endif - -+#include -+ - #include - #include - #include diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb index 435faa6..19be77a 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb @@ -1,7 +1,5 @@ require xorg-driver-input.inc -#SRC_URI += "file://configurefix.patch" - SUMMARY = "X.Org X server -- synaptics touchpad input driver" DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ @@ -12,8 +10,6 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" -SRC_URI += "file://always_include_xorg_server.h.patch" - SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9" SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a" -- cgit v1.1