Skip to contentSkip to conversation

yad: fix libgtk3 dependency

PATCH New Gustavo Zacarias 2 participants 4 messages Feb 3, 2016 – Feb 8, 2016

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 yad: fix libgtk3 dependency

Make it depend explicitly on BR2_PACKAGE_LIBGTK3_X11 (the X11 backend option) to avoid the checker from complaining.
Also add a comment about yad requiring the X11 backend otherwise it's ambiguous if a user has libgtk3 enabled with broadway/wayland and the comment shows up. Fixes:
http://autobuild.buildroot.net/results/84d/84d97bbcc0ea4f8eaa50dd25bf9ee8fdee4b937f/

Also cleanup some tiny whitespace in the package mk file.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/yad/Config.in | 6 +++---
 package/yad/yad.mk    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
package/yad/Config.in +3 -3
index e4b63a2..50b97c5 100644
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_YAD
 	bool "yad"
 	depends on BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
+	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11
 	help
 	  YAD (yet another dialog) is a tool for create graphical dialogs
 	  from shell scripts.
 
 	  http://sourceforge.net/projects/yad-dialog/
 
-comment "yad needs libgtk2 or libgtk3"
+comment "yad needs libgtk2 or libgtk3 w/ X11 backend"
 	depends on BR2_PACKAGE_XORG7
-	depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3
+	depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3_X11
package/yad/yad.mk +0 -1
index fc25267..24d331c 100644
@@ -10,7 +10,6 @@ YAD_SITE = http://sourceforge.net/projects/yad-dialog/files
 YAD_LICENSE = GPLv3
 YAD_LICENSE_FILES = COPYING
 YAD_DEPENDENCIES = host-intltool host-pkgconf
-
 YAD_CONF_OPTS = --enable-html=no
 
 ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
Signature · 1 line
2.4.10
Applied
#1 lore raw

PATCH 1/1 yad: fix libgtk3 dependency

Dear Gustavo Zacarias,

Quoted 10 lines · Gustavo Zacarias

Make it depend explicitly on BR2_PACKAGE_LIBGTK3_X11 (the X11 backend option) to avoid the checker from complaining.
Also add a comment about yad requiring the X11 backend otherwise it's ambiguous if a user has libgtk3 enabled with broadway/wayland and the comment shows up. Fixes:
http://autobuild.buildroot.net/results/84d/84d97bbcc0ea4f8eaa50dd25bf9ee8fdee4b937f/

Also cleanup some tiny whitespace in the package mk file.

Signed-off-by Gustavo Zacarias <[email protected]>

Applied, but see one question below.

Quoted 10 lines
---
 package/yad/Config.in | 6 +++---
 package/yad/yad.mk    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
package/yad/Config.in +0 -0
index e4b63a2..50b97c5 100644

package/yad/Config.in line 4

Quoted 5 lines
package/yad/Config.in +1 -1
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_YAD
 	bool "yad"
 	depends on BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
+	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11

Is the BR2_PACKAGE_XORG7 dependency still needed, then?

Thomas

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

PATCH 1/1 yad: fix libgtk3 dependency

Quoted 7 lines · Thomas Petazzoni

package/yad/Config.in line 4

Quoted 5 lines

config BR2_PACKAGE_YAD
bool "yad"
depends on BR2_PACKAGE_XORG7

package/yad/Config.in +1 -1
-	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
+	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11

Is the BR2_PACKAGE_XORG7 dependency still needed, then?

Hi.
I believe it isn't, the only weak spot right now is that libgtk3 isn't deterministic - you can select multiple backends like x11 & wayland, however i'm unsure if that's allowed, IIRC there's no way to select which one you want.
Though that's a separate issue that i've already addressed in v3 of the libgtk3 bump by making it a choice.
Regards.

#3 lore raw

PATCH 1/1 yad: fix libgtk3 dependency

Dear Gustavo Zacarias,

Quoted 10 lines · Gustavo Zacarias
Quoted 7 lines · Thomas Petazzoni

package/yad/Config.in line 4

Quoted 5 lines

config BR2_PACKAGE_YAD
bool "yad"
depends on BR2_PACKAGE_XORG7

package/yad/Config.in +1 -1
-	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
+	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11

Is the BR2_PACKAGE_XORG7 dependency still needed, then?

Quoted 5 lines

Hi.
I believe it isn't, the only weak spot right now is that libgtk3 isn't deterministic - you can select multiple backends like x11 & wayland, however i'm unsure if that's allowed, IIRC there's no way to select which one you want.

I'm not sure to understand: following your patch, we depend on BR2_PACKAGE_LIBGTK3_X11, so yad can only be enabled if the Gtk3 X11 backend was selected.

Thomas

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