[oe] [meta-qt5][PATCH dora 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates
Nicolas Dechesne
nicolas.dechesne at linaro.org
Thu Feb 27 16:35:54 UTC 2014
From: Andre McCurdy <armccurdy at gmail.com>
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.
Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne at linaro.org>
Conflicts:
recipes-qt/qt5/qtbase.inc
---
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)}"
--
1.9.0
More information about the Openembedded-devel
mailing list