summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-02-02 19:38:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commitf26ea9b3ddc209a7cfc5bb83219d6e584ff262d2 (patch)
treef5ed52f59f86618dfeb6920d0689f6105e6582e4
parent60190ae960e58dae2e1a7b681f0a52567db9c178 (diff)
downloadpoky-f26ea9b3ddc209a7cfc5bb83219d6e584ff262d2.tar.gz
libfm: add a patch to fix build errors with recent versions of gtk-doc
(From OE-Core rev: 3574375deb31e61bc464a51d8a6b949b8521a4ff) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch76
-rw-r--r--meta/recipes-support/libfm/libfm_1.2.5.bb4
2 files changed, 79 insertions, 1 deletions
diff --git a/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
new file mode 100644
index 0000000000..40e53291e1
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
@@ -0,0 +1,76 @@
1From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001
2From: Andriy Grytsenko <andrej@rep.kiev.ua>
3Date: Sun, 26 Nov 2017 22:30:15 +0200
4Subject: [PATCH 2/2] Enclose text in <programlisting> into <![CDATA[
5
6New gtk-doc fails on tag-like data in it.
7See https://bugs.freedesktop.org/show_bug.cgi?id=101585
8That is definitely bug of gtk-doc but let workaround it.
9
10Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=b072ee0400432d72fdf86ba9fed74a7e0ec11ec1]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/base/fm-module.c | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/src/base/fm-module.c b/src/base/fm-module.c
17index d364b2d..2e8c978 100644
18--- a/src/base/fm-module.c
19+++ b/src/base/fm-module.c
20@@ -44,7 +44,7 @@
21 * of that type should include:
22 * <example id="example-fm-dummy-h">
23 * <title>Sample of fm-dummy.h</title>
24- * <programlisting>
25+ * <programlisting><![CDATA[
26 * #include <libfm/fm.h>
27 *
28 * #define FM_MODULE_dummy_VERSION 1
29@@ -54,7 +54,7 @@
30 * } FmDummyInit;
31 *
32 * extern FmDummyInit fm_module_init_dummy;
33- * </programlisting>
34+ * ]]></programlisting>
35 * </example>
36 * The FM_MODULE_dummy_VERSION is a number which should be increased each
37 * time something in FmDummyInit structure is changed. The FmDummyInit
38@@ -65,7 +65,7 @@
39 * module handling in your code:
40 * <example id="example-fm-dummy-widget-c">
41 * <title>Sample of fm-dummy-widget.c</title>
42- * <programlisting>
43+ * <programlisting><![CDATA[
44 * #include "fm-dummy.h"
45 *
46 * FM_MODULE_DEFINE_TYPE(dummy, FmDummyInit, 1)
47@@ -87,7 +87,7 @@
48 * result = module->get_new("test sample");
49 * return result;
50 * }
51- * </programlisting>
52+ * ]]></programlisting>
53 * </example>
54 *
55 * Third thing application should do is to register module type on the
56@@ -108,7 +108,7 @@
57 * interface (see the fm-dummy.h header example above):
58 * <example id="example-fm-dummy-test-c">
59 * <title>Sample of module dummy/test</title>
60- * <programlisting>
61+ * <programlisting><![CDATA[
62 * #include "fm-dummy.h"
63 *
64 * FM_DEFINE_MODULE(dummy, test)
65@@ -121,7 +121,7 @@
66 * FmDummyInit fm_module_init_dummy = {
67 * fm_dummy_test_get_new;
68 * };
69- * </programlisting>
70+ * ]]></programlisting>
71 * </example>
72 * The fm_module_init_dummy should be exactly the same structure that is
73 * defined in the header file above.
74--
752.15.1
76
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index 6844243c1e..c1deea6853 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.5.bb
@@ -12,7 +12,9 @@ SECTION = "x11/libs"
12DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native" 12DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
15 file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch" 15 file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \
16 file://0001-Enclose-text-in-programlisting-into-CDATA.patch \
17 "
16 18
17SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" 19SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807"
18SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" 20SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a"