From patchwork Fri Mar 29 14:29:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161456 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp2009536oce; Fri, 29 Mar 2019 07:29:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+blhSuaIAcRldPXFTlm74lcpM8Z38o6/ADydGcSV5x2YmsRn03MHKHYMxyvHuD0xeQbkB X-Received: by 2002:a63:69c2:: with SMTP id e185mr45546701pgc.4.1553869754385; Fri, 29 Mar 2019 07:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553869754; cv=none; d=google.com; s=arc-20160816; b=ZuPR5eD3jjuT2Z7sS42GhjAknXnELODerd8V9+Ze2zT3gKOFWL5aZDdRq/Q3YCGG3z Z3gqKKoZpGrVUBq+49QdPgwC937A4DfdEzv7OSHykEj/Ae1/aYh/ZtRPeiFGxIPCDB8T RoE7KM6ui+xemL3ghZIX+eFq4RZA+vkCX1xbzjvWmhOmQF3XVGBKlBkCBFqPulrWQS6G 9RIIkZ4uJgc14gxNSu42303Z12uRFt2NpzWNn8oyeHs7+mLF74T4XWTCXFp1CHFU84us NeadRWlesy2zYmSlHF55bGbgtbqKRZibm+qlhd0kOmynx0lqjlQ7cshp6GTbB3aUfKyv GeaQ== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=P3p1+nrHJ7OF+ixAJC+e1zS2OlSQLYKJvheAExGW0mU=; b=AWvGIdWEMfITJw0+tW8X0M0nXDs4n9fZGpojwRjBHYgLkHDbdLtVm4AO/ADr2HppvF qm1zzzaiC8bFha9OcS7sHHZYmTG3OthklTzMmim9kL6/MyfjwC0jD8mOlcU0TX/L5BpD de0WbC58I4sbBwTqPGwCtTay7cFBWO0JywOpR39exaJESkQyhebBzQjBZjbPN12O5VAX gXVwHV9jANia79OJV8gp2St1PIe5by3bAvfxBwhS+cI7FOchWMKHsxxIfMMI/89xsssJ XK2Kv+4+epWfbRl78X3lhOVEhq3hCCOD0VMdXInXh/koiuo7J/uQEJahX+T0oF3TX2SZ aHhQ== 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=CuvbRbD+; 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 h7si1895840pfb.167.2019.03.29.07.29.13; Fri, 29 Mar 2019 07:29:14 -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=CuvbRbD+; 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 D05737D253; Fri, 29 Mar 2019 14:29:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mail.openembedded.org (Postfix) with ESMTP id BFA367D244 for ; Fri, 29 Mar 2019 14:29:08 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id z11so2788695wmi.0 for ; Fri, 29 Mar 2019 07:29:10 -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; bh=FDgktRJMQ2Wn2t8yDaxikpN+FpNI8yFy48JrbI7MgA0=; b=CuvbRbD+ggpv2kFJrvzpcOnNW8tZUhRtodA9evceWDBB6PxZf4si5ghCAr7aYCc4GL jqxXyLZZe9eGPzH09e3JkdIu5GZwfj7o0lDTf1vYgSjz57PebwdDEeQb27R/IGlV6pfr mJ65WNWOSqsml+NTn3bagR7OwZ5wvzdLWcG3bAgd5Oxo2mRdhsDQHnlzldYUouM9qn/n zCaOzaQm2Ts1prJrWhBBq1i/ptVnBZA7qFeoSleZSkjxKvL1l46zxhACqBPTaijKc8M6 79CXgRIqOtdMWaV40/CHYC3JYu2SpaN1zFMK35uJkuYkMcD2k5OXumuJbMwBYXSAVgpM DPfg== 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; bh=FDgktRJMQ2Wn2t8yDaxikpN+FpNI8yFy48JrbI7MgA0=; b=sTjtHWn2GbhQR1K32TiiaPwURmQbWSBi3bAyKz1BW4EKvai0IXk+b+mlg8L2OCVRdt lHaIqaVK2pdW/U2KzHb138uZICEh2CaFREun9wRWYfHcoOi0+BSgnh5bwhRAy+ASTmKY qgAYiVQ9gawc6fqwZUodfKh6gZKyYsFAFzOqR/eQUTh8ZMEDai4skr8GUa8k9TNMCNHv eUHDM4AGn6WLLQW4gq1o+jPIyNgSARg2qR4naWi4C+4hSXuQInV0SMJQPMrxAAPdv6u4 FSY9I+kkec1FR/zRCEJTW/dOTBpemQgr83nPENv0SbpCDM6ltRhiw6vcofAZ7A69rnnt AZag== X-Gm-Message-State: APjAAAUtOtvN6rUAUd1n4yOfpTbeGWeWdaQq3MFUQQBnI/98TVbz2JGL SU5StA1pYjlbUmKJjW0W9oEcQZHN1yQ= X-Received: by 2002:a1c:b646:: with SMTP id g67mr3901853wmf.125.1553869749096; Fri, 29 Mar 2019 07:29:09 -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.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 07:29:08 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 29 Mar 2019 14:29:03 +0000 Message-Id: <20190329142905.20123-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/3] Revert "gtk+3: add librsvg to 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 This was added so that adwaita-icon-theme can find the SVG loader for icon generation, but the fix is in the wrong place. GTK+ does not depend on librsvg at all, the tool in GTK+ which loads the icons uses gdk-pixbuf which uses loadable modules. This reverts commit 66828ff04d107b7719c9c8857d7c6c2ebf20a8bb. Signed-off-by: Ross Burton --- meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index b58641a4702..77b6c31536b 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "libs" -DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf librsvg \ +DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ gdk-pixbuf-native" LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" From patchwork Fri Mar 29 14:29:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161457 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp2009616oce; Fri, 29 Mar 2019 07:29:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLAehEAQEM7HctXKCxS04zpEKQMEbLQDV7r20IMVRu6pESZzDMD+g241DS4EA+OKbWKxmp X-Received: by 2002:a63:1247:: with SMTP id 7mr41524407pgs.352.1553869760924; Fri, 29 Mar 2019 07:29:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553869760; cv=none; d=google.com; s=arc-20160816; b=fAurPQs1FJX+OAV/6xB6L52i8CAy+JM2cD6eOrtZ21eKYSMIyY9v91euyEBr8E4Lva l7kPeXhZydxdlS8qqI+gWMLQBGvhHf6N+BEWXMnKV4OcUybzfzhixEdf2pzge/0y6gBO 8UlJcQO7umGq6d6HXWHtmgQBSHGFaRhSY7eHE7kCU8c0NDPdZqNRQdvRYYh5GVm4upZu iXu5vc8kuZN/56ude+CqPxdIZKo/ip2yfgSiRyyoOtLChnxe7ABqapxHp2iaLMyVtKKS crh9ohOtuoX/ZviyekpKW2DF2WSXSB4o31FAiNsm7znykBHuxhyoxkKtXCNHuIOZm2fZ WOwg== 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=9z611tPCSEdTUaFVEhWELq+2uGQsWMc9XKM8DUcwBd8=; b=y0GImDsRM6ftatF2cgQoLXdUI1puftH95j8SJrU39/jGIOeElQ5HODCva6PjxTBUVw RzlhOXA0sgct0E6O+o7TkQo9UYh/oHi6vy51dd+ttBqDi9FcBmVg63NIR7ATGnVCYA2G WjirhilicY/h+DT6y6A8U+t9m02r62TvS+zPP7PFqERb7SxolOW0Cg/4pkoWf2emzICG tnEqmPO1PuZ0L05b/LJjytarjhyR/AW/ZWxK1DAf0bcD2C1WFXffu1BxSLoAbIX5mYd9 ZPdIXFNuXGEuKopfmTvm2THCtqfoQP5a/+eKgHzbJadDW0W+d+eisWnxo0U/CKBvnWgZ jaVA== 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=X4Lvdm+d; 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 q16si2117613pgk.405.2019.03.29.07.29.20; Fri, 29 Mar 2019 07:29:20 -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=X4Lvdm+d; 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 B456A7D25C; Fri, 29 Mar 2019 14:29:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mail.openembedded.org (Postfix) with ESMTP id DEE9E7D244 for ; Fri, 29 Mar 2019 14:29:09 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id t17so2815461wrw.13 for ; Fri, 29 Mar 2019 07:29:11 -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=kXMeYPra8XOwVNdTqJLg8xP6abx9u95mtFiB7kyiONo=; b=X4Lvdm+dm5QJxGmCHA99rp+AH+/Y/DtjKZGf+udhoHgfd6fmAqW81B24J66jb5OpgL 7mFNoOQhS8dXLiHrpNZuoG/qtEayFKl9R0gPHlmZo5aOXB2BlI8o+S1XFvQ2GJrCZwxa IPbsV0bW/LrHiEHzPTj4zW08new0hM2GChbU3jtWsmj9PDXUCqVGmRdsiJeWFfIwq4CB VTgkn4VXIPbc+vM6hTkff/S8rb1RuxR+uc/tumQU//ZUiNXTnvNLzSHWGA57VcTJMJUT KgoZxQIjib1ihF6yUUB6dDY/gKGyy6aq3kK04upAZAzZVww4+GURrGzhljkrc1Sza/J9 ynFw== 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=kXMeYPra8XOwVNdTqJLg8xP6abx9u95mtFiB7kyiONo=; b=Tka+yome66laKOjPX1rPCVYeboOjimQcQHLQOAicHbX0iYS2rpOWFzQLExO8Dr7Dvm bdsxrt5YszyIxLGR2mZYH4wsj5FObq9hLe5xm9V1I/r7s35NtqLkeTWXC14QkklqlTdn x3lIP8zo+RZ4B1QGE37VyOhmM55fgmFrkxe2l5P2smoFrmeJE6MYhdGR1fObltlNplQH 7RGhtS58QK/Dy+uUyQINvlkO+tgjwe7chFwJgJXpDzAOSySXlmye2O+C+/UsmQfsO7iC xnGsO6DeZrlWkV0YR6LG7ru7p2BSSMgjgDloekq0zIWZ1sFPG3hNqQMmeydP8kOKDgNg ZxOQ== X-Gm-Message-State: APjAAAW2m5A+JPE4y7ChQNE29GvKUHGnXUUMfp4Xw4Tfkwrh4bskdl6E qDZhEnp3zF5VDCRAt3aOylROH436oMs= X-Received: by 2002:a5d:52c6:: with SMTP id r6mr6791651wrv.131.1553869750438; Fri, 29 Mar 2019 07:29:10 -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.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 07:29:09 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 29 Mar 2019 14:29:04 +0000 Message-Id: <20190329142905.20123-2-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 2/3] adwaita-icon-theme: depend on librsvg 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 adwaita-icon-theme uses gtk-encode-symbolic-svg to generate icons, so DEPEND on librsvg-native (and gtk+3-native, via gtk-icon-cache.bbclass) so that this tool exists and can load SVG files. Signed-off-by: Ross Burton --- meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb index 451ef39f1ad..8eadbd2eef7 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c" inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even - MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ @@ -18,6 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "db3fd812821d72fdd9a3c7d622a95b35" SRC_URI[sha256sum] = "6d752a2b1bc668483956d4485c39cad1642d9358e133ff689526e43674a4e1ce" +DEPENDS += "librsvg-native" + PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" RREPLACES_${PN} = "gnome-icon-theme" 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