Control: tags 876614 + patch
Control: tags 876614 + pending
Dear maintainer,
I've prepared an NMU for libfm (versioned as 1.2.5-1.1) and uploaded
it to DELAYED/15. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru libfm-1.2.5/debian/changelog libfm-1.2.5/debian/changelog
--- libfm-1.2.5/debian/changelog 2016-12-10 02:05:48.000000000 +0200
+++ libfm-1.2.5/debian/changelog 2018-04-20 22:54:43.000000000 +0300
@@ -1,3 +1,11 @@
+libfm (1.2.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream patch for FTBFS with gtk-doc-tools >= 1.26.
+ (Closes: #876614)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 20 Apr 2018 22:54:43 +0300
+
libfm (1.2.5-1) unstable; urgency=medium
* Removing --enable-debug from configure, that enables optimization.
diff -Nru libfm-1.2.5/debian/patches/0001-Enclose-text-in-programlisting-into-CDATA.patch libfm-1.2.5/debian/patches/0001-Enclose-text-in-programlisting-into-CDATA.patch
--- libfm-1.2.5/debian/patches/0001-Enclose-text-in-programlisting-into-CDATA.patch 1970-01-01 02:00:00.000000000 +0200
+++ libfm-1.2.5/debian/patches/0001-Enclose-text-in-programlisting-into-CDATA.patch 2018-04-20 22:51:51.000000000 +0300
@@ -0,0 +1,73 @@
+From b072ee0400432d72fdf86ba9fed74a7e0ec11ec1 Mon Sep 17 00:00:00 2001
+From: Andriy Grytsenko <and...@rep.kiev.ua>
+Date: Sun, 26 Nov 2017 22:30:15 +0200
+Subject: 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.
+--
+2.11.0
+
diff -Nru libfm-1.2.5/debian/patches/series libfm-1.2.5/debian/patches/series
--- libfm-1.2.5/debian/patches/series 2016-12-10 01:54:28.000000000 +0200
+++ libfm-1.2.5/debian/patches/series 2018-04-20 22:54:41.000000000 +0300
@@ -1 +1,2 @@
01-lxde-conf.patch
+0001-Enclose-text-in-programlisting-into-CDATA.patch
