From patchwork Thu Mar 8 18:17:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131036 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50533lja; Thu, 8 Mar 2018 10:25:15 -0800 (PST) X-Google-Smtp-Source: AG47ELukLO0X7yzYdVb0raYao1L5F/dKhctMcyMp57XO/b36+ZVWJtS45PPIFSijsoVq7BbAaLr+ X-Received: by 10.101.66.193 with SMTP id l1mr21625688pgp.57.1520533515265; Thu, 08 Mar 2018 10:25:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533515; cv=none; d=google.com; s=arc-20160816; b=WMt/bd0rEt7uGSy4GJW/YU4h0jjW6xgPC/wl+5gFSIX8eQvVD0aa37Lzo0yEi/nYYn wKvvgIWj1c1/53uG0/eibG8dUY/rYNTTpRrI+nptWQWR9L/m5MRA7S+g2GdHtW9cIxIU u6DeTUBWlWqHmbuW5Cf+qmEwF24P/UNHM8e03MV6enzeu+OFYY1yAKwJl0B37Bfm5Xwp XiOXg3RzDIf5/xnnjgtFnswOWuPwtO45LjQThNZl2x/ry34s16DlA8Kclg8PpZKfywDR VM5q45Y+1nwL0zwGY/s4+Z2g8lNzYrgH6XIjIZ1E69/HxIFVPwHpf/qR6I34nYT7tm9h xB/g== 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=6YwmzB1zHjrkaD66IpPh0uWvrAfTsKYTFHcTnpfD/Is=; b=SfIXbBAecx84tsaEN1+MPts7cWkY4A8fFv110cSM6tioRI4Ltu0YtjjSY8RF4xouFp DCTy2vK8qE0waGQ9hs3+rla7bEOu4yGZPWH2viCuHGHT6A3Qz+Mlm8Sq84bWsH5x+DEU 5oNc4wyDW8jWVJySz5SVa32nIpMhgUc1yReP3Y+W4ohcg+EHL5K0gf9pvUZpAIB/kJ9S 8enVVBrE0GP+4Q2usV6w7uPKismBxrZHCT2+Jg7KgHoMjUiiMvBFQ5+zRdkB0KZfi5bM pDmtQTaxtsl8E4ai+outViVzTWAXfjQKOvhuKSLaKC/KYNhRB76oTFWqOqYl2DCs2o8P gGiw== 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 w62si13282660pgd.573.2018.03.08.10.25.14; Thu, 08 Mar 2018 10:25:15 -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 0FD1D78995; Thu, 8 Mar 2018 18:25:08 +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 EE35F7886F for ; Thu, 8 Mar 2018 18:24:45 +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:24:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053624" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:46 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:25 +0200 Message-Id: <20180308181804.31261-3-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 03/42] shared-mime-info: 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 --- .../shared-mime-info/install-data-hook.patch | 14 ++++++++------ .../shared-mime-info/shared-mime-info/parallelmake.patch | 12 ++++++------ 2 files changed, 14 insertions(+), 12 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-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch index 3c9f1ea438c..262ff7562ce 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -8,16 +8,18 @@ Upstream-Status: Pending Signed-off-by: Joe Slater ---- a/Makefile.am -+++ b/Makefile.am -@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status - @INTLTOOL_XML_RULE@ - @INTLTOOL_DESKTOP_RULE@ +Index: shared-mime-info-1.9/Makefile.am +=================================================================== +--- shared-mime-info-1.9.orig/Makefile.am ++++ shared-mime-info-1.9/Makefile.am +@@ -50,7 +50,9 @@ else + update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" + endif -install-data-hook: install-binPROGRAMS +# do NOT make this dependent on anything! +# +install-data-hook: if ENABLE_UPDATE_MIMEDB - $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" + $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" endif diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch index 84c4d03731b..fea34a55a25 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch @@ -11,17 +11,17 @@ RP 10/10/2011 Upstream-Status: Pending Signed-off-by: Constantin Musca -Index: shared-mime-info-1.0/Makefile.am +Index: shared-mime-info-1.9/Makefile.am =================================================================== ---- shared-mime-info-1.0.orig/Makefile.am -+++ shared-mime-info-1.0/Makefile.am +--- shared-mime-info-1.9.orig/Makefile.am ++++ shared-mime-info-1.9/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS=. po - AM_CPPFLAGS = $(ALL_CFLAGS) packagesdir = $(datadir)/mime/packages -@@ -72,8 +70,7 @@ uninstall-hook: +@@ -81,8 +79,7 @@ endif all: $(defaultmakedeps) @@ -29,5 +29,5 @@ Index: shared-mime-info-1.0/Makefile.am - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot +create-pot: po - check: create-pot freedesktop.org.xml update-mime-database check-translations - if test -e $(top_builddir)/freedesktop.org.xml; then \ + local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) + if CROSS_COMPILING