summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2016-07-23 10:31:25 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-23 17:00:58 +0200
commit97f1cbb0aad762385bbaf67e70f2fdcf171e6c6f (patch)
treee70fc78a37a2b0b018fdf1b5aead37edf5ec82ca
parent52c86b35ab7c1f17f3e6ce92a4c03a02febf017d (diff)
downloadbuildroot-97f1cbb0aad762385bbaf67e70f2fdcf171e6c6f.tar.gz
buildroot-97f1cbb0aad762385bbaf67e70f2fdcf171e6c6f.zip
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>
-rw-r--r--package/pcmanfm/Config.in2
-rw-r--r--package/pcmanfm/pcmanfm.mk10
2 files changed, 10 insertions, 2 deletions
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index ac68188a86..40ebbdfcb4 100644
--- 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 2f5fa47de5..e361909375 100644
--- 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))
OpenPOWER on IntegriCloud