diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-support/libfm | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/libfm')
5 files changed, 235 insertions, 0 deletions
diff --git a/poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch b/poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch new file mode 100644 index 000000000..69a51d566 --- /dev/null +++ b/poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch @@ -0,0 +1,54 @@ +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/poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb new file mode 100644 index 000000000..c0fd83ef3 --- /dev/null +++ b/poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "LGPLv2+" +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] = "a1ba9ae5e920f38b647dd511edd6c807" +SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" + +S = "${WORKDIR}/libfm-${PV}" + +EXTRA_OECONF = "--with-extra-only --with-gtk=no" + +inherit autotools pkgconfig gtk-doc gettext + +do_configure[dirs] =+ "${S}/m4" diff --git a/poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch new file mode 100644 index 000000000..fb91d90cf --- /dev/null +++ b/poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch @@ -0,0 +1,28 @@ +From 23c6e9df611c86a5e97079e1b88c7a18474bf0bc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +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 +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d043b3d..0e85590 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ AM_COND_IF(EXTRALIB_ONLY, + [enable_actions=no]) + if test x"$enable_actions" = xyes; then + dnl no vala compiler required when sources are from dist tarball +- if test -f src/actions/libfmactions_la_vala.stamp; then ++ if test -f $srcdir/src/actions/libfmactions_la_vala.stamp; then + AM_PROG_VALAC + else + AM_PROG_VALAC([0.13.0]) +-- +2.10.2 + diff --git a/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch new file mode 100644 index 000000000..40e53291e --- /dev/null +++ b/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch @@ -0,0 +1,76 @@ +From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001 +From: Andriy Grytsenko <andrej@rep.kiev.ua> +Date: Sun, 26 Nov 2017 22:30:15 +0200 +Subject: [PATCH 2/2] Enclose text in <programlisting> into <![CDATA[ + +New gtk-doc fails on tag-like data in it. +See https://bugs.freedesktop.org/show_bug.cgi?id=101585 +That is definitely bug of gtk-doc but let workaround it. + +Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=b072ee0400432d72fdf86ba9fed74a7e0ec11ec1] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/base/fm-module.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/base/fm-module.c b/src/base/fm-module.c +index d364b2d..2e8c978 100644 +--- a/src/base/fm-module.c ++++ b/src/base/fm-module.c +@@ -44,7 +44,7 @@ + * of that type should include: + * <example id="example-fm-dummy-h"> + * <title>Sample of fm-dummy.h</title> +- * <programlisting> ++ * <programlisting><![CDATA[ + * #include <libfm/fm.h> + * + * #define FM_MODULE_dummy_VERSION 1 +@@ -54,7 +54,7 @@ + * } FmDummyInit; + * + * extern FmDummyInit fm_module_init_dummy; +- * </programlisting> ++ * ]]></programlisting> + * </example> + * The FM_MODULE_dummy_VERSION is a number which should be increased each + * time something in FmDummyInit structure is changed. The FmDummyInit +@@ -65,7 +65,7 @@ + * module handling in your code: + * <example id="example-fm-dummy-widget-c"> + * <title>Sample of fm-dummy-widget.c</title> +- * <programlisting> ++ * <programlisting><![CDATA[ + * #include "fm-dummy.h" + * + * FM_MODULE_DEFINE_TYPE(dummy, FmDummyInit, 1) +@@ -87,7 +87,7 @@ + * result = module->get_new("test sample"); + * return result; + * } +- * </programlisting> ++ * ]]></programlisting> + * </example> + * + * Third thing application should do is to register module type on the +@@ -108,7 +108,7 @@ + * interface (see the fm-dummy.h header example above): + * <example id="example-fm-dummy-test-c"> + * <title>Sample of module dummy/test</title> +- * <programlisting> ++ * <programlisting><![CDATA[ + * #include "fm-dummy.h" + * + * FM_DEFINE_MODULE(dummy, test) +@@ -121,7 +121,7 @@ + * FmDummyInit fm_module_init_dummy = { + * fm_dummy_test_get_new; + * }; +- * </programlisting> ++ * ]]></programlisting> + * </example> + * The fm_module_init_dummy should be exactly the same structure that is + * defined in the header file above. +-- +2.15.1 + diff --git a/poky/meta/recipes-support/libfm/libfm_1.2.5.bb b/poky/meta/recipes-support/libfm/libfm_1.2.5.bb new file mode 100644 index 000000000..596408353 --- /dev/null +++ b/poky/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -0,0 +1,54 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "GPLv2+ & LGPLv2+" +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 \ + file://src/fm-gtk.h;beginline=6;endline=19;md5=646baa4955c04fe768f2ca27b92ac8dd" + + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ + file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ + file://0001-Enclose-text-in-programlisting-into-CDATA.patch \ + " + +SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" +SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" + +inherit autotools pkgconfig gtk-doc gettext distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +EXTRA_OECONF = "--with-gtk=3" + +do_configure[dirs] =+ "${S}/m4" + +PACKAGES =+ "libfm-gtk" +PACKAGES += "${PN}-mime" +FILES_libfm-gtk = " \ + ${libdir}/libfm-gtk*so.* \ + ${libdir}/libfm/modules/gtk* \ + ${bindir}/libfm-pref-apps \ + ${bindir}/lxshortcut \ + ${datadir}/applications/libfm-pref-apps.desktop \ + ${datadir}/applications/lxshortcut.desktop \ + ${datadir}/libfm/images/folder.png \ + ${datadir}/libfm/images/unknown.png \ + ${datadir}/libfm/ui/*.ui \ +" +FILES_${PN}-mime = "${datadir}/mime/" + +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 + rm -f ${D}${includedir}/libfm-1.0/fm-extra.h + rm -f ${D}${includedir}/libfm + rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc + rm -f ${D}${libdir}/libfm-extra.so* + rm -f ${D}${libdir}/libfm-extra.a + rm -f ${D}${libdir}/libfm-extra.la +} |