[Buildroot] [git commit] package/yad: drop support for gtk2

[Arnout Vandecappelle]

commit: https://git.buildroot.net/buildroot/commit/?id=5b6b80bfc5237ab4f4e35c081fdac1376efdd396
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

As we're about to remove libgtk2, we need to first drop support for
gtk2 in yad. It continues to support gtk3.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
[Arnout: simply .mk file: BR2_PACKAGE_LIBGTK3_X11 is always true]
Signed-off-by: Arnout Vandecappelle <arnout at rnout.be>
---
 package/yad/Config.in |  8 +++-----
 package/yad/yad.mk    | 12 ++----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/package/yad/Config.in b/package/yad/Config.in
index 300525ee3c..4a140f63d7 100644
--- a/package/yad/Config.in
+++ b/package/yad/Config.in
@@ -1,13 +1,11 @@
 config BR2_PACKAGE_YAD
 	bool "yad"
-	depends on BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11
+	depends on 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 w/ X11 backend"
-	depends on BR2_PACKAGE_XORG7
-	depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3_X11
+comment "yad needs libgtk3 w/ X11 backend"
+	depends on !BR2_PACKAGE_LIBGTK3_X11
diff --git a/package/yad/yad.mk b/package/yad/yad.mk
index 15788efac0..b40220f9ad 100644
--- a/package/yad/yad.mk
+++ b/package/yad/yad.mk
@@ -9,16 +9,8 @@ YAD_SOURCE = yad-$(YAD_VERSION).tar.xz
 YAD_SITE = http://sourceforge.net/projects/yad-dialog/files
 YAD_LICENSE = GPL-3.0
 YAD_LICENSE_FILES = COPYING
-YAD_DEPENDENCIES = host-intltool host-pkgconf $(TARGET_NLS_DEPENDENCIES)
+YAD_DEPENDENCIES = host-intltool host-pkgconf libgtk3 $(TARGET_NLS_DEPENDENCIES)
 YAD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
-YAD_CONF_OPTS = --enable-html=no
-
-ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
-YAD_DEPENDENCIES += libgtk3
-YAD_CONF_OPTS += --with-gtk=gtk3
-else
-YAD_DEPENDENCIES += libgtk2
-YAD_CONF_OPTS += --with-gtk=gtk2
-endif
+YAD_CONF_OPTS = --enable-html=no --with-gtk=gtk3
 
 $(eval $(autotools-package))