From 9f58bd731f33b90849d7d0cb8153dcfedf336ff4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Mar 2018 20:55:56 +0200 Subject: cups: 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 --- .../0001-don-t-try-to-run-generated-binaries.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch') diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch index 5379eb6aa2..db013cf08c 100644 --- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch @@ -10,12 +10,12 @@ Signed-off-by: Koen Kooi ppdc/Makefile | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) -Index: cups-2.0.0/ppdc/Makefile +Index: cups-2.2.6/ppdc/Makefile =================================================================== ---- cups-2.0.0.orig/ppdc/Makefile -+++ cups-2.0.0/ppdc/Makefile -@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ +--- cups-2.2.6.orig/ppdc/Makefile ++++ cups-2.2.6/ppdc/Makefile +@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - echo Generating localization strings... @@ -25,8 +25,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ +@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD compiler... @@ -38,8 +38,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ +@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer... -- cgit 1.2.3-korg