pcmanfm: add optional support for gtk3

pcmanfm can now use gtk3+ so use that over gtk2+ if it's available.
Since it's only x11-safe for the moment the comment and deps other than
gtk stay the same.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index ac68188a8686b0a425f262eb428d8b8b960a6776..40ebbdfcb4e93127bff6cba1e1c346a4c6238e89 100644 (file)
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PCMANFM
        select BR2_PACKAGE_LIBFM
        select BR2_PACKAGE_MENU_CACHE
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_LIBGTK2
+       select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
        depends on BR2_PACKAGE_XORG7
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2

diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 2f5fa47de507936aa97a46ecf98cf37176e4bf08..e361909375b328b3625e5f6938ea9e2d7da778e9 100644 (file)
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,8 +7,16 @@
 PCMANFM_VERSION = 1.2.4
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
 PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
-PCMANFM_DEPENDENCIES = libgtk2 libglib2 menu-cache libfm
+PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm
 PCMANFM_LICENSE = GPLv2+
 PCMANFM_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+PCMANFM_CONF_OPTS += --with-gtk=3
+PCMANFM_DEPENDENCIES += libgtk3
+else
+PCMANFM_CONF_OPTS += --with-gtk=2
+PCMANFM_DEPENDENCIES += libgtk2
+endif
+
 $(eval $(autotools-package))