From patchwork Thu Feb 27 22:20:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dechesne X-Patchwork-Id: 25490 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 140E820447 for ; Thu, 27 Feb 2014 22:21:08 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf2842990iec.4 for ; Thu, 27 Feb 2014 14:21:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=COo3BsfJMXxt/6zi+0/3Ly9onxoZbZcJgKB97E5ivTE=; b=Fw7dVhDY37s5Y+rhWxeD7lTMQg+DbgRL2iKTeu1cYWDlpBs1oKHJ23adXU2nVan9oz ziWDpOtCJbvs4b57lub6IfHuaPwRMbh+psWg8p/Fjzq0Jd7YYRygmidKwYog23ISCL7s 17eFNwJIyCZTd/8gAc8yAXz84Auq3DRCHS7KUng8wzQjKOZT+/gtFQxU3TnIsX8JJB3H cotfzrOiaBz1njHH00pG38rZ/ZBegZVyvF/2Arcaz87Jzbe5E0qj1lENuyMER//pcal+ Jisj96gl4hUo6paDpt4wiGkmORfut81jrx9BIbcIfRGHRPQ0HYdxKCYX+zVovbq7PKTi jYbQ== X-Gm-Message-State: ALoCoQnymtwuCZM2PIUBdMJvgkYdNctqf5b7MDmYNA5lYCT407TKQmSsTJHY2fssdibpElYEko4F X-Received: by 10.182.104.70 with SMTP id gc6mr5017865obb.35.1393539668569; Thu, 27 Feb 2014 14:21:08 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.200 with SMTP id p66ls851567qgp.74.gmail; Thu, 27 Feb 2014 14:21:08 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr12621146vec.9.1393539668436; Thu, 27 Feb 2014 14:21:08 -0800 (PST) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id l4si1854655vch.129.2014.02.27.14.21.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 14:21:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so4548033veb.31 for ; Thu, 27 Feb 2014 14:21:08 -0800 (PST) X-Received: by 10.52.247.168 with SMTP id yf8mr65886vdc.65.1393539668360; Thu, 27 Feb 2014 14:21:08 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp9348vcs; Thu, 27 Feb 2014 14:21:07 -0800 (PST) X-Received: by 10.66.26.81 with SMTP id j17mr5798554pag.87.1393539667263; Thu, 27 Feb 2014 14:21:07 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id po10si690665pab.44.2014.02.27.14.21.06 for ; Thu, 27 Feb 2014 14:21:07 -0800 (PST) Received-SPF: pass (google.com: domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 23BF46F416; Thu, 27 Feb 2014 22:20:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mail.openembedded.org (Postfix) with ESMTP id 3BD2F6F41C for ; Thu, 27 Feb 2014 22:20:48 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id f8so39555wiw.1 for ; Thu, 27 Feb 2014 14:20:48 -0800 (PST) X-Received: by 10.194.81.196 with SMTP id c4mr5060786wjy.57.1393539648921; Thu, 27 Feb 2014 14:20:48 -0800 (PST) Received: from localhost.localdomain (gau06-1-78-243-126-63.fbx.proxad.net. [78.243.126.63]) by mx.google.com with ESMTPSA id ju6sm14526019wjc.1.2014.02.27.14.20.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Feb 2014 14:20:48 -0800 (PST) From: Nicolas Dechesne To: openembedded-devel@lists.openembedded.org Date: Thu, 27 Feb 2014 23:20:38 +0100 Message-Id: <1393539638-18126-4-git-send-email-nicolas.dechesne@linaro.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393539638-18126-3-git-send-email-nicolas.dechesne@linaro.org> References: <1393539638-18126-1-git-send-email-nicolas.dechesne@linaro.org> <1393539638-18126-2-git-send-email-nicolas.dechesne@linaro.org> <1393539638-18126-3-git-send-email-nicolas.dechesne@linaro.org> Cc: Nicolas Dechesne Subject: [oe] [meta-qt5][PATCH dora v2 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nicolas.dechesne@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Andre McCurdy If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates. Signed-off-by: Andre McCurdy Signed-off-by: Nicolas Dechesne --- recipes-qt/qt5/qt5.inc | 2 ++ recipes-qt/qt5/qtbase.inc | 4 +++- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 7669efc..d9ebbff 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -7,6 +7,8 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" +PACKAGECONFIG_OPENSSL ?= "openssl" + QT_MODULE ?= "${BPN}" # we don't want conflicts with qt4 diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 4f81f8e..eb22e40 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -43,6 +43,8 @@ PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" +# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency +# PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG ??= " \ release \ @@ -50,7 +52,7 @@ PACKAGECONFIG ??= " \ udev \ evdev \ widgets \ - openssl \ + ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \ diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc index 50c28cd..84f16a4 100644 --- a/recipes-qt/qt5/qtwebkit-examples.inc +++ b/recipes-qt/qt5/qtwebkit-examples.inc @@ -10,3 +10,4 @@ SRC_URI += " \ DEPENDS += "qtwebkit" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"