Patchwork [meta-qt5,dora,3/3] qtwebkit-examples: add RDEPENDS for ca-certificates

login
register
mail settings
Submitter Nicolas Dechesne
Date Feb. 27, 2014, 4:35 p.m.
Message ID <1393518954-15100-4-git-send-email-nicolas.dechesne@linaro.org>
Download mbox | patch
Permalink /patch/67613/
State Superseded, archived
Headers show

Comments

Nicolas Dechesne - Feb. 27, 2014, 4:35 p.m.
From: Andre McCurdy <armccurdy@gmail.com>

If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@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(-)
Martin Jansa - Feb. 27, 2014, 6:25 p.m.
On Thu, Feb 27, 2014 at 05:35:54PM +0100, Nicolas Dechesne wrote:
> From: Andre McCurdy <armccurdy@gmail.com>
> 
> If qtbase is configured with openssl support then the
> qtwebkit browser example apps require CA certificates.
> 
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
> 
> Conflicts:
> 	recipes-qt/qt5/qtbase.inc

Please drop this

> 
> ---
>  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
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Nicolas Dechesne - Feb. 27, 2014, 10:17 p.m.
On Thu, Feb 27, 2014 at 7:25 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> Conflicts:
>>       recipes-qt/qt5/qtbase.inc
>
> Please drop this

oops. sorry. i messed up with my git aliases... and resent the same.. will fix

Patch

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)}"