diff options
-rw-r--r-- | meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb (renamed from meta/recipes-support/libfm/libfm-extra_1.2.5.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch | 23 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch | 76 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm_1.3.0.2.bb (renamed from meta/recipes-support/libfm/libfm_1.2.5.bb) | 6 |
4 files changed, 28 insertions, 81 deletions
diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb index c0fd83ef34..734d010d31 100644 --- a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb +++ b/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb | |||
@@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ | |||
11 | file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ | 11 | file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" | 14 | SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" |
15 | SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" | 15 | SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" |
16 | 16 | ||
17 | S = "${WORKDIR}/libfm-${PV}" | 17 | S = "${WORKDIR}/libfm-${PV}" |
18 | 18 | ||
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 new file mode 100644 index 0000000000..f4c89127fc --- /dev/null +++ b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From 07260295e031e845e38ba874fa6ab500790c4aaf Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 2 May 2018 16:48:47 +0300 | ||
4 | Subject: [PATCH] Do not add library path to avoid host contamination | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | src/modules/Makefile.am | 1 - | ||
10 | 1 file changed, 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am | ||
13 | index e61f4e0..01c15bd 100644 | ||
14 | --- a/src/modules/Makefile.am | ||
15 | +++ b/src/modules/Makefile.am | ||
16 | @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ | ||
17 | # tell libtool we compile module not library | ||
18 | AM_LDFLAGS = \ | ||
19 | -no-undefined -module -avoid-version -shared -export-dynamic \ | ||
20 | - -L$(libdir) \ | ||
21 | $(GIO_LIBS) | ||
22 | |||
23 | # the module should be linked only with libfm, not libfm-gtk or whatever | ||
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 deleted file mode 100644 index 40e53291e1..0000000000 --- a/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andriy Grytsenko <andrej@rep.kiev.ua> | ||
3 | Date: Sun, 26 Nov 2017 22:30:15 +0200 | ||
4 | Subject: [PATCH 2/2] Enclose text in <programlisting> into <![CDATA[ | ||
5 | |||
6 | New gtk-doc fails on tag-like data in it. | ||
7 | See https://bugs.freedesktop.org/show_bug.cgi?id=101585 | ||
8 | That is definitely bug of gtk-doc but let workaround it. | ||
9 | |||
10 | Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=b072ee0400432d72fdf86ba9fed74a7e0ec11ec1] | ||
11 | Signed-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 | |||
16 | diff --git a/src/base/fm-module.c b/src/base/fm-module.c | ||
17 | index 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 | -- | ||
75 | 2.15.1 | ||
76 | |||
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.3.0.2.bb index 596408353f..62d6a51e87 100644 --- a/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/meta/recipes-support/libfm/libfm_1.3.0.2.bb | |||
@@ -13,11 +13,11 @@ DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libex | |||
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ | 14 | SRC_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 \ | 16 | file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" | 19 | SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" |
20 | SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" | 20 | SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" |
21 | 21 | ||
22 | inherit autotools pkgconfig gtk-doc gettext distro_features_check | 22 | inherit autotools pkgconfig gtk-doc gettext distro_features_check |
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |