Hello community,
here is the log from the commit of package gstreamer-plugins-good for
openSUSE:Factory checked in at 2014-02-21 14:25:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-good (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-good"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-good/gstreamer-plugins-good.changes
2014-02-19 06:55:42.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new/gstreamer-plugins-good.changes
2014-02-21 14:25:42.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 20 14:06:57 UTC 2014 - [email protected]
+
+- Add gsp-docs-use-docbook-markup-for-xi:include.patch: fix yet an
+ other fallout from gtk-doc 1.20 version. Patch from upstream git.
+
+-------------------------------------------------------------------
New:
----
gsp-docs-use-docbook-markup-for-xi:include.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-good.spec ++++++
--- /var/tmp/diff_new_pack.cdCaFo/_old 2014-02-21 14:25:43.000000000 +0100
+++ /var/tmp/diff_new_pack.cdCaFo/_new 2014-02-21 14:25:43.000000000 +0100
@@ -32,6 +32,8 @@
Source0:
http://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gsp-docs-fix-mismatched-para-tags.patch bgo#724085
[email protected] -- docs: fix mismatched para tags, newer gtkdoc is more
sensitive to mismatched docbook tags.
Patch0: gsp-docs-fix-mismatched-para-tags.patch
+# PATCH-FIX-UPSTREAM gsp-docs-use-docbook-markup-for-xi:include.patch
[email protected] -- docs: use docbook markup for xi:include It turns out
that the change in gtk-doc-1.20 which wraps the |[]| content in CDATA break
xi:inlcude examples.
+Patch1: gsp-docs-use-docbook-markup-for-xi:include.patch
%if 0%{?ENABLE_AALIB}
BuildRequires: aalib-devel
%endif
@@ -118,6 +120,7 @@
%setup -q -n %{_name}-%{version}
translation-update-upstream po gst-plugins-good-%{gst_branch}
%patch0 -p1
+%patch1 -p1
%build
# FIXME:
++++++ gsp-docs-use-docbook-markup-for-xi:include.patch ++++++
>From a4fd0f9351ee319f850aca2acb42f8856a2c1a12 Mon Sep 17 00:00:00 2001
From: Stefan Sauer <[email protected]>
Date: Tue, 18 Feb 2014 21:54:45 +0000
Subject: docs: use docbook markup for xi:include
It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in
CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where
the only 4, we're fixing them instead.
---
diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
index e0887ad..0ab32f3 100644
--- a/gst/audiofx/audiofirfilter.c
+++ b/gst/audiofx/audiofirfilter.c
@@ -39,9 +39,9 @@
*
* <refsect2>
* <title>Example application</title>
- * |[
+ * <informalexample><programlisting language="C">
* <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text"
href="../../../../tests/examples/audiofx/firfilter-example.c" />
- * ]|
+ * </programlisting></informalexample>
* </refsect2>
*/
diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
index c107594..eb4f20c 100644
--- a/gst/audiofx/audioiirfilter.c
+++ b/gst/audiofx/audioiirfilter.c
@@ -35,9 +35,9 @@
*
* <refsect2>
* <title>Example application</title>
- * |[
+ * <informalexample><programlisting language="C">
* <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text"
href="../../../../tests/examples/audiofx/iirfilter-example.c" />
- * ]|
+ * </programlisting></informalexample>
* </refsect2>
*/
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 92e0bfe..cfd5bce 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -93,9 +93,9 @@
*
* <refsect2>
* <title>Example application</title>
- * |[
+ * <informalexample><programlisting language="C">
* <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text"
href="../../../../tests/examples/level/level-example.c" />
- * ]|
+ * </programlisting></informalexample>
* </refsect2>
*/
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index 75a9152..5e192c1 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -90,9 +90,9 @@
*
* <refsect2>
* <title>Example application</title>
- * |[
+ * <informalexample><programlisting language="C">
* <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text"
href="../../../../tests/examples/spectrum/spectrum-example.c" />
- * ]|
+ * </programlisting></informalexample>
* </refsect2>
*
* Last reviewed on 2011-03-10 (0.10.29)
--
cgit v0.9.0.2-2-gbebe
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
