diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-11-19 08:53:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-20 14:08:57 +0000 |
| commit | 1de7d0bfc1bac6752a6aa7e96b384a8103efce1e (patch) | |
| tree | 6f212ec2341e7eeaf4d9748c1989695b22a26bed /meta/recipes-graphics | |
| parent | cd9127664d77df995037bdcff53053835ef026ee (diff) | |
| download | openembedded-core-1de7d0bfc1bac6752a6aa7e96b384a8103efce1e.tar.gz openembedded-core-1de7d0bfc1bac6752a6aa7e96b384a8103efce1e.tar.bz2 openembedded-core-1de7d0bfc1bac6752a6aa7e96b384a8103efce1e.zip | |
xmodmap: drop already applied patch
This patch was part of the 1.0.8 release.
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')
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch | 60 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb | 2 |
2 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch deleted file mode 100644 index 40f81f0f74..0000000000 --- a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 23 Apr 2012 14:28:39 +0000 -Subject: include config.h before stdio.h & other system headers - -Ensures definitions like _GNU_SOURCE are visible when needed. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/exec.c b/exec.c -index dbcb669..419b10e 100644 ---- a/exec.c -+++ b/exec.c -@@ -54,6 +54,10 @@ from The Open Group. - * original xmodmap, written by David Rosenthal, of Sun Microsystems. - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> -diff --git a/pf.c b/pf.c -index 0eb0f55..3f0c3f4 100644 ---- a/pf.c -+++ b/pf.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> -diff --git a/xmodmap.c b/xmodmap.c -index 58a8e70..0f89629 100644 ---- a/xmodmap.c -+++ b/xmodmap.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> --- -cgit v0.9.0.2-2-gbebe diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb index 65a55e3560..87efb76022 100644 --- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb +++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb @@ -13,7 +13,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" PE = "1" -SRC_URI += "file://gnu-source.patch" - SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" SRC_URI[sha256sum] = "efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3" |