summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Alberto Lopez Perez <clopez@igalia.com>2016-11-09 18:39:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-23 11:10:14 +0000
commit595a84f0c1b94fbfc6683f610e9e1c57ece777ef (patch)
tree9f837d80a29bea1fe19788e89bf4519ee0c3a187
parent8b686f281c07dd473bb56b85633392457afde975 (diff)
downloadpoky-595a84f0c1b94fbfc6683f610e9e1c57ece777ef.tar.gz
webkitgtk: move recommends on ca-certificates from epiphany to webkitgtk.
* The webkitgtk package should recommend the ca-certificates one, because any program usign webkit (and not only epiphany) would expect that the CAs certificates are available and that https validation works as expected. * For example, webkitgtk includes a MiniBrowser program that would fail to proper verify https sites if the ca-certificate package is not installed * Instead of making each one of the webkitgtk consumers care about the certificate package, do this in webkit itself. (From OE-Core rev: fe694f9713595fc5f83c47111f03fc8a0a222f14) Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.22.1.bb3
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.14.1.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
index 3c63d33727..2a9d200209 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.22.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "WebKit based web browser for GNOME"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4 4
5DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr \ 5DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
6 gsettings-desktop-schemas gnome-desktop3 libxml2-native intltool-native" 6 gsettings-desktop-schemas gnome-desktop3 libxml2-native intltool-native"
7 7
8inherit gnomebase gsettings distro_features_check upstream-version-is-even 8inherit gnomebase gsettings distro_features_check upstream-version-is-even
@@ -20,4 +20,3 @@ do_configure_prepend() {
20 20
21FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers" 21FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
22RDEPENDS_${PN} = "iso-codes adwaita-icon-theme" 22RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
23RRECOMMENDS_${PN} = "ca-certificates"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
index 28bbde2a6b..1f2166cc3b 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
@@ -89,6 +89,8 @@ SECURITY_CFLAGS_append_aarch64 = " -fPIE"
89 89
90FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" 90FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
91 91
92RRECOMMENDS_${PN} += "ca-certificates"
93
92# http://errors.yoctoproject.org/Errors/Details/20370/ 94# http://errors.yoctoproject.org/Errors/Details/20370/
93ARM_INSTRUCTION_SET_armv4 = "arm" 95ARM_INSTRUCTION_SET_armv4 = "arm"
94ARM_INSTRUCTION_SET_armv5 = "arm" 96ARM_INSTRUCTION_SET_armv5 = "arm"