From e88a184fbefa69233e0cc86134808bce7b06d6cf Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 8 Mar 2018 20:17:26 +0200 Subject: serf: 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 --- meta/recipes-support/serf/serf/norpath.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/serf/serf/norpath.patch b/meta/recipes-support/serf/serf/norpath.patch index 380f5d00d2..c392444f7b 100644 --- a/meta/recipes-support/serf/serf/norpath.patch +++ b/meta/recipes-support/serf/serf/norpath.patch @@ -5,11 +5,11 @@ Upstream-Status: Inappropriate RP 2014/7/17 -Index: serf-1.3.6/SConstruct +Index: serf-1.3.9/SConstruct =================================================================== ---- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 -+++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 -@@ -218,8 +218,7 @@ +--- serf-1.3.9.orig/SConstruct ++++ serf-1.3.9/SConstruct +@@ -224,8 +224,7 @@ if sys.platform != 'win32': else: LIBNAMESTATIC = 'serf-${MAJOR}' @@ -17,9 +17,9 @@ Index: serf-1.3.6/SConstruct - PDB='${TARGET.filebase}.pdb') +env.Append(PDB='${TARGET.filebase}.pdb') - #for i in env: - # print(str(env[i])) -@@ -371,12 +370,6 @@ + if sys.platform == 'darwin': + # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) +@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY: if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -32,8 +32,8 @@ Index: serf-1.3.6/SConstruct # Set up the construction of serf-*.pc pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), -@@ -446,7 +439,6 @@ - ENV={'PATH' : os.environ['PATH']})) +@@ -461,7 +454,6 @@ else: + TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] # Find the (dynamic) library in this directory -tenv.Replace(RPATH=thisdir) -- cgit 1.2.3-korg