[Buildroot] [PATCH 1/2] yad: fix libgtk2 related dependency error

[Buildroot] [PATCH 1/2] yad: fix libgtk2 related dependency error

[Ricardo Martincoski]

When yad is built using gtk3 backend, gtk3-x11 needs to be selected too
or following error will occur
*** libgtk2 is in the dependency chain of yad ...

NOTICE: This fix requires the user to re-run Kconfig to update the
config file

The dependency now is enforced by Kconfig, so there is no more need to
test explicitly for gtk3-x11 at build time.

Another solution would be to explicitly test for (gtk3 and gtk3-x11) or
gtk2 at build time and generate a comprehensive error message when the
requirement is not meet. But the builds would still break.

Fixes:
http://autobuild.buildroot.net/results/5b9/5b9e85324d5b4d8bd2390763e7819087cb6b3f65/
http://autobuild.buildroot.net/results/84d/84d97bbcc0ea4f8eaa50dd25bf9ee8fdee4b937f/
http://autobuild.buildroot.net/results/988/98887e469a6b490966a3315ce674bc8d2cd68753/

Keeps fixed:
http://autobuild.buildroot.net/results/91d/91dc6ab749f967ae046f856f3f592d5a548499c6/

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Cc: James Knight <james.knight@rockwellcollins.com>
---
 package/yad/Config.in | 1 +
 package/yad/yad.mk    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/yad/Config.in b/package/yad/Config.in
index e4b63a2..e465e44 100644
--- a/package/yad/Config.in
+++ b/package/yad/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_YAD
 	bool "yad"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
+	select BR2_PACKAGE_LIBGTK3_X11 if BR2_PACKAGE_LIBGTK3
 	help
 	  YAD (yet another dialog) is a tool for create graphical dialogs
 	  from shell scripts.
diff --git a/package/yad/yad.mk b/package/yad/yad.mk
index fc25267..9d7ab37 100644
--- a/package/yad/yad.mk
+++ b/package/yad/yad.mk
@@ -13,7 +13,7 @@ YAD_DEPENDENCIES = host-intltool host-pkgconf
 
 YAD_CONF_OPTS = --enable-html=no
 
-ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+ifeq ($(BR2_PACKAGE_LIBGTK3),y)
 YAD_DEPENDENCIES += libgtk3
 YAD_CONF_OPTS += --with-gtk=gtk3
 else
-- 
1.9.1

[Buildroot] [PATCH 2/2] yad: bump to version 0.33.1

[Ricardo Martincoski]

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
This patch is completely unrelated to the build fix [PATCH 1/2].
But both patches change the same package, so I didn't see any harm in
sending it as a patch series.
---
 package/yad/yad.hash | 5 +++--
 package/yad/yad.mk   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/yad/yad.hash b/package/yad/yad.hash
index 4e88ab0..1839282 100644
--- a/package/yad/yad.hash
+++ b/package/yad/yad.hash
@@ -1,2 +1,3 @@
-# Locally computed
-sha256 c91d6a9eb36abdb502d2d8ada0ec29c266b94a6628f723adeca436bee0b6c55c yad-0.31.2.tar.xz
+# From http://sourceforge.net/projects/yad-dialog/files/
+md5	4e24888712be1e95fd3cea815f19c6cb	yad-0.33.1.tar.xz
+sha1	b39977128678ca67bf4649929510f729c9cf1e67	yad-0.33.1.tar.xz
diff --git a/package/yad/yad.mk b/package/yad/yad.mk
index 9d7ab37..9c07d91 100644
--- a/package/yad/yad.mk
+++ b/package/yad/yad.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-YAD_VERSION = 0.31.2
+YAD_VERSION = 0.33.1
 YAD_SOURCE = yad-$(YAD_VERSION).tar.xz
 YAD_SITE = http://sourceforge.net/projects/yad-dialog/files
 YAD_LICENSE = GPLv3
-- 
1.9.1

[Buildroot] [PATCH 1/2] yad: fix libgtk2 related dependency error

[Gustavo Zacarias]

On 02/02/16 22:52, Ricardo Martincoski wrote:

