[Buildroot] [PATCH 1/4] libfm: bump to version 1.3.0.2

[Buildroot] [PATCH 1/4] libfm: bump to version 1.3.0.2

[Fabrice Fontaine]

Add hash for license files

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../libfm/0001-modules-fix-cross-compilation.patch | 27 ++++++++++++++++++++++
 package/libfm/libfm.hash                           |  8 +++++--
 package/libfm/libfm.mk                             |  4 +++-
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 package/libfm/0001-modules-fix-cross-compilation.patch

diff --git a/package/libfm/0001-modules-fix-cross-compilation.patch b/package/libfm/0001-modules-fix-cross-compilation.patch
new file mode 100644
index 0000000000..8b5f1cff6b
--- /dev/null
+++ b/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
+
diff --git a/package/libfm/libfm.hash b/package/libfm/libfm.hash
index 69c4c31f6d..71befc355e 100644
--- a/package/libfm/libfm.hash
+++ b/package/libfm/libfm.hash
@@ -1,3 +1,7 @@
 # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
-md5 a1ba9ae5e920f38b647dd511edd6c807  libfm-1.2.5.tar.xz
-sha1 5887aa4e85ee0964e7da67368136849957afd5d6  libfm-1.2.5.tar.xz
+md5 02a024714d51e0d37afc7bd596a44f3b  libfm-1.3.0.2.tar.xz
+sha1 aa7f73987866e557b74b8a28d0fea339d53899b6  libfm-1.3.0.2.tar.xz
+
+# Hash for license files:
+sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388  COPYING
+sha256 c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e  src/extra/fm-xml-file.c
diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
index c49cd3e633..292a0ab5d8 100644
--- a/package/libfm/libfm.mk
+++ b/package/libfm/libfm.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-LIBFM_VERSION = 1.2.5
+LIBFM_VERSION = 1.3.0.2
 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
-- 
2.14.1

[Buildroot] [PATCH 2/4] libfm-extra: bump to version 1.3.0.2

[Fabrice Fontaine]

Add hash for license files

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libfm-extra/libfm-extra.hash | 8 ++++++--
 package/libfm-extra/libfm-extra.mk   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/libfm-extra/libfm-extra.hash b/package/libfm-extra/libfm-extra.hash
index 8a78adebb4..233abe7d75 100644
--- a/package/libfm-extra/libfm-extra.hash
+++ b/package/libfm-extra/libfm-extra.hash
@@ -1,3 +1,7 @@
 # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
-md5	74997d75e7e87dc73398746fd373bf52	libfm-1.2.4.tar.xz
-sha1	2f8183389c8e74edb15c6c8ab260df5dd39f3b2d	libfm-1.2.4.tar.xz
+md5	02a024714d51e0d37afc7bd596a44f3b	libfm-1.3.0.2.tar.xz
+sha1	aa7f73987866e557b74b8a28d0fea339d53899b6	libfm-1.3.0.2.tar.xz
+
+# Hash for license files:
+sha256	d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388	COPYING
+sha256	c3a3d93e111462f2b0292b56a6a7b87d342fd7156741d8b81b8b08723be4597e	src/extra/fm-xml-file.c
diff --git a/package/libfm-extra/libfm-extra.mk b/package/libfm-extra/libfm-extra.mk
index 67d6dc1294..7802b88631 100644
--- a/package/libfm-extra/libfm-extra.mk
+++ b/package/libfm-extra/libfm-extra.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFM_EXTRA_VERSION = 1.2.4
+LIBFM_EXTRA_VERSION = 1.3.0.2
 LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
 LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files
 LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool
-- 
2.14.1

[Buildroot] [PATCH 3/4] menu-cache: bump to version 1.1.0

[Fabrice Fontaine]

Add hash for license file

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/menu-cache/menu-cache.hash | 9 ++++++---
 package/menu-cache/menu-cache.mk   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package/menu-cache/menu-cache.hash b/package/menu-cache/menu-cache.hash
