diff options
Diffstat (limited to 'meta/recipes-support/libfm')
-rw-r--r-- | meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch | 54 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm-extra_1.3.2.bb (renamed from meta/recipes-support/libfm/libfm-extra_1.3.1.bb) | 7 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm_1.3.2.bb (renamed from meta/recipes-support/libfm/libfm_1.3.1.bb) | 19 |
5 files changed, 17 insertions, 67 deletions
diff --git a/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch b/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch deleted file mode 100644 index 69a51d5662..0000000000 --- a/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c320799c941d42a9b7e351805359694ea3b36d2d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 5 Apr 2015 09:08:38 -0700 -Subject: [PATCH] nls.m4: Take it from gettext-0.15 - -It otherwise expects gettext to provide it. Lets go independent - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - m4/nls.m4 | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 m4/nls.m4 - -diff --git a/m4/nls.m4 b/m4/nls.m4 -new file mode 100644 -index 0000000..2c8fe69 ---- /dev/null -+++ b/m4/nls.m4 -@@ -0,0 +1,30 @@ -+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are not in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper drepper@cygnus.com, 1995-2000. -+dnl Bruno Haible haible@clisp.cons.org, 2000-2003. -+ -+AC_PREREQ(2.50) -+ -+AC_DEFUN([AM_NLS], -+[ -+AC_MSG_CHECKING([whether NLS is requested]) -+dnl Default is enabled NLS -+AC_ARG_ENABLE(nls, -+[ --disable-nls do not use Native Language Support], -+USE_NLS=$enableval, USE_NLS=yes) -+AC_MSG_RESULT($USE_NLS) -+AC_SUBST(USE_NLS) -+]) --- -2.1.4 - diff --git a/meta/recipes-support/libfm/libfm-extra_1.3.1.bb b/meta/recipes-support/libfm/libfm-extra_1.3.2.bb index 85102a1a3d..eff1b54f73 100644 --- a/meta/recipes-support/libfm/libfm-extra_1.3.1.bb +++ b/meta/recipes-support/libfm/libfm-extra_1.3.2.bb @@ -1,18 +1,17 @@ SUMMARY = "Library for file management" +DESCRIPTION = "Contains a library and other files required by menu-cache-gen libexec of menu-cache-1.1.0. " HOMEPAGE = "http://pcmanfm.sourceforge.net/" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" SECTION = "x11/libs" DEPENDS = "glib-2.0-native glib-2.0 intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ - file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" -SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" +SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" S = "${WORKDIR}/libfm-${PV}" diff --git a/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch index fb91d90cf2..701b259cf9 100644 --- a/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch +++ b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch @@ -4,7 +4,7 @@ Date: Fri, 16 Dec 2016 16:52:04 +0200 Subject: [PATCH] Correctly check the stamp file that indicates if we need to re-build vala code -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/lxde/libfm/pull/85] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- configure.ac | 2 +- diff --git a/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch index f4c89127fc..0437000adc 100644 --- a/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch +++ b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch @@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 2 May 2018 16:48:47 +0300 Subject: [PATCH] Do not add library path to avoid host contamination -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/lxde/libfm/pull/86] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- src/modules/Makefile.am | 1 - diff --git a/meta/recipes-support/libfm/libfm_1.3.1.bb b/meta/recipes-support/libfm/libfm_1.3.2.bb index 918fe3ece7..1d7609165b 100644 --- a/meta/recipes-support/libfm/libfm_1.3.1.bb +++ b/meta/recipes-support/libfm/libfm_1.3.2.bb @@ -1,7 +1,9 @@ SUMMARY = "Library for file management" +DESCRIPTION = "LibFM provides file management functions built on top of Glib/GIO \ +giving a convenient higher-level API." HOMEPAGE = "http://pcmanfm.sourceforge.net/" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ file://src/fm.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007 \ file://src/base/fm-config.h;beginline=10;endline=23;md5=ef1f84da64b3c01cca447212f7ef6007 \ @@ -16,10 +18,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ " -SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" -SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" +SRC_URI[sha256sum] = "a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5" -inherit autotools pkgconfig gtk-doc gettext features_check +inherit autotools pkgconfig gtk-doc gettext features_check mime mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECONF = "--with-gtk=3" @@ -28,7 +29,7 @@ do_configure[dirs] =+ "${S}/m4" PACKAGES =+ "libfm-gtk" PACKAGES += "${PN}-mime" -FILES_libfm-gtk = " \ +FILES:libfm-gtk = " \ ${libdir}/libfm-gtk*so.* \ ${libdir}/libfm/modules/gtk* \ ${bindir}/libfm-pref-apps \ @@ -39,9 +40,9 @@ FILES_libfm-gtk = " \ ${datadir}/libfm/images/unknown.png \ ${datadir}/libfm/ui/*.ui \ " -FILES_${PN}-mime = "${datadir}/mime/" +FILES:${PN}-mime = "${datadir}/mime/" -do_install_append () { +do_install:append () { # remove files which are part of libfm-extra rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h rm -f ${D}${includedir}/libfm-1.0/fm-version.h @@ -52,3 +53,7 @@ do_install_append () { rm -f ${D}${libdir}/libfm-extra.a rm -f ${D}${libdir}/libfm-extra.la } + +# http://errors.yoctoproject.org/Errors/Details/766924/ +# libfm-1.3.2/src/actions/action.c:2050:25: error: assignment to 'gchar **' {aka 'char **'} from incompatible pointer type 'const gchar * const*' {aka 'const char * const*'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" |