From patchwork Fri Mar 9 18:56:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131235 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1344860lja; Fri, 9 Mar 2018 11:06:13 -0800 (PST) X-Google-Smtp-Source: AG47ELv8h1Y2T1LAR7a6Lptrc9SMEmfKv5F1MtyD6xrPXdd5lu89lTX4f4K36HUeDJoc6eAJslpJ X-Received: by 2002:a17:902:4545:: with SMTP id m63-v6mr28192250pld.15.1520622373030; Fri, 09 Mar 2018 11:06:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622373; cv=none; d=google.com; s=arc-20160816; b=m8pXa1HaK9Xe46k4kFr8Lt7Na02P0ejolNHug4vuSGoXUmvlCUr+CMzK382Ix0SGPD Ai/2WdLBGy6UOLKUHYiTHkx+DZO+O5AgwLfL+ZK32k5YFQjY3B1szjIo35PhuTzv0Zuz cpyaAjL76CiNvDT0SF+7GTICZbg9OpThFPyqbb6fmTxZerSrNZvcnnRO2HAL5EAsbxyo MYd+B+ciTwrtH27NZib2NKHqJoABHlO4/F00NNyCiGsx5xhcjqfcrU35LDIFVzSse7bs 09w4GjvgL1Fxo5j4YYN6xoClxr0Laro7W+p+6fwgj79hDs+fyMdYdhxCpjsIBf+3Ta7v TKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=lZ87aJHiDX8Hktt/cNIujCiJWhSNVYwWe0MiqMMGryA=; b=kGxYi10TgdlAYi4mkZZv0mLCCWSTYoFYQnHOYYyOyAv9U/N5Z+0CPKJ8jIbirxH5iW Wb5RPpbUBg7LNVGHibIVoh6FuePq47rxuMsG6SNatVxkTCl1y9+o1LVzaN8cm/dl3Iss TJZGXcrOqx/+Vo5WuP6X+ZsM7BgrrkScX2jEPvwsQvSQTbo+eNzyJMDvlF5aa2eIW49d TSB3j5gcBBWAOBV0GgkC68tadJltL8dSp2NyAneNEShW4wqV6o7FZIpnO92LFENLqr+e eImyAFy/iO8fuQ7gkKfPkFV7VL8eLTPC4WSuutOEaUEw7oal8HjPh7+Hqd8dPTx3V+5k F/9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q126si1318935pfc.43.2018.03.09.11.06.12; Fri, 09 Mar 2018 11:06:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 202C7789E2; Fri, 9 Mar 2018 19:03:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 04A577892C for ; Fri, 9 Mar 2018 19:03:28 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:03:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32652031" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:29 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:56:04 +0200 Message-Id: <20180309185614.31113-26-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 26/36] gtk-doc: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton 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 --- .../gtk-doc/files/pkg-config-native.patch | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index bf03c8f6134..bfbc777ff87 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch @@ -10,19 +10,20 @@ Signed-off-by: Ross Burton gtk-doc.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/gtk-doc.m4 b/gtk-doc.m4 -index 3675543..2590e2a 100644 ---- a/gtk-doc.m4 -+++ b/gtk-doc.m4 -@@ -1,6 +1,6 @@ - dnl -*- mode: autoconf -*- +Index: gtk-doc-1.27/gtk-doc.m4 +=================================================================== +--- gtk-doc-1.27.orig/gtk-doc.m4 ++++ gtk-doc-1.27/gtk-doc.m4 +@@ -25,7 +25,7 @@ + # Macro appear in them. The GNU General Public License (GPL) does govern + # all other use of the material that constitutes the Autoconf Macro. -# serial 2 +# serial 2.1 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -@@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], +@@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK], AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -39,6 +40,3 @@ index 3675543..2590e2a 100644 if test "$have_gtk_doc" = "no"; then AC_MSG_WARN([ You will not be able to create source packages with 'make dist' --- -2.15.1 -