Hello community, here is the log from the commit of package libfm for openSUSE:Factory checked in at 2017-12-21 11:29:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfm (Old) and /work/SRC/openSUSE:Factory/.libfm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfm" Thu Dec 21 11:29:47 2017 rev:54 rq:558870 version:1.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libfm/libfm.changes 2017-03-12 20:00:28.715653714 +0100 +++ /work/SRC/openSUSE:Factory/.libfm.new/libfm.changes 2017-12-21 11:29:59.861635717 +0100 @@ -1,0 +2,6 @@ +Wed Dec 20 15:50:33 UTC 2017 - [email protected] + +- bsc#1073719: Fix build with gtk-doc 1.27: + * Add libfm-1.2.5-gtk-doc-workaround.patch + +------------------------------------------------------------------- New: ---- libfm-1.2.5-gtk-doc-workaround.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm.spec ++++++ --- /var/tmp/diff_new_pack.ackoun/_old 2017-12-21 11:30:00.449607049 +0100 +++ /var/tmp/diff_new_pack.ackoun/_new 2017-12-21 11:30:00.453606854 +0100 @@ -26,6 +26,8 @@ Source: %{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc Patch0: libfm-default-config.patch +# FIX-UPSTREAM [email protected] bsc#1073719 +Patch1: libfm-1.2.5-gtk-doc-workaround.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -58,9 +60,9 @@ %package -n libfm4 Summary: Libfm libraries -Group: System/Libraries # libfm is extensible by modules - which are in the main package # they are not strictly required, but a very good thing to have present +Group: System/Libraries Recommends: %{name} %description -n libfm4 @@ -120,6 +122,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ ++++++ libfm-1.2.5-gtk-doc-workaround.patch ++++++ >From b072ee0400432d72fdf86ba9fed74a7e0ec11ec1 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <[email protected]> Date: Sun, 26 Nov 2017 22:30:15 +0200 Subject: [PATCH] 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. --- 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 d364b2dc..2e8c978c 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.
