Merge from bittboy/buildroot@db180c0

package/libfm/0001-modules-fix-cross-compilation.patch

@@ -0,0 +1,27 @@
+From 3bc935b732d1ff448727e90340e4be40ef6fc000 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 29 Apr 2018 20:22:29 +0200
+Subject: [PATCH] modules: fix cross-compilation
+
+Do not add -L$(libdir) to AM_LDFLAGS
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/modules/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
+index e61f4e01..01c15bd4 100644
+--- a/src/modules/Makefile.am
++++ b/src/modules/Makefile.am
+@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
+ # tell libtool we compile module not library
+ AM_LDFLAGS = \
+ 	-no-undefined -module -avoid-version -shared -export-dynamic \
+-	-L$(libdir) \
+ 	$(GIO_LIBS)
+ 
+ # the module should be linked only with libfm, not libfm-gtk or whatever
+-- 
+2.14.1
+

package/libfm/Config.in

@@ -0,0 +1,30 @@
+config BR2_PACKAGE_LIBFM
+	bool "libfm"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_INSTALL_LIBSTDCPP # libgtk2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
+	select BR2_PACKAGE_MENU_CACHE
+	help
+	  A glib/gio-based library providing some file management
+	  utilities and related-widgets missing in gtk+/glib. This is
+	  the core of PCManFM.  The library is desktop independent
+	  (not LXDE specific) and has clean API. It can be used to
+	  develop other applications requiring file management
+	  functionality. For example, you can create your own file
+	  manager with facilities provided by libfm.
+
+	  http://wiki.lxde.org/en/Libfm
+
+comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.8"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7

package/libfm/libfm.hash

@@ -0,0 +1,7 @@
+# From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
+md5 c15ecd2c9317e2c385cd3f046d0b61ba  libfm-1.3.1.tar.xz
+sha1 29539f50acd5c00a00362adffd532053b0688e66  libfm-1.3.1.tar.xz
+
+# Hash for license files:
+sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388  COPYING
+sha256 c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e  src/extra/fm-xml-file.c

package/libfm/libfm.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# libfm
+#
+################################################################################
+
+LIBFM_VERSION = 1.3.1
+LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
+LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
+LIBFM_DEPENDENCIES = menu-cache libglib2 cairo
+LIBFM_LICENSE = GPL-2.0+, LGPL-2.1+
+LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
+LIBFM_INSTALL_STAGING = YES
+# We're patching src/modules/Makefile.am
+LIBFM_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_LIBEXIF),y)
+LIBFM_CONF_OPTS += --enable-exif
+LIBFM_DEPENDENCIES += libexif
+else
+LIBFM_CONF_OPTS += --disable-exif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+LIBFM_CONF_OPTS += --with-gtk=3
+LIBFM_DEPENDENCIES += libgtk3
+else
+LIBFM_CONF_OPTS += --with-gtk=2
+LIBFM_DEPENDENCIES += libgtk2
+endif
+
+$(eval $(autotools-package))