Skip to contentSkip to conversation

Select libgcrypt along with webkitgtk

PATCH New Adrian Perez de Castro 4 participants 5 messages Jul 5, 2017 – Jul 19, 2017

lore
Share & tools
lore

Adrian Perez de Castro

author
#0 lore raw

cover Select libgcrypt along with webkitgtk

Hi,

While making a completely clean build starting from raspberrypi3_defconfig, I've noticed that libgcrypt is not automatically chosen -- and it should be! Probably in many cases when people build WebKitGTK+ they also choose other packages that need libgcrypt and the issue went unnoticed.

(It seems maybe it was a good idea to get serious and give it a try to poke at the webkitgtk package :-P)

Greetings,

Adrian Perez de Castro (1):
webkitgtk: select libgcrypt

 package/webkitgtk/Config.in    | 1 +
 package/webkitgtk/webkitgtk.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
2.13.2
author
#1 lore raw

PATCH 1/1 webkitgtk: select libgcrypt

Libgrcrypt is a direct dependency of WebKitGTK+, and as such it should be selected.

Signed-off-by Adrian Perez de Castro <[email protected]>
---
 package/webkitgtk/Config.in    | 1 +
 package/webkitgtk/webkitgtk.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
package/webkitgtk/Config.in +1 -0
index 0754fe5123..47672045d9 100644
@@ -32,6 +32,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
package/webkitgtk/webkitgtk.mk +1 -1
index cc8d960e47..ef20839f92 100644
@@ -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 \
Signature · 1 line
2.13.2
#2 lore raw

PATCH 1/1 webkitgtk: select libgcrypt

Quoted 4 lines · Adrian Perez de Castro

Libgrcrypt is a direct dependency of WebKitGTK+, and as such it should be selected.

Signed-off-by Adrian Perez de Castro <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Thank you for your quick contributions!

Regards,
Arnout

Quoted 31 lines
---
 package/webkitgtk/Config.in    | 1 +
 package/webkitgtk/webkitgtk.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
package/webkitgtk/Config.in +1 -0
index 0754fe5123..47672045d9 100644
@@ -32,6 +32,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
package/webkitgtk/webkitgtk.mk +1 -1
index cc8d960e47..ef20839f92 100644
@@ -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 \
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Applied
#3 lore raw

PATCH 1/1 webkitgtk: select libgcrypt

In reply to Adrian Perez de Castro

Hello,

Quoted 8 lines · Adrian Perez de Castro

Libgrcrypt is a direct dependency of WebKitGTK+, and as such it should be selected.

Signed-off-by Adrian Perez de Castro <[email protected]>
---
 package/webkitgtk/Config.in    | 1 +
 package/webkitgtk/webkitgtk.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

When you select a package, you must replicate its dependencies. So in this case, when you add "select BR2_PACKAGE_LIBGCRYPT", you must add "depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS".

Of course, the set of architectures supported by WebKitGTK+ is probably already smaller than the set of architectures supported by libgpg-error, but for consistency reasons, replicating the dependency is recommended.

I've applied your patch after addressing this issue. Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com