From 91e54d9967d8237abf0cc9aab408bad9bbb4c0b7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 8 Mar 2018 20:17:28 +0200 Subject: libical: 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 --- .../libical/libical/Remove-cmake-check-for-Perl.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'meta/recipes-support/libical') diff --git a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch index c5c0cb076e..b50f50e701 100644 --- a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch +++ b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch @@ -14,11 +14,11 @@ Signed-off-by: Jussi Kukkonen CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d5aad80..5cc9863 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,8 +91,7 @@ if(SHARED_ONLY) +Index: libical-2.0.0/CMakeLists.txt +=================================================================== +--- libical-2.0.0.orig/CMakeLists.txt ++++ libical-2.0.0/CMakeLists.txt +@@ -116,8 +116,7 @@ if(SHARED_ONLY) set(LIBRARY_TYPE SHARED) endif() @@ -26,8 +26,5 @@ index d5aad80..5cc9863 100644 -find_package(Perl REQUIRED) +set(PERL_EXECUTABLE perl) - # MSVC specific definitions - if(WIN32) --- -2.1.4 - + # Ensure finding 64bit libs when using 64-bit compilers + if(CMAKE_CL_64) -- cgit 1.2.3-korg