[packages/librsvg] - updated to 2.44.14 - added docbook5 patch (docbook5 namespaces fix from git) - added gtkdoc patch

Thu Jun 27 21:24:35 CEST 2019

commit 1e016fcee9218112e86c8d435de16a642cf1f7f1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 27 21:25:57 2019 +0200

    - updated to 2.44.14
    - added docbook5 patch (docbook5 namespaces fix from git)
    - added gtkdoc patch (generate rsvg.types as it's not included in tarball)

 librsvg-docbook5.patch | 103 +++++++++++++++++++++++++++++++++++++++++++++++++
 librsvg-gtkdoc.patch   |  11 ++++++
 librsvg.spec           |  12 ++++--
 3 files changed, 122 insertions(+), 4 deletions(-)
---

diff --git a/librsvg.spec b/librsvg.spec
index 756148d..616e42d 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -6,7 +6,7 @@
 %bcond_without	vala		# Vala API (vala up to 0.38.x already contains librsvg-2.0.vapi)
 
 %define		mver	2.44
-%define		pver	13
+%define		pver	14
 Summary:	A Raph's Library for Rendering SVG Data
 Summary(pl.UTF-8):	Biblioteka Raph's SVG do renderowania danych SVG
 Summary(pt_BR.UTF-8):	Biblioteca SVG
@@ -19,15 +19,17 @@ Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/%{mver}/%{name}-%{version}.tar.xz
-# Source0-md5:	5be17e248dfbf0259c14922a52193b26
+# Source0-md5:	7570d139148f3554fa60fb2a0ecfc4f8
 Source1:	rsvg
 Patch0:		x32.patch
+Patch1:		%{name}-docbook5.patch
+Patch2:		%{name}-gtkdoc.patch
 URL:		http://librsvg.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cairo-devel >= 1.15.12
 BuildRequires:	cargo
-BuildRequires:	docbook-dtd412-xml
+BuildRequires:	docbook-dtd5-xml
 # pkgconfig(freetype) >= 20.0.14
 BuildRequires:	freetype-devel >= 1:2.8
 BuildRequires:	gdk-pixbuf2-devel >= 2.20
@@ -183,6 +185,8 @@ Przeglądarka plików SVG oparta na bibliotekach librsvg/GTK+3.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %if %{without apidocs}
 echo 'CLEANFILES=' > gtk-doc.make
@@ -192,7 +196,7 @@ echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
diff --git a/librsvg-docbook5.patch b/librsvg-docbook5.patch
new file mode 100644
index 0000000..1cab852
--- /dev/null
+++ b/librsvg-docbook5.patch
@@ -0,0 +1,103 @@
+Backport of:
+commit 1273639b93dea51af1b0dd39651bf15c3bbff2d9
+Author: Federico Mena Quintero <federico at gnome.org>
+Date:   Fri Jan 25 11:21:11 2019 -0600
+
+    Try to make Docbook 5 really work...
+
+diff --git a/doc/rsvg-docs.xml b/doc/rsvg-docs.xml
+index 12b50518..d744e2e0 100644
+--- a/doc/rsvg-docs.xml
++++ b/doc/rsvg-docs.xml
+@@ -1,12 +1,10 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<!DOCTYPE book
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
++               "http://www.oasis-open.org/docbook/xml/5.0"
+ [
+   <!ENTITY version SYSTEM "version.xml">
+ ]>
+-<book xmlns="http://docbook.org/ns/docbook"
+-      xmlns:xi="http://www.w3.org/2001/XInclude"
+-      xmlns:xlink="http://www.w3.org/1999/xlink"
+-      version="5.1">
++<book xmlns:xi="http://www.w3.org/2001/XInclude">
+   <!--
+     Copyright © 2009, 2010 Christian Persch
+     Copyright © 2017 Federico Mena Quintero
+@@ -24,7 +22,7 @@
+       For librsvg version &version;
+ 
+       The latest version of this documentation can be found on-line at the
+-      <link xlink:href="http://library.gnome.org/devel/rsvg/index.html" role="online-location">GNOME Library</link>.
++      <link href="http://library.gnome.org/devel/rsvg/index.html" role="online-location">GNOME Library</link>.
+     </releaseinfo>
+ 
+     <copyright>
+@@ -57,7 +55,7 @@
+ 
+         You may obtain a copy of the <citetitle>GNU General Public Licence</citetitle>
+         from the Free Software Foundation at
+-        <link xlink:href="http://www.gnu.org/licences/">GNU Licences web site</link>
++        <link href="http://www.gnu.org/licences/">GNU Licences web site</link>
+         or by writing to:
+ 
+         <address>
+@@ -70,16 +68,14 @@
+     </legalnotice>
+   </info>
+ 
+-  <part xml:id="rsvg">
++  <part id="rsvg">
+     <title>API Reference</title>
+     <partintro>
+       <para>
+         Librsvg is a library for rendering Scalable Vector Graphics 1.1
+-        files (<link
+-        xlink:href="https://www.w3.org/TR/SVG/">SVG 1.1</link>).
++        files (<link href="https://www.w3.org/TR/SVG/">SVG 1.1</link>).
+         Specifically, it can take non-animated, non-scripted SVG data
+-        and render it into a <link
+-        xlink:href="https://www.cairographics.org/">Cairo</link>
++        and render it into a <link href="https://www.cairographics.org/">Cairo</link>
+         surface.  Normally this means an in-memory raster surface, but
+         it could also be any of the other surface types that Cairo
+         supports.
+@@ -87,7 +83,7 @@
+ 
+       <para>
+ 	Librsvg supports many of the graphic features in the <link
+-	xlink:href="https://www.w3.org/TR/SVG/">SVG 1.1
++	href="https://www.w3.org/TR/SVG/">SVG 1.1
+ 	specification</link>.  The main features of SVG 1.1 that
+ 	librsvg does not support are the following:
+       </para>
+@@ -192,7 +188,7 @@
+     <para>
+       You may obtain a copy of the <citetitle>GNU General Public Licence</citetitle>
+       from the Free Software Foundation at
+-      <link xlink:href="http://www.gnu.org/licences/">GNU Licences web site</link>
++      <link href="http://www.gnu.org/licences/">GNU Licences web site</link>
+       or by writing to:
+ 
+       <address>
+--- librsvg-2.44.14/librsvg/rsvg-handle.c.orig	2019-02-15 19:20:24.000000000 +0100
++++ librsvg-2.44.14/librsvg/rsvg-handle.c	2019-06-09 17:05:18.357977812 +0200
+@@ -31,7 +31,7 @@
+  * or in the most general form, from a #GInputStream that will provide SVG data.
+  *
+  * Librsvg supports reading <link
+- * xlink:href="https://www.w3.org/TR/SVG/">SVG 1.1</link> data.  It also
++ * href="https://www.w3.org/TR/SVG/">SVG 1.1</link> data.  It also
+  * supports SVGZ files, which is just an SVG stream compressed with the GZIP
+  * algorithm.
+  *
+@@ -43,7 +43,7 @@
+  * and that it has an image element like this:
+  *
+  * |[
+- * <image xlink:href="resources/foo.png" .../>
++ * <image href="resources/foo.png" .../>
+  * ]|
+  *
+  * In this case, librsvg needs to know the location of the toplevel
diff --git a/librsvg-gtkdoc.patch b/librsvg-gtkdoc.patch
new file mode 100644
index 0000000..4fc2d4c
--- /dev/null
+++ b/librsvg-gtkdoc.patch
@@ -0,0 +1,11 @@
+--- librsvg-2.44.14/doc/Makefile.am.orig	2019-02-15 23:17:33.000000000 +0100
++++ librsvg-2.44.14/doc/Makefile.am	2019-06-26 21:41:53.160736381 +0200
+@@ -27,7 +27,7 @@
+ 
+ # Extra options to supply to gtkdoc-scan.
+ # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+-SCAN_OPTIONS = --deprecated-guards="RSVG_DISABLE_DEPRECATED"
++SCAN_OPTIONS = --deprecated-guards="RSVG_DISABLE_DEPRECATED" --rebuild-types
+ 
+ # Extra options to supply to gtkdoc-mkdb.
+ # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/librsvg.git/commitdiff/1e016fcee9218112e86c8d435de16a642cf1f7f1

