From patchwork Fri Mar 29 14:29:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161458 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp2009715oce; Fri, 29 Mar 2019 07:29:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqycZ+4DHrPQJ6WZcnqi7WY136FqkA9MVPdUmGH8+7rlDtkAeddaa0NmRB/ZdzEWFVaqKSP/ X-Received: by 2002:a63:5405:: with SMTP id i5mr41577445pgb.212.1553869766599; Fri, 29 Mar 2019 07:29:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553869766; cv=none; d=google.com; s=arc-20160816; b=rbaHEC1/IddUz5Qe7FlsuHMMakmbemlfrQ8A/7n59XAgvq/LAvqeX7zl/NkVYFwozn JjVEQq0VZcaPqhuP7bB0Ix8XupaFDNkCEdQZ2pS7JTOE1daZ7VYQ4sOnR/6NgPwv+Ojc tv/mChf/Kl8nkUqS8Kt9P/nlvmkSyS6qWjsLGsuPU9pJseZT0fO3dKQlQ1u9mzPPsVe7 ZI091E3Cmb9wK2+1HxrzmWq+cYY0PuCNn4+32WLyTp51MVbQOBgrBqMrzLOaJKt4fTPF k3Jpx3kIXBxLvh2HYROXv6azdYfEQxPtaFvxL3CpYupIfpSQuVbNDilCd97d9gwlHa9v tQ0Q== 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:dkim-signature:delivered-to; bh=BSc0ntbbkAxwrFlJ3xxoYdhrKTmDMB+F/mtPZ6xrD7M=; b=MK5551K7BgwOUt/DtVSva+Vcog1FszswxaLYwJ3thNDFFOOhn2eGKA5K3wUbLbMQPD wQOJNVpLYO5ZabIxHIaek29QOynxx7xH6t2xguRNRJpNf8ZbLqgzvZARMBYE4S41bj8/ L7+GCGZwWcui6Zq5wmDUBdl03aeK953H2kwHII5ebuossa4j6T6brVG7gj0GeWcaOCSI FlpokX2LLAbXqqJjRUy2WeVwqvIUrqoChKgmh3TLacEbFDrcLQyVeL35pEs9Xzj+mOvX YeSKmj8JMI8VxdM3ZAa3ob8v0MwZTDrl9/HZnSUejSIM203C5DQR+tzIdjouB9RpJQEq 0KEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nf6ClSfD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l7si1978146pgq.72.2019.03.29.07.29.26; Fri, 29 Mar 2019 07:29:26 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nf6ClSfD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D67BC7D263; Fri, 29 Mar 2019 14:29:18 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mail.openembedded.org (Postfix) with ESMTP id E2E0F7D256 for ; Fri, 29 Mar 2019 14:29:10 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id h4so2847877wre.7 for ; Fri, 29 Mar 2019 07:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=UoxSFwcfGXbbOOOOW1uWu0i+PdksxDvxDp2WQf6v3LQ=; b=nf6ClSfDHTzYUhC7xaR0FznRos53GBmWA0u1M7TnCUaOOT6NB6DefXchmJnllRs6sE GcqwAG5PK32sfIOyhJ3pI7DrUTI+cwYNNxFNxuT2wO1TLTSJVI95HudLEbLAUxet0sQV zCFb9M5aAxqqKFQLpaS/8fvldoqTqUkH1tdM2vCm9kj2UFWldj0LNH9DwoD1AhW2XAil I7xFxDB5e60uhZQ6PZ2wPUJDnyf8VOTdDr/IdPPfd85a4cNuVX4JSaZH3RIkOKk1HXhb auepVN7HKUENZprWD8kPLLtBGjGgncFioEXsQmwQPEJl3S7dL4brIIG/Lxk4dRarBeZ7 SThg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=UoxSFwcfGXbbOOOOW1uWu0i+PdksxDvxDp2WQf6v3LQ=; b=B/fCrxgL4Z0akn6R/GJfDULdSlkqIVnbMvBFrITGinn8qGMBamO1BFS4w5gegUq2aT COSCPC0fkNRLF7KHqlIXvfoFxfXVS9Q/ZrL88Ys/MYZ97EVes7CAASumkMays4O5zwbA 2CW8YdtMazudwyqVJaYXWTbNrxVXxBX6QymOp/KlfX4gCcLoRVrBq5Er/aEfUP53CH0B voOnGRzadt1A9uapYD6nvBysWHn7SeacZixCuOXDtsXZs7tS3/GI9ZbFojL+Y3xnT+58 9NMMTAK1vuYC5MrwL/R5Y/GDvqfwXjCjqvcnaE8XV7wLnUrSdHgC69B/SqUJeNcZLH2B Rj6g== X-Gm-Message-State: APjAAAWPYkng3Ih13JQ1hcGZg7hGIXFanSijsSMnJCFyDJyQB+gjauBl wBjQOVb7KcVBzRei3kOxU1xrIwKrAyc= X-Received: by 2002:a05:6000:14a:: with SMTP id r10mr5222049wrx.107.1553869751443; Fri, 29 Mar 2019 07:29:11 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e193sm4358537wmg.18.2019.03.29.07.29.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 07:29:10 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 29 Mar 2019 14:29:05 +0000 Message-Id: <20190329142905.20123-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190329142905.20123-1-ross.burton@intel.com> References: <20190329142905.20123-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/3] gtk-icon-cache: clean up DEPENDS 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 Instead of using DEPENDS += use _append to ensure that these additions can't get overwritten. Also use gtk+3-native instead gtk-icon-utils-native as that recipe no longer exists and is provided by gtk+3-native for compatibility. Signed-off-by: Ross Burton --- meta/classes/gtk-icon-cache.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index d87167aec09..3572f62ebb6 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -1,8 +1,8 @@ FILES_${PN} += "${datadir}/icons/hicolor" -DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-icon-utils-native" +DEPENDS_append = " ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+3-native" -PACKAGE_WRITE_DEPS += "gtk-icon-utils-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then