From patchwork Wed Mar 7 13:42:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130892 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5196494lja; Wed, 7 Mar 2018 05:42:15 -0800 (PST) X-Google-Smtp-Source: AG47ELs3n0rG40Bf5Ia0NrqMJZOBtCRBEmmiWdO6esrvZkU9NCRszBdvdm/wrl1xqptpFeMpoQki X-Received: by 10.99.120.199 with SMTP id t190mr17779307pgc.72.1520430135363; Wed, 07 Mar 2018 05:42:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520430135; cv=none; d=google.com; s=arc-20160816; b=v/LCREeT2NvHsfsSPvTkAikVdN/qXQPghu21j5onvYl/Xeojf47CIxvDNv8IowOav2 Q7Pv06Fr/l6Z6ozyAWO/ikl8JL8y/VDLbg78qCeGG2vRiKIJkJRsTUk9bcaHh8LTyQuA auVPBorBv/MrRkWQsI9w1GL13nNyCcuyTkmh4BNne9yt7U1a5zGHJ/wxEu5XMIzdkZZn 1y4PI0QLqX88koHmrlOsBeX7IwU/dyiUjLZv5zF4dYiRrW0i3rONjxN365pVkiunxFDu v7vgdx6bRjvQBeXbh9gw3wP8hU2cnH6Tpl45puK8aAqXikZ5Ssfe/MQs+5wtm2UN8IgU 5zyg== 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:arc-authentication-results; bh=o9M2BCofIJ57WnZoTiYerdUJnQ6DOI1ExvV7o0cN3bs=; b=DIaHpAOtsTuTFSneQhq4gJvamnbLUVxiWQKq23G8h8Ci/RKtrgY0Ij2WMLusHIR+6E /l6At7ek9jIS89rzYk75ktxtTeTC+ofHVkPhKaFFkc9xVOHIlBMIzFFK2V6OIrIT4i7l zarYF2Bx8tGCIIFjwQPK7L9WUX8dBT1NtNw5kK63cDD85lQDVALb6CEP90sScQs8m7bR nBKIchRhqNAr/km+oNU7TizoEOZia8wWQRc2bHCJsFazMb+8F4Qg2IyCS6TiVZ9jUp5/ M28XZktiVAksLt3eRiv1NC468tduksFF5zxaLLNfz8Y4bw0lhUmT2wmVNNY7XafQKRS4 dtvg== 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=xGBk1D5T; 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 g9si12157893pfi.310.2018.03.07.05.42.15; Wed, 07 Mar 2018 05:42: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; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=xGBk1D5T; 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 4F70978965; Wed, 7 Mar 2018 13:42:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by mail.openembedded.org (Postfix) with ESMTP id 538F777FE8 for ; Wed, 7 Mar 2018 13:42:09 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id t3so4862194wmc.2 for ; Wed, 07 Mar 2018 05:42:11 -0800 (PST) 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=HoUtWn+2NmbH76INhUmJAteGOKyS8wn60Qy+CpmuV24=; b=xGBk1D5T8fppOaaT5ldQ7LI2frTd6hgifaTASmU1rnIZMCIx+rCDWq3Y2SC+M0i9R1 jzLehRANsUKBMM6p3Jxbf6a1U3NurAJVqQDtCpqoITjuu8KHj740kD6l/kUl91HPobHT 0MqHwpbcVhXCJN8VLAjqsnxB8yKBTjyLM3Gto9Ix73pfOgHAOjEgfpZtiyNkXhCSe3oY n7M7Evp7hPo0yFsJ/1znvRapi/XC6hT/4KDEC5NOvNGbs4uwPnc+CFzoP6r+hIm5LS+n NrDbE6rnsdpb5zehEWjVulbozmHQvFOqc11P1eTgVqqRn4hk7B35AIvsoUv1qkz4N8tK WkMg== 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=HoUtWn+2NmbH76INhUmJAteGOKyS8wn60Qy+CpmuV24=; b=moLNx9fYN53R6afL/TnIIdEw2UOvXP76AOBfM3NcvA36u+aSH3SaJ6LMcfddHDxXOd 6x3wRe3W5eca3oplqDbe00q44iYDYU3diMyHXyeLtBkeuc66cp9hLqJm00qf6MA7k7uQ exkJVWBoLxYPzC7hanm/WnYtFNFkmJXUzy2OPexSKCJMQ/T3nM4LyNPZbWlYS4HBhdtC 6Lp6RpnadKSGwNkLa4/PfdKsNVYOHWtCN4Pr8Ohi+KuWuwhbWifNvPZHUsVROjMlW3ao BrhS0RIt9f3y7OhbTXFvZEJvZOVf/O5jXIoEVQ67a0T214Ipxvxq14nTIsHS1BylI58A tevw== X-Gm-Message-State: AElRT7EbVbNA/f+l7AR3ZOdsF4Z3RH5wP+cN0lZG0FwW+mloYOVpZh+/ aChffocSp1kJo491ihQdLDXFKfYf X-Received: by 10.28.195.133 with SMTP id t127mr14239449wmf.156.1520430130530; Wed, 07 Mar 2018 05:42:10 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id n12sm10188292wmc.35.2018.03.07.05.42.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 05:42:09 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 7 Mar 2018 13:42:07 +0000 Message-Id: <20180307134207.24700-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] libfm: fix dependencies 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 libfm uses glib-gettextize so explicitly depend on glib-2.0-native. Instead of depending on gettext-native, inherit gettext. Signed-off-by: Ross Burton --- meta/recipes-support/libfm/libfm-extra_1.2.5.bb | 4 ++-- meta/recipes-support/libfm/libfm_1.2.5.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 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/recipes-support/libfm/libfm-extra_1.2.5.bb b/meta/recipes-support/libfm/libfm-extra_1.2.5.bb index 0134572f1f8..c0fd83ef344 100644 --- a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb +++ b/meta/recipes-support/libfm/libfm-extra_1.2.5.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" SECTION = "x11/libs" -DEPENDS = "glib-2.0 intltool-native gettext-native" +DEPENDS = "glib-2.0-native glib-2.0 intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ @@ -18,6 +18,6 @@ S = "${WORKDIR}/libfm-${PV}" EXTRA_OECONF = "--with-extra-only --with-gtk=no" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc gettext do_configure[dirs] =+ "${S}/m4" diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb index c1deea68531..596408353fa 100644 --- a/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ SECTION = "x11/libs" -DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native" +DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ @@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" -inherit autotools pkgconfig gtk-doc distro_features_check +inherit autotools pkgconfig gtk-doc gettext distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECONF = "--with-gtk=3"