From a9f9ca73840d1e6911e496a32ee862a724615b50 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Nov 2017 16:44:41 +0000 Subject: xproto: 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 --- .../xorg-proto/xproto/xproto_fix_for_x32.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch index 8a5ff58b91..4f9ed99c9c 100644 --- a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +++ b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch @@ -10,13 +10,15 @@ This fixes compilation with x32 toolchain. Received this patch from H.J. Lu Signed-off-by: Nitin A Kamble 2011/12/1 ---- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 -+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 +Index: xproto-7.0.31/Xmd.h +=================================================================== +--- xproto-7.0.31.orig/Xmd.h ++++ xproto-7.0.31/Xmd.h @@ -62,7 +62,6 @@ SOFTWARE. defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) - # define LONG64 /* 32/64-bit architecture */ - # endif + # if !defined(__ILP32__) /* amd64-x32 is 32bit */ + # define LONG64 /* 32/64-bit architecture */ -- cgit 1.2.3-korg