From patchwork Thu Mar 8 18:17:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131063 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp54026lja; Thu, 8 Mar 2018 10:28:46 -0800 (PST) X-Google-Smtp-Source: AG47ELvM/C78Ha24Z8nrZ4fnI+X+E0u2S4xW0HGgu+B9gL1LKiP1W6wG0tPM85HdNEoF++sADhNw X-Received: by 10.99.121.131 with SMTP id u125mr22085901pgc.263.1520533726670; Thu, 08 Mar 2018 10:28:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533726; cv=none; d=google.com; s=arc-20160816; b=gMiRnMSn/mhWhCn03MhYZ17wvp1rooyQbaqp/uJ78ASN1b0y8ppfYYmH4baIDgV1JR mT5Ot2YfUHmcarkKJcOtniUYLN4ulRFLG7X7dszFTrKjvk+Hq0gFJm1FDAdreMUFkb5E EwCjMQokHrVLFl9pIHgMxbgaxuatlj1TOVTIhR2Q8GB83COURgy+b6NzCHJt/wp4ySPZ mepCtEtuIW7LtN/Ctz1HHFLOJE5MEsQYuzFcvdMa83rib0RkVrBIQR0vBniMM1MdtY3X tlE+0mPbeDHfciuDM9f7pp6S2aQGfz6aPURC+dXBd9NkNivcV7r6Zuay7+MPSXBIzv8y RtNw== 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=aWsWWfgL6LKQJnL21xRyryt1cTPSRh31j8+RVnylyQY=; b=FDC/5f3mpl1COzg25GCe5S9/N7TOcXoZGnIWmyZbJfX1poIcEnTOjwjf0p/d9AFmwZ VH7TMsyB6011ekiHnM8+9Mox+sxffGm/jjEmOSw3GyPFt+jQjoE+fXJeulwt6evcT6VK ffuXvpGqBDxI1AVuMdsYddD6rpi9ZT3uMvNmoxFsa6fc9RZ5zKAsecbv0m1axmen/Lfo ddUH9aXpu9XwQLUQ2QJlqSGEzp/01e5lg8SMfHZLsB0ep7wPwbsiYy6bAO+3p4OEpsOI 5GocWWNV1gtBYI5HeF8zihOFqcGhtvlwCD48MmRmEiyat+cjvv9rAErdZvMlA7mZu7Pr FV6g== 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 b89-v6si15146922plb.809.2018.03.08.10.28.46; Thu, 08 Mar 2018 10:28:46 -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 66AEB78A50; Thu, 8 Mar 2018 18:25:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id CB1807899E for ; Thu, 8 Mar 2018 18:25:30 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:25:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24054027" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:25:31 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:54 +0200 Message-Id: <20180308181804.31261-32-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 32/42] intltool: 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 --- .../intltool/intltool/perl-522-deprecations.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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-devtools/intltool/intltool/perl-522-deprecations.patch b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch index eb52172e10b..f1049e433e2 100644 --- a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch +++ b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch @@ -10,9 +10,11 @@ Take a patch from Debian to solve this. Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) Signed-off-by: Ross Burton ---- intltool-0.51.0-ORIG/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 -+++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 -@@ -1062,7 +1062,7 @@ +Index: intltool-0.51.0/intltool-update.in +=================================================================== +--- intltool-0.51.0.orig/intltool-update.in ++++ intltool-0.51.0/intltool-update.in +@@ -1062,7 +1062,7 @@ sub SubstituteVariable } } @@ -21,7 +23,7 @@ Signed-off-by: Ross Burton { my $rest = $3; my $untouched = $1; -@@ -1190,10 +1190,10 @@ +@@ -1190,10 +1190,10 @@ sub FindPackageName $name =~ s/\(+$//g; $version =~ s/\(+$//g; @@ -36,7 +38,7 @@ Signed-off-by: Ross Burton } if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) -@@ -1219,11 +1219,11 @@ +@@ -1219,11 +1219,11 @@ sub FindPackageName $version =~ s/\(+$//g; $bugurl =~ s/\(+$//g if (defined $bugurl); @@ -52,4 +54,4 @@ Signed-off-by: Ross Burton + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/); } - # \s makes this not work, why? \ No newline at end of file + # \s makes this not work, why?