summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-app
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commitcce01dc991f009fa036b72b622d1398d8bff875d (patch)
tree8fcccda7d9c54f38342416ab554c410c4f0805fd /meta/recipes-graphics/xorg-app
parent56b56aef129c1753f1a5bfd6e5b8451bfd0f242d (diff)
downloadpoky-cce01dc991f009fa036b72b622d1398d8bff875d.tar.gz
xset: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 020ef81aa072c79f427111e5057d29ded849c48c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-app')
-rw-r--r--meta/recipes-graphics/xorg-app/xset/disable-xkb.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index 97d13a30df..a97c7b72fa 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
@@ -4,11 +4,11 @@ Upstream-Status: Pending
4 4
5Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com> 5Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
6 6
7diff --git a/configure.ac b/configure.ac 7Index: xset-1.2.3/configure.ac
8index 81c3ae4..26601bf 100644 8===================================================================
9--- a/configure.ac 9--- xset-1.2.3.orig/configure.ac
10+++ b/configure.ac 10+++ xset-1.2.3/configure.ac
11@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, 11@@ -53,11 +53,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
12 AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) 12 AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
13 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) 13 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
14 14
@@ -22,5 +22,5 @@ index 81c3ae4..26601bf 100644
22 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) 22 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
23+fi 23+fi
24 24
25 AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), 25 AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
26 [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) 26 [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])