> --- a/package/yad/Config.in
> +++ b/package/yad/Config.in
> @@ -2,6 +2,7 @@ config BR2_PACKAGE_YAD
>   	bool "yad"
>   	depends on BR2_PACKAGE_XORG7
>   	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
> +	select BR2_PACKAGE_LIBGTK3_X11 if BR2_PACKAGE_LIBGTK3
>   	help
>   	  YAD (yet another dialog) is a tool for create graphical dialogs
>   	  from shell scripts.

Hi.
This logic is severely broken, you can't force X11 if someone is using 
gtk3 with say broadway or wayland.
Not to mention BR2_PACKAGE_LIBGTK3_X11 depends on xorg being selected.

> -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
> +ifeq ($(BR2_PACKAGE_LIBGTK3),y)

This isn't accurate either, you first say it needs x11 by selecting it, 
but you then basically say no?
Regards.

[Buildroot] [PATCH 1/2] yad: fix libgtk2 related dependency error

[Arnout Vandecappelle]

On 03-02-16 13:17, Gustavo Zacarias wrote:
> On 02/02/16 22:52, Ricardo Martincoski wrote:
> 
>> --- a/package/yad/Config.in
>> +++ b/package/yad/Config.in
>> @@ -2,6 +2,7 @@ config BR2_PACKAGE_YAD
>>       bool "yad"
>>       depends on BR2_PACKAGE_XORG7
>>       depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
>> +    select BR2_PACKAGE_LIBGTK3_X11 if BR2_PACKAGE_LIBGTK3
>>       help
>>         YAD (yet another dialog) is a tool for create graphical dialogs
>>         from shell scripts.
> 
> Hi.
> This logic is severely broken, you can't force X11 if someone is using gtk3 with
> say broadway or wayland.

At least in the current (broken) libgtk3, you can select X11 and wayland in
parallel.

> Not to mention BR2_PACKAGE_LIBGTK3_X11 depends on xorg being selected.

 The depends is two lines higher.


> 
>> -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
>> +ifeq ($(BR2_PACKAGE_LIBGTK3),y)
> 
> This isn't accurate either, you first say it needs x11 by selecting it, but you
> then basically say no?

 Since LIBGTK3_X11 was selected if LIBGTK3, either one has the same effect.


 Regards,
 Arnout


> Regards.
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 


-- 
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

[Buildroot] [PATCH 2/2] yad: bump to version 0.33.1

[Thomas Petazzoni]

Dear Ricardo Martincoski,

On Tue,  2 Feb 2016 23:52:36 -0200, Ricardo Martincoski wrote:
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> This patch is completely unrelated to the build fix [PATCH 1/2].
> But both patches change the same package, so I didn't see any harm in
> sending it as a patch series.
> ---
>  package/yad/yad.hash | 5 +++--
>  package/yad/yad.mk   | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)

Applied, thanks.

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

[Buildroot] [PATCH 1/2] yad: fix libgtk2 related dependency error

[Ricardo Martincoski]

Hi Gustavo,

On Wed, 3 Feb 2016 09:17:48 -0300, Gustavo Zacarias wrote:
> On 02/02/16 22:52, Ricardo Martincoski wrote:
> 
>> --- a/package/yad/Config.in
>> +++ b/package/yad/Config.in
>> @@ -2,6 +2,7 @@ config BR2_PACKAGE_YAD
>>   	bool "yad"
>>   	depends on BR2_PACKAGE_XORG7
>>   	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
>> +	select BR2_PACKAGE_LIBGTK3_X11 if BR2_PACKAGE_LIBGTK3
>>   	help
>>   	  YAD (yet another dialog) is a tool for create graphical dialogs
>>   	  from shell scripts.
> 
> Hi.
> This logic is severely broken, you can't force X11 if someone is using 
> gtk3 with say broadway or wayland.
> Not to mention BR2_PACKAGE_LIBGTK3_X11 depends on xorg being selected.

Thank you for your explanation.
I marked my patch as Superseded by yours
http://patchwork.ozlabs.org/patch/577916/
yad: fix libgtk3 dependency

> 
>> -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
>> +ifeq ($(BR2_PACKAGE_LIBGTK3),y)
> 
> This isn't accurate either, you first say it needs x11 by selecting it, 
> but you then basically say no?

My intent was to let the dependency to x11 be handled at config time.
But I see now the way it currently is on the master branch is better.

Regards,
Ricardo