summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-proto
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:44:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commite6a66da9a9189af4493c32d1f34a21fff4647ca7 (patch)
tree1378dd717a5835eecbbcd05968ca188d8cb3e016 /meta/recipes-graphics/xorg-proto
parent709552d96aacd7138592b3d1f69c483f3cb70161 (diff)
downloadpoky-e6a66da9a9189af4493c32d1f34a21fff4647ca7.tar.gz
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. (From OE-Core rev: a9f9ca73840d1e6911e496a32ee862a724615b50) 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-proto')
-rw-r--r--meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch10
1 files changed, 6 insertions, 4 deletions
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.
10Received this patch from H.J. Lu <hjl.tools@gmail.com> 10Received this patch from H.J. Lu <hjl.tools@gmail.com>
11Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 11Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
12 12
13--- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 13Index: xproto-7.0.31/Xmd.h
14+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 14===================================================================
15--- xproto-7.0.31.orig/Xmd.h
16+++ xproto-7.0.31/Xmd.h
15@@ -62,7 +62,6 @@ SOFTWARE. 17@@ -62,7 +62,6 @@ SOFTWARE.
16 defined(__ia64__) || defined(ia64) || \ 18 defined(__ia64__) || defined(ia64) || \
17 defined(__sparc64__) || \ 19 defined(__sparc64__) || \
18 defined(__s390x__) || \ 20 defined(__s390x__) || \
19- defined(__amd64__) || defined(amd64) || \ 21- defined(__amd64__) || defined(amd64) || \
20 defined(__powerpc64__) 22 defined(__powerpc64__)
21 # define LONG64 /* 32/64-bit architecture */ 23 # if !defined(__ILP32__) /* amd64-x32 is 32bit */
22 # endif 24 # define LONG64 /* 32/64-bit architecture */