From 7c2fbc0c5d14d52214f86c8e4437b15142b72b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Wed, 5 Jul 2017 22:46:53 +0300 Subject: [PATCH] webkitgtk: select libgcrypt Libgrcrypt is a direct dependency of WebKitGTK+, and as such it should be selected. Signed-off-by: Adrian Perez de Castro Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: add missing dependency on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS.] Signed-off-by: Thomas Petazzoni (cherry picked from commit b61c805fcaf8980a3dbcd23c444660f7f5327ecf) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 2 ++ package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 25f6fad49c..7b50a13a04 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS @@ -30,6 +31,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_ICU select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBXML2 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index e9fb66bbd0..187885add6 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \ - enchant harfbuzz icu jpeg libgtk3 libsecret libsoup \ + enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libxml2 libxslt sqlite webp WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \