From: Ross Burton Date: Fri, 9 Mar 2018 18:56:08 +0000 (+0200) Subject: xorg-xserver: refresh patches X-Git-Tag: uninative-1.9~217 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=77fb72c76c8a5b2229a32f36a913a3293e9d2b56;p=openembedded-core.git xorg-xserver: 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. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch index ec0eea6ca2..c36e4e7301 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch @@ -5,13 +5,13 @@ Upstream-Status: Pending Signed-off-by: Yu Ke -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 +Index: xorg-server-1.19.6/xorg-server.m4 +=================================================================== +--- xorg-server-1.19.6.orig/xorg-server.m4 ++++ xorg-server-1.19.6/xorg-server.m4 @@ -28,10 +28,12 @@ dnl - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. + # Checks for the MACRO define in xorg-server.h (from the sdk). If it + # is defined, then add the given PROTO to $REQUIRED_MODULES. +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) +