index 1b30fcc11c..a46a7070ca 100644
--- a/package/menu-cache/menu-cache.hash
+++ b/package/menu-cache/menu-cache.hash
@@ -1,3 +1,6 @@
-# From https://sourceforge.net/projects/lxde/files/menu-cache/1.0/
-md5	a856ba860b16fdc8c69ee784bc4ade36	menu-cache-1.0.1.tar.xz
-sha1	58862c665f2ae56870a9937cdcd643674b2ac8ba	menu-cache-1.0.1.tar.xz
+# From https://sourceforge.net/projects/lxde/files/menu-cache/1.1/
+md5	99999a0bca48b980105208760c8fd893	menu-cache-1.1.0.tar.xz
+sha1	01e6035aa1fe76d7047bdec235254aa5ce17394a	menu-cache-1.1.0.tar.xz
+
+# Hash for license file:
+sha256	7459fbad62653e4061dbfde3b0cad7c72777838beb10d2d11d969fac6226e7de	COPYING
diff --git a/package/menu-cache/menu-cache.mk b/package/menu-cache/menu-cache.mk
index b5fde9907e..c2b8c3b740 100644
--- a/package/menu-cache/menu-cache.mk
+++ b/package/menu-cache/menu-cache.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-MENU_CACHE_VERSION_MAJOR = 1.0
-MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).1
+MENU_CACHE_VERSION_MAJOR = 1.1
+MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).0
 MENU_CACHE_SOURCE = menu-cache-$(MENU_CACHE_VERSION).tar.xz
 MENU_CACHE_SITE = http://sourceforge.net/projects/lxde/files/menu-cache/$(MENU_CACHE_VERSION_MAJOR)
 MENU_CACHE_DEPENDENCIES = libfm-extra libglib2
-- 
2.14.1

[Buildroot] [PATCH 4/4] pcmanfm: bump to version 1.3.0

[Fabrice Fontaine]

Add hash for license file

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/pcmanfm/pcmanfm.hash | 7 +++++--
 package/pcmanfm/pcmanfm.mk   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/pcmanfm/pcmanfm.hash b/package/pcmanfm/pcmanfm.hash
index 155e9beb82..f633b49aac 100644
--- a/package/pcmanfm/pcmanfm.hash
+++ b/package/pcmanfm/pcmanfm.hash
@@ -1,3 +1,6 @@
 # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
-md5 b4d1f8ce08d87e4f27805a246fc51ac2  pcmanfm-1.2.5.tar.xz
-sha1 9a8a2b4abebdf859e5ba2486eff84d505ad17b89  pcmanfm-1.2.5.tar.xz
+md5 827838f7f6b17dc97e1690c07da8fdb3  pcmanfm-1.3.0.tar.xz
+sha1 690fb28c0957ad56e28d1b8f5384e63462c118b2  pcmanfm-1.3.0.tar.xz
+
+# Hash for license file:
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 31acae65bc..6dadfaeebd 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCMANFM_VERSION = 1.2.5
+PCMANFM_VERSION = 1.3.0
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
 PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
 PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm
-- 
2.14.1

[Buildroot] [PATCH 1/4] libfm: bump to version 1.3.0.2

[Thomas Petazzoni]

Hello,

On Sun, 29 Apr 2018 21:09:03 +0200, Fabrice Fontaine wrote:
> Add hash for license files
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  .../libfm/0001-modules-fix-cross-compilation.patch | 27 ++++++++++++++++++++++
>  package/libfm/libfm.hash                           |  8 +++++--
>  package/libfm/libfm.mk                             |  4 +++-
>  3 files changed, 36 insertions(+), 3 deletions(-)
>  create mode 100644 package/libfm/0001-modules-fix-cross-compilation.patch

Series applied, thanks. Please make sure to submit
package/libfm/0001-modules-fix-cross-compilation.patch to the upstream
project. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com