Merge lp:~noskcaj/ubuntu/vivid/librsvg/2.40.7 into lp:ubuntu/vivid/librsvg

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/vivid/librsvg/2.40.7
Merge into: lp:ubuntu/vivid/librsvg
Diff against target: 11375 lines (+3949/-4433)
69 files modified
.pc/20_rsvg_compat.patch/rsvg-convert.c (+23/-5)
ChangeLog (+265/-0)
Makefile.in (+7/-15)
NEWS (+7/-0)
README (+1/-3)
aclocal.m4 (+38/-116)
config.guess (+247/-99)
config.h.in (+4/-1)
config.sub (+16/-26)
configure (+173/-357)
configure.ac (+294/-0)
configure.in (+0/-319)
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/20_rsvg_compat.patch (+11/-9)
doc/Makefile.in (+16/-32)
doc/html/RsvgHandle.html (+972/-1287)
doc/html/annotation-glossary.html (+25/-25)
doc/html/api-index-2-14.html (+34/-31)
doc/html/api-index-2-22.html (+22/-19)
doc/html/api-index-2-32.html (+26/-23)
doc/html/api-index-2-36.html (+20/-15)
doc/html/api-index-2-4.html (+15/-12)
doc/html/api-index-2-8.html (+28/-23)
doc/html/api-index-2-9.html (+23/-18)
doc/html/api-index-deprecated.html (+69/-64)
doc/html/api-index-full.html (+213/-208)
doc/html/index.html (+4/-4)
doc/html/index.sgml (+26/-29)
doc/html/licence.html (+9/-9)
doc/html/object-tree.html (+15/-15)
doc/html/rsvg-Using-RSVG-with-GIO.html (+258/-315)
doc/html/rsvg-Using-RSVG-with-GdkPixbuf.html (+270/-367)
doc/html/rsvg-Using-RSVG-with-cairo.html (+76/-101)
doc/html/rsvg-Version-check-and-feature-tests.html (+37/-77)
doc/html/rsvg.devhelp2 (+59/-55)
doc/html/rsvg.html (+9/-9)
doc/html/style.css (+107/-317)
doc/version.xml (+1/-1)
gdk-pixbuf-loader/Makefile.in (+4/-5)
gdk-pixbuf-loader/io-svg.c (+6/-8)
gtk-doc.make (+11/-24)
librsvg-features.h (+2/-2)
librsvg.doap (+10/-11)
m4/gtk-doc.m4 (+15/-32)
m4/libtool.m4 (+4/-14)
missing (+2/-2)
rsvg-base-file-util.c (+4/-4)
rsvg-base.c (+12/-12)
rsvg-convert.c (+23/-5)
rsvg-css.c (+1/-1)
rsvg-defs.c (+2/-2)
rsvg-file-util.c (+3/-3)
rsvg-filter.c (+59/-73)
rsvg-image.c (+3/-3)
rsvg-io.c (+12/-12)
rsvg-io.h (+6/-6)
rsvg-marker.c (+3/-3)
rsvg-marker.h (+2/-2)
rsvg-paint-server.c (+297/-159)
rsvg-path.c (+1/-1)
rsvg-private.h (+5/-5)
rsvg-shapes.c (+13/-1)
rsvg-styles.c (+3/-4)
test-driver (+4/-16)
tests/Makefile.in (+4/-5)
tests/pdiff/Makefile.in (+4/-5)
tools/Makefile.in (+4/-5)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/vivid/librsvg/2.40.7
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Fixing
Review via email: mp+249879@code.launchpad.net

Description of the change

New upstream bugfix release

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Text conflict in rsvg-convert.c
1 conflicts encountered.

review: Needs Fixing

Unmerged revisions

39. By Jackson Doak

New upstream release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/20_rsvg_compat.patch/rsvg-convert.c'
2--- .pc/20_rsvg_compat.patch/rsvg-convert.c 2014-12-10 10:09:37 +0000
3+++ .pc/20_rsvg_compat.patch/rsvg-convert.c 2015-02-16 19:51:53 +0000
4@@ -36,10 +36,16 @@
5 #include <locale.h>
6 #include <glib/gi18n.h>
7 #include <gio/gio.h>
8-#ifdef _WIN32
9+
10+#ifdef G_OS_UNIX
11+#include <gio/gunixinputstream.h>
12+#endif
13+
14+#ifdef G_OS_WIN32
15+#define WIN32_LEAN_AND_MEAN
16+#include <windows.h>
17+
18 #include <gio/gwin32inputstream.h>
19-#else
20-#include <gio/gunixinputstream.h>
21 #endif
22
23 #include "rsvg-css.h"
24@@ -113,13 +119,17 @@
25 int i;
26 char **args = NULL;
27 gint n_args = 0;
28- RsvgHandle *rsvg;
29+ RsvgHandle *rsvg = NULL;
30 cairo_surface_t *surface = NULL;
31 cairo_t *cr = NULL;
32 RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
33 RsvgDimensionData dimensions;
34 FILE *output_file = stdout;
35
36+#ifdef G_OS_WIN32
37+ HANDLE handle;
38+#endif
39+
40 GOptionEntry options_table[] = {
41 {"dpi-x", 'd', 0, G_OPTION_ARG_DOUBLE, &dpi_x,
42 N_("pixels per inch [optional; defaults to 90dpi]"), N_("<float>")},
43@@ -218,7 +228,15 @@
44 if (using_stdin) {
45 file = NULL;
46 #ifdef _WIN32
47- stream = g_win32_input_stream_new (STDIN_FILENO, FALSE);
48+ handle = GetStdHandle (STD_INPUT_HANDLE);
49+
50+ if (handle == INVALID_HANDLE_VALUE) {
51+ gchar *emsg = g_win32_error_message (GetLastError());
52+ g_printerr ( _("Unable to acquire HANDLE for STDIN: %s\n"), emsg);
53+ g_free (emsg);
54+ exit (1);
55+ }
56+ stream = g_win32_input_stream_new (handle, FALSE);
57 #else
58 stream = g_unix_input_stream_new (STDIN_FILENO, FALSE);
59 #endif
60
61=== modified file 'ChangeLog'
62--- ChangeLog 2014-12-10 10:09:37 +0000
63+++ ChangeLog 2015-02-16 19:51:53 +0000
64@@ -1,3 +1,268 @@
65+commit aadbf6968df5fa93e182b7e7c93dc5cc076d44ce
66+Author: Federico Mena Quintero <federico@gnome.org>
67+Date: Fri Feb 13 14:49:11 2015 -0600
68+
69+ Update NEWS
70+
71+ NEWS | 5 +++--
72+ 1 file changed, 3 insertions(+), 2 deletions(-)
73+
74+commit 00e75a916e5cfce7bb98d87d98688d86289f8142
75+Author: Federico Mena Quintero <federico@gnome.org>
76+Date: Fri Feb 13 14:47:35 2015 -0600
77+
78+ Quick update of the README, at least to make it not so outdated
79+
80+ README | 4 +---
81+ 1 file changed, 1 insertion(+), 3 deletions(-)
82+
83+commit 80f6366f8033a33b88640faea50976644aad2c66
84+Author: Federico Mena Quintero <federico@gnome.org>
85+Date: Thu Feb 12 14:18:06 2015 -0600
86+
87+ Internally use 'char *' for string data
88+
89+ There was a mixture of guint8*, guchar*, gchar*, etc. Use char* because that's
90+ about as sane as we can get, and only cast where we can't change the public API
91+ or where we must interface with other libraries. *Cough* xmlChar *cough*.
92+
93+ This removes a metric assload of compiler warnings, and I'm fine with that.
94+
95+ gdk-pixbuf-loader/io-svg.c | 6 +++---
96+ rsvg-base-file-util.c | 8 ++++----
97+ rsvg-base.c | 16 ++++++++--------
98+ rsvg-css.c | 2 +-
99+ rsvg-defs.c | 4 ++--
100+ rsvg-file-util.c | 6 +++---
101+ rsvg-image.c | 6 +++---
102+ rsvg-io.c | 24 ++++++++++++------------
103+ rsvg-io.h | 12 ++++++------
104+ rsvg-private.h | 10 +++++-----
105+ rsvg-styles.c | 7 +++----
106+ 11 files changed, 50 insertions(+), 51 deletions(-)
107+
108+commit 24ca2ec60645365bacbefacff98a5f24f98b1d03
109+Author: Federico Mena Quintero <federico@gnome.org>
110+Date: Thu Feb 12 11:29:12 2015 -0600
111+
112+ configure.in -> configure.ac
113+
114+ autogen.sh | 2 +-
115+ configure.ac | 294 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
116+ configure.in | 294 -----------------------------------------------------------
117+ 3 files changed, 295 insertions(+), 295 deletions(-)
118+
119+commit 0de909abb6312902f738183cda571b08337f118c
120+Author: Federico Mena Quintero <federico@gnome.org>
121+Date: Thu Feb 12 11:26:54 2015 -0600
122+
123+ Remove extra compiler warnings from configure.in
124+
125+ Whoever builds the module should be in control. Developers can very well
126+ have a build-paranoically script or something.
127+
128+ configure.in | 25 -------------------------
129+ 1 file changed, 25 deletions(-)
130+
131+commit 7f7a186a791718b94dc35a5c5559dd2d43049d12
132+Author: Federico Mena Quintero <federico@gnome.org>
133+Date: Thu Feb 12 10:50:35 2015 -0600
134+
135+ Fix parentheses
136+
137+ rsvg-path.c | 2 +-
138+ 1 file changed, 1 insertion(+), 1 deletion(-)
139+
140+commit bc189a77050e4029e1fe9be3a7d7400bc0640c21
141+Author: Federico Mena Quintero <federico@gnome.org>
142+Date: Thu Feb 12 10:49:01 2015 -0600
143+
144+ Fix shadowed variables
145+
146+ rsvg-filter.c | 2 +-
147+ rsvg-marker.c | 6 +++---
148+ rsvg-marker.h | 4 ++--
149+ 3 files changed, 6 insertions(+), 6 deletions(-)
150+
151+commit 5d8e48bf386e4bc8ffefb9262c7ae37b3ee27d9f
152+Author: Federico Mena Quintero <federico@gnome.org>
153+Date: Thu Feb 12 10:48:38 2015 -0600
154+
155+ Fix variable name which shadows a type name
156+
157+ rsvg-base.c | 8 ++++----
158+ 1 file changed, 4 insertions(+), 4 deletions(-)
159+
160+commit cfa5cf4ac4a04977bb3fae08ad4e2d189f6498db
161+Author: Federico Mena Quintero <federico@gnome.org>
162+Date: Thu Feb 12 10:48:21 2015 -0600
163+
164+ Fix possibly-uninitialized variable
165+
166+ rsvg-convert.c | 2 +-
167+ 1 file changed, 1 insertion(+), 1 deletion(-)
168+
169+commit 2c2db8dbe4b8f7f59654d2990f781af3d363b0ba
170+Author: Federico Mena Quintero <federico@gnome.org>
171+Date: Thu Feb 12 10:48:05 2015 -0600
172+
173+ Fix const warnings in the pixbuf loader
174+
175+ gdk-pixbuf-loader/io-svg.c | 8 +++-----
176+ 1 file changed, 3 insertions(+), 5 deletions(-)
177+
178+commit 400336480ed5abbe398d2fa646872a668205a5fd
179+Author: Federico Mena Quintero <federico@gnome.org>
180+Date: Wed Feb 11 15:06:56 2015 -0600
181+
182+ bgo#744270 - Fix uninitialized value in rsvg_filter_primitive_displacement_map_render()
183+
184+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=744270
185+
186+ Signed-off-by: Federico Mena Quintero <federico@gnome.org>
187+
188+ rsvg-filter.c | 2 +-
189+ 1 file changed, 1 insertion(+), 1 deletion(-)
190+
191+commit 2737efd03e814588c3b058633227985c441ccdf4
192+Author: Federico Mena Quintero <federico@gnome.org>
193+Date: Wed Feb 11 14:16:01 2015 -0600
194+
195+ Update NEWS and librsvg.doap; add MAINTAINERS
196+
197+ MAINTAINERS | 3 +++
198+ NEWS | 4 +++-
199+ librsvg.doap | 21 ++++++++++-----------
200+ 3 files changed, 16 insertions(+), 12 deletions(-)
201+
202+commit 0035e95118a60c0cd3949c2300472d805e16a022
203+Author: Federico Mena Quintero <federico@gnome.org>
204+Date: Wed Feb 11 10:48:52 2015 -0600
205+
206+ bgo#744299 - Ensure the type of pattern fallbacks
207+
208+ Atte Kettunen's fuzz testing yielded an SVG with a pattern paint server that
209+ had an xlink:href to a *rect*, not to another patern. Since we were not checking
210+ type type of resolved nodes when applying pattern fallbacks, we were using a
211+ structure of the wrong type.
212+
213+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=744299
214+
215+ Signed-off-by: Federico Mena Quintero <federico@gnome.org>
216+
217+ rsvg-paint-server.c | 29 +++++++++++++++++++++++------
218+ 1 file changed, 23 insertions(+), 6 deletions(-)
219+
220+commit 53c50caecc970aef91cf8e3f1fde919f848d6f0c
221+Author: Federico Mena Quintero <federico@gnome.org>
222+Date: Fri Feb 6 16:33:25 2015 -0600
223+
224+ Avoid overflow in gint multiplication
225+
226+ In the convolution matrix filter code, we read the orderx and ordery for the convolution
227+ matrix. However, multiplying them as gints may overflow.
228+
229+ Found by fuzz testing when orderx = ordery = 65536
230+
231+ Fuzz testing kindly provided by Atte Kettunen <attekett@gmail.com>
232+ From librsvg-fuzz case rsvgconvert-060-3ef-705-f72.svg
233+
234+ Signed-off-by: Federico Mena Quintero <federico@gnome.org>
235+
236+ rsvg-filter.c | 7 +++----
237+ 1 file changed, 3 insertions(+), 4 deletions(-)
238+
239+commit 8c71bac8940831aa1dd24e6f8a27149cd97ca1e9
240+Author: Federico Mena Quintero <federico@gnome.org>
241+Date: Fri Feb 6 12:48:24 2015 -0600
242+
243+ Update NEWS
244+
245+ NEWS | 4 ++++
246+ 1 file changed, 4 insertions(+)
247+
248+commit 8ee18b22ece0f869cb4e2e021c01138cbb8a0226
249+Author: Federico Mena Quintero <federico@gnome.org>
250+Date: Fri Feb 6 11:51:01 2015 -0600
251+
252+ bgo#738169 - Avoid cycles while resolving paint server fallbacks
253+
254+ If a chain of paint servers, defined through the xlink:href attribute, has a cycle,
255+ then we would loop infinitely while resolving the base paint server. We now
256+ use a tortoise-and-hare to detect cycles and stop appropriately.
257+
258+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=738169
259+
260+ Signed-off-by: Federico Mena Quintero <federico@gnome.org>
261+
262+ rsvg-paint-server.c | 421 +++++++++++++++++++++++++++++++++-------------------
263+ 1 file changed, 271 insertions(+), 150 deletions(-)
264+
265+commit 40af93e6eb1c94b90c3b9a0b87e0840e126bb8df
266+Author: Federico Mena Quintero <federico@gnome.org>
267+Date: Thu Feb 5 18:08:25 2015 -0600
268+
269+ bgo#738050 - Handle the case where a list of coordinate pairs has an odd number of elements
270+
271+ Lists of points come in coordinate pairs, but we didn't have any checking for that.
272+ It was possible to try to fetch the 'last' coordinate in a list, i.e. the y coordinate
273+ of an x,y pair, that was in fact missing, leading to an out-of-bounds array read.
274+
275+ In that case, we now reuse the last-known y coordinate.
276+
277+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=738050
278+
279+ Signed-off-by: Federico Mena Quintero <federico@gnome.org>
280+
281+ rsvg-shapes.c | 14 +++++++++++++-
282+ 1 file changed, 13 insertions(+), 1 deletion(-)
283+
284+commit 7803753d130da94db40c10cc75e98b9864dad620
285+Author: Federico Mena Quintero <federico@gnome.org>
286+Date: Thu Feb 5 14:27:10 2015 -0600
287+
288+ bgo#703102 - Clip coordinates for rsvg_alpha_blt() in a more civilized fashion
289+
290+ The source offsets were not being validated correctly, so we could easily do a read or write
291+ outside the bounds of the image surface. We now use a generic function to clip rectangles
292+ instead of doing it by hand.
293+
294+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=703102
295+
296+ Signed-off-by: Federico Mena Quintero <federico@gnome.org>
297+
298+ rsvg-filter.c | 115 ++++++++++++++++++++++++++--------------------------------
299+ 1 file changed, 51 insertions(+), 64 deletions(-)
300+
301+commit 452ef81f5201808357db50169ed4f8c18b50b12e
302+Author: Chun-wei Fan <fanchunwei@src.gnome.org>
303+Date: Fri Dec 19 18:43:15 2014 +0800
304+
305+ Really Fix Build of rsvg-convert on Windows
306+
307+ Commit 1811f20 attempted to fix the build of rsvg-convert on Windows, but
308+ unfortunately there were some issues about it, as
309+ g_win32_input_stream_new() took a Windows HANDLE (i.e. a void*/gpointer),
310+ not a numeric constant like STDIN_FILENO, as its first argument.
311+
312+ Acquire the HANDLE for stdin on Windows first, and pass it into
313+ g_win32_input_stream_new(). Also use G_OS_WIN32 to check we are building
314+ for Windows, as we do elsewhere for GLib-using items.
315+
316+ https://bugzilla.gnome.org/show_bug.cgi?id=734977
317+
318+ rsvg-convert.c | 26 ++++++++++++++++++++++----
319+ 1 file changed, 22 insertions(+), 4 deletions(-)
320+
321+commit 7bb5d1b8ebc57f81a5883247a5acd7f49ba48d09
322+Author: Richard Hughes <richard@hughsie.com>
323+Date: Wed Dec 3 10:27:51 2014 +0000
324+
325+ Post release version bump
326+
327+ configure.in | 2 +-
328+ 1 file changed, 1 insertion(+), 1 deletion(-)
329+
330 commit d2e159735c98be03cf20a346405fe8a5e2eeeff9
331 Author: Richard Hughes <richard@hughsie.com>
332 Date: Wed Dec 3 10:23:51 2014 +0000
333
334=== modified file 'Makefile.in'
335--- Makefile.in 2014-12-10 10:09:37 +0000
336+++ Makefile.in 2015-02-16 19:51:53 +0000
337@@ -1,4 +1,4 @@
338-# Makefile.in generated by automake 1.14.1 from Makefile.am.
339+# Makefile.in generated by automake 1.13.4 from Makefile.am.
340 # @configure_input@
341
342 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
343@@ -100,7 +100,7 @@
344 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
345 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
346 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \
347- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
348+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
349 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
350 $(ACLOCAL_M4)
351 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
352@@ -381,7 +381,6 @@
353 GTK3_CFLAGS = @GTK3_CFLAGS@
354 GTK3_LIBS = @GTK3_LIBS@
355 GTKDOC_CHECK = @GTKDOC_CHECK@
356-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
357 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
358 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
359 GTKDOC_MKPDF = @GTKDOC_MKPDF@
360@@ -742,8 +741,8 @@
361 $(am__aclocal_m4_deps):
362
363 config.h: stamp-h1
364- @test -f $@ || rm -f stamp-h1
365- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
366+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
367+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
368
369 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
370 @rm -f stamp-h1
371@@ -900,14 +899,14 @@
372 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
373 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
374 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
375-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
376+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
377
378 .c.obj:
379 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
380 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
381 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
382 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
383-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
384+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
385
386 .c.lo:
387 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
388@@ -1483,16 +1482,10 @@
389 $(am__post_remove_distdir)
390
391 dist-tarZ: distdir
392- @echo WARNING: "Support for shar distribution archives is" \
393- "deprecated." >&2
394- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
395 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
396 $(am__post_remove_distdir)
397
398 dist-shar: distdir
399- @echo WARNING: "Support for distribution archives compressed with" \
400- "legacy program 'compress' is deprecated." >&2
401- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
402 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
403 $(am__post_remove_distdir)
404
405@@ -1534,10 +1527,9 @@
406 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
407 && am__cwd=`pwd` \
408 && $(am__cd) $(distdir)/_build \
409- && ../configure \
410+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
411 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
412 $(DISTCHECK_CONFIGURE_FLAGS) \
413- --srcdir=.. --prefix="$$dc_install_base" \
414 && $(MAKE) $(AM_MAKEFLAGS) \
415 && $(MAKE) $(AM_MAKEFLAGS) dvi \
416 && $(MAKE) $(AM_MAKEFLAGS) check \
417
418=== modified file 'NEWS'
419--- NEWS 2014-12-10 10:09:37 +0000
420+++ NEWS 2015-02-16 19:51:53 +0000
421@@ -1,3 +1,10 @@
422+Version 2.40.7
423+- Bugs fixed from fuzz testing: #703102, #738050, #738169, #744270, #744299
424+- Fixed unfiled bug from fuzz testing, where the convolution filter
425+ had an integer multiplication overflow.
426+- Fix build of rsvg-convert on Windows.
427+- Fix a bunch of compiler warnings.
428+
429 Version 2.40.6
430 - MinGW build fixes
431 - Fix path data number parsing
432
433=== modified file 'README'
434--- README 2006-01-11 10:31:43 +0000
435+++ README 2015-02-16 19:51:53 +0000
436@@ -1,5 +1,3 @@
437 This is librsvg - A high performance SVG rendering library associated with the Gnome Project.
438
439-If you have questions or comments about librsvg, please send email to librsvg-devel@lists.sourceforge.net. Any bugs should be reported to http://bugzilla.gnome.org/
440-
441-Also, more information on librsvg can be found at librsvg.sf.net
442+Please report bugs at http://bugzilla.gnome.org/enter_bug.cgi?product=librsvg
443
444=== modified file 'aclocal.m4'
445--- aclocal.m4 2014-12-10 10:09:37 +0000
446+++ aclocal.m4 2015-02-16 19:51:53 +0000
447@@ -1,4 +1,4 @@
448-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
449+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
450
451 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
452
453@@ -344,10 +344,10 @@
454 # generated from the m4 files accompanying Automake X.Y.
455 # (This private macro should not be called outside this file.)
456 AC_DEFUN([AM_AUTOMAKE_VERSION],
457-[am__api_version='1.14'
458+[am__api_version='1.13'
459 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
460 dnl require some minimum version. Point them to the right macro.
461-m4_if([$1], [1.14.1], [],
462+m4_if([$1], [1.13.4], [],
463 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
464 ])
465
466@@ -363,7 +363,7 @@
467 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
468 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
469 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
470-[AM_AUTOMAKE_VERSION([1.14.1])dnl
471+[AM_AUTOMAKE_VERSION([1.13.4])dnl
472 m4_ifndef([AC_AUTOCONF_VERSION],
473 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
474 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
475@@ -730,12 +730,6 @@
476 # This macro actually does too much. Some checks are only needed if
477 # your package does certain things. But this isn't really a big deal.
478
479-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
480-m4_define([AC_PROG_CC],
481-m4_defn([AC_PROG_CC])
482-[_AM_PROG_CC_C_O
483-])
484-
485 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
486 # AM_INIT_AUTOMAKE([OPTIONS])
487 # -----------------------------------------------
488@@ -844,48 +838,7 @@
489 AC_CONFIG_COMMANDS_PRE(dnl
490 [m4_provide_if([_AM_COMPILER_EXEEXT],
491 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
492-
493-# POSIX will say in a future version that running "rm -f" with no argument
494-# is OK; and we want to be able to make that assumption in our Makefile
495-# recipes. So use an aggressive probe to check that the usage we want is
496-# actually supported "in the wild" to an acceptable degree.
497-# See automake bug#10828.
498-# To make any issue more visible, cause the running configure to be aborted
499-# by default if the 'rm' program in use doesn't match our expectations; the
500-# user can still override this though.
501-if rm -f && rm -fr && rm -rf; then : OK; else
502- cat >&2 <<'END'
503-Oops!
504-
505-Your 'rm' program seems unable to run without file operands specified
506-on the command line, even when the '-f' option is present. This is contrary
507-to the behaviour of most rm programs out there, and not conforming with
508-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
509-
510-Please tell bug-automake@gnu.org about your system, including the value
511-of your $PATH and any error possibly output before this message. This
512-can help us improve future automake versions.
513-
514-END
515- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
516- echo 'Configuration will proceed anyway, since you have set the' >&2
517- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
518- echo >&2
519- else
520- cat >&2 <<'END'
521-Aborting the configuration process, to ensure you take notice of the issue.
522-
523-You can download and install GNU coreutils to get an 'rm' implementation
524-that behaves properly: <http://www.gnu.org/software/coreutils/>.
525-
526-If you want to complete the configuration process using your problematic
527-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
528-to "yes", and re-run configure.
529-
530-END
531- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
532- fi
533-fi])
534+])
535
536 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
537 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
538@@ -893,6 +846,7 @@
539 m4_define([_AC_COMPILER_EXEEXT],
540 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
541
542+
543 # When config.status generates a header, we must update the stamp-h file.
544 # This file resides in the same directory as the config header
545 # that is generated. The stamp files are numbered to have different names.
546@@ -1040,6 +994,38 @@
547 rm -f confinc confmf
548 ])
549
550+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
551+#
552+# This file is free software; the Free Software Foundation
553+# gives unlimited permission to copy and/or distribute it,
554+# with or without modifications, as long as this notice is preserved.
555+
556+# AM_PROG_CC_C_O
557+# --------------
558+# Like AC_PROG_CC_C_O, but changed for automake.
559+AC_DEFUN([AM_PROG_CC_C_O],
560+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
561+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
562+AC_REQUIRE_AUX_FILE([compile])dnl
563+# FIXME: we rely on the cache variable name because
564+# there is no other way.
565+set dummy $CC
566+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
567+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
568+if test "$am_t" != yes; then
569+ # Losing compiler, so override with the script.
570+ # FIXME: It is wrong to rewrite CC.
571+ # But if we don't then we get into trouble of one sort or another.
572+ # A longer-term fix would be to have automake use am__CC in this case,
573+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
574+ CC="$am_aux_dir/compile $CC"
575+fi
576+dnl Make sure AC_PROG_CC is never called again, or it will override our
577+dnl setting of CC.
578+m4_define([AC_PROG_CC],
579+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
580+])
581+
582 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
583
584 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
585@@ -1110,70 +1096,6 @@
586 AC_DEFUN([_AM_IF_OPTION],
587 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
588
589-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
590-#
591-# This file is free software; the Free Software Foundation
592-# gives unlimited permission to copy and/or distribute it,
593-# with or without modifications, as long as this notice is preserved.
594-
595-# _AM_PROG_CC_C_O
596-# ---------------
597-# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
598-# to automatically call this.
599-AC_DEFUN([_AM_PROG_CC_C_O],
600-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
601-AC_REQUIRE_AUX_FILE([compile])dnl
602-AC_LANG_PUSH([C])dnl
603-AC_CACHE_CHECK(
604- [whether $CC understands -c and -o together],
605- [am_cv_prog_cc_c_o],
606- [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
607- # Make sure it works both with $CC and with simple cc.
608- # Following AC_PROG_CC_C_O, we do the test twice because some
609- # compilers refuse to overwrite an existing .o file with -o,
610- # though they will create one.
611- am_cv_prog_cc_c_o=yes
612- for am_i in 1 2; do
613- if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
614- && test -f conftest2.$ac_objext; then
615- : OK
616- else
617- am_cv_prog_cc_c_o=no
618- break
619- fi
620- done
621- rm -f core conftest*
622- unset am_i])
623-if test "$am_cv_prog_cc_c_o" != yes; then
624- # Losing compiler, so override with the script.
625- # FIXME: It is wrong to rewrite CC.
626- # But if we don't then we get into trouble of one sort or another.
627- # A longer-term fix would be to have automake use am__CC in this case,
628- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
629- CC="$am_aux_dir/compile $CC"
630-fi
631-AC_LANG_POP([C])])
632-
633-# For backward compatibility.
634-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
635-
636-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
637-#
638-# This file is free software; the Free Software Foundation
639-# gives unlimited permission to copy and/or distribute it,
640-# with or without modifications, as long as this notice is preserved.
641-
642-# AM_RUN_LOG(COMMAND)
643-# -------------------
644-# Run COMMAND, save the exit status in ac_status, and log it.
645-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
646-AC_DEFUN([AM_RUN_LOG],
647-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
648- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
649- ac_status=$?
650- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
651- (exit $ac_status); }])
652-
653 # Check to make sure that the build environment is sane. -*- Autoconf -*-
654
655 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
656
657=== modified file 'config.guess'
658--- config.guess 2014-12-10 10:09:37 +0000
659+++ config.guess 2015-02-16 19:51:53 +0000
660@@ -1,8 +1,8 @@
661 #! /bin/sh
662 # Attempt to guess a canonical system name.
663-# Copyright 1992-2014 Free Software Foundation, Inc.
664+# Copyright 1992-2013 Free Software Foundation, Inc.
665
666-timestamp='2014-03-23'
667+timestamp='2013-06-10'
668
669 # This file is free software; you can redistribute it and/or modify it
670 # under the terms of the GNU General Public License as published by
671@@ -50,7 +50,7 @@
672 GNU config.guess ($timestamp)
673
674 Originally written by Per Bothner.
675-Copyright 1992-2014 Free Software Foundation, Inc.
676+Copyright 1992-2013 Free Software Foundation, Inc.
677
678 This is free software; see the source for copying conditions. There is NO
679 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
680@@ -149,10 +149,20 @@
681 LIBC=gnu
682 #endif
683 EOF
684- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
685+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
686 ;;
687 esac
688
689+case "${UNAME_MACHINE}" in
690+ i?86)
691+ test -z "$VENDOR" && VENDOR=pc
692+ ;;
693+ *)
694+ test -z "$VENDOR" && VENDOR=unknown
695+ ;;
696+esac
697+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
698+
699 # Note: order is significant - the case branches are not exclusive.
700
701 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
702@@ -217,23 +227,23 @@
703 exit ;;
704 *:Bitrig:*:*)
705 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
706- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
707+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
708 exit ;;
709 *:OpenBSD:*:*)
710 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
711- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
712+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
713 exit ;;
714 *:ekkoBSD:*:*)
715- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
716+ echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
717 exit ;;
718 *:SolidBSD:*:*)
719- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
720+ echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
721 exit ;;
722 macppc:MirBSD:*:*)
723- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
724+ echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
725 exit ;;
726 *:MirBSD:*:*)
727- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
728+ echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
729 exit ;;
730 alpha:OSF1:*:*)
731 case $UNAME_RELEASE in
732@@ -301,13 +311,13 @@
733 echo alpha-dec-winnt3.5
734 exit ;;
735 Amiga*:UNIX_System_V:4.0:*)
736- echo m68k-unknown-sysv4
737+ echo m68k-${VENDOR}-sysv4
738 exit ;;
739 *:[Aa]miga[Oo][Ss]:*:*)
740- echo ${UNAME_MACHINE}-unknown-amigaos
741+ echo ${UNAME_MACHINE}-${VENDOR}-amigaos
742 exit ;;
743 *:[Mm]orph[Oo][Ss]:*:*)
744- echo ${UNAME_MACHINE}-unknown-morphos
745+ echo ${UNAME_MACHINE}-${VENDOR}-morphos
746 exit ;;
747 *:OS/390:*:*)
748 echo i370-ibm-openedition
749@@ -322,7 +332,7 @@
750 echo arm-acorn-riscix${UNAME_RELEASE}
751 exit ;;
752 arm*:riscos:*:*|arm*:RISCOS:*:*)
753- echo arm-unknown-riscos
754+ echo arm-${VENDOR}-riscos
755 exit ;;
756 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
757 echo hppa1.1-hitachi-hiuxmpp
758@@ -430,7 +440,7 @@
759 echo m68k-hades-mint${UNAME_RELEASE}
760 exit ;;
761 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
762- echo m68k-unknown-mint${UNAME_RELEASE}
763+ echo m68k-${VENDOR}-mint${UNAME_RELEASE}
764 exit ;;
765 m68k:machten:*:*)
766 echo m68k-apple-machten${UNAME_RELEASE}
767@@ -741,9 +751,9 @@
768 exit ;;
769 i*86:OSF1:*:*)
770 if [ -x /usr/sbin/sysversion ] ; then
771- echo ${UNAME_MACHINE}-unknown-osf1mk
772+ echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
773 else
774- echo ${UNAME_MACHINE}-unknown-osf1
775+ echo ${UNAME_MACHINE}-${VENDOR}-osf1
776 fi
777 exit ;;
778 parisc*:Lites*:*:*)
779@@ -803,18 +813,18 @@
780 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
781 exit ;;
782 sparc*:BSD/OS:*:*)
783- echo sparc-unknown-bsdi${UNAME_RELEASE}
784+ echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
785 exit ;;
786 *:BSD/OS:*:*)
787- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
788+ echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
789 exit ;;
790 *:FreeBSD:*:*)
791 UNAME_PROCESSOR=`/usr/bin/uname -p`
792 case ${UNAME_PROCESSOR} in
793 amd64)
794- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
795+ echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
796 *)
797- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
798+ echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
799 esac
800 exit ;;
801 i*:CYGWIN*:*)
802@@ -826,7 +836,7 @@
803 *:MINGW*:*)
804 echo ${UNAME_MACHINE}-pc-mingw32
805 exit ;;
806- *:MSYS*:*)
807+ i*:MSYS*:*)
808 echo ${UNAME_MACHINE}-pc-msys
809 exit ;;
810 i*:windows32*:*)
811@@ -842,10 +852,10 @@
812 echo i586-pc-interix${UNAME_RELEASE}
813 exit ;;
814 authenticamd | genuineintel | EM64T)
815- echo x86_64-unknown-interix${UNAME_RELEASE}
816+ echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
817 exit ;;
818 IA64)
819- echo ia64-unknown-interix${UNAME_RELEASE}
820+ echo ia64-${VENDOR}-interix${UNAME_RELEASE}
821 exit ;;
822 esac ;;
823 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
824@@ -864,31 +874,31 @@
825 echo ${UNAME_MACHINE}-pc-uwin
826 exit ;;
827 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
828- echo x86_64-unknown-cygwin
829+ echo x86_64-${VENDOR}-cygwin
830 exit ;;
831 p*:CYGWIN*:*)
832- echo powerpcle-unknown-cygwin
833+ echo powerpcle-${VENDOR}-cygwin
834 exit ;;
835 prep*:SunOS:5.*:*)
836- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
837+ echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
838 exit ;;
839 *:GNU:*:*)
840 # the GNU system
841- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
842+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
843 exit ;;
844 *:GNU/*:*:*)
845 # other systems with GNU libc and userland
846- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
847+ echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
848 exit ;;
849 i*86:Minix:*:*)
850 echo ${UNAME_MACHINE}-pc-minix
851 exit ;;
852 aarch64:Linux:*:*)
853- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
854+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
855 exit ;;
856 aarch64_be:Linux:*:*)
857 UNAME_MACHINE=aarch64_be
858- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
859+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
860 exit ;;
861 alpha:Linux:*:*)
862 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
863@@ -902,29 +912,29 @@
864 esac
865 objdump --private-headers /bin/sh | grep -q ld.so.1
866 if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
867- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
868+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
869 exit ;;
870 arc:Linux:*:* | arceb:Linux:*:*)
871- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
872+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
873 exit ;;
874 arm*:Linux:*:*)
875 eval $set_cc_for_build
876 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
877 | grep -q __ARM_EABI__
878 then
879- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
880+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
881 else
882 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
883 | grep -q __ARM_PCS_VFP
884 then
885- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
886+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi
887 else
888- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
889+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
890 fi
891 fi
892 exit ;;
893 avr32*:Linux:*:*)
894- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
895+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
896 exit ;;
897 cris:Linux:*:*)
898 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
899@@ -933,22 +943,22 @@
900 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
901 exit ;;
902 frv:Linux:*:*)
903- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
904+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
905 exit ;;
906 hexagon:Linux:*:*)
907- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
908+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
909 exit ;;
910 i*86:Linux:*:*)
911 echo ${UNAME_MACHINE}-pc-linux-${LIBC}
912 exit ;;
913 ia64:Linux:*:*)
914- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
915+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
916 exit ;;
917 m32r*:Linux:*:*)
918- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
919+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
920 exit ;;
921 m68*:Linux:*:*)
922- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
923+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
924 exit ;;
925 mips:Linux:*:* | mips64:Linux:*:*)
926 eval $set_cc_for_build
927@@ -967,63 +977,63 @@
928 #endif
929 EOF
930 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
931- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
932+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
933 ;;
934- openrisc*:Linux:*:*)
935- echo or1k-unknown-linux-${LIBC}
936+ or1k:Linux:*:*)
937+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
938 exit ;;
939- or32:Linux:*:* | or1k*:Linux:*:*)
940- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
941+ or32:Linux:*:*)
942+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
943 exit ;;
944 padre:Linux:*:*)
945- echo sparc-unknown-linux-${LIBC}
946+ echo sparc-${VENDOR}-linux-${LIBC}
947 exit ;;
948 parisc64:Linux:*:* | hppa64:Linux:*:*)
949- echo hppa64-unknown-linux-${LIBC}
950+ echo hppa64-${VENDOR}-linux-${LIBC}
951 exit ;;
952 parisc:Linux:*:* | hppa:Linux:*:*)
953 # Look for CPU level
954 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
955- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
956- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
957- *) echo hppa-unknown-linux-${LIBC} ;;
958+ PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;;
959+ PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;;
960+ *) echo hppa-${VENDOR}-linux-${LIBC} ;;
961 esac
962 exit ;;
963 ppc64:Linux:*:*)
964- echo powerpc64-unknown-linux-${LIBC}
965+ echo powerpc64-${VENDOR}-linux-${LIBC}
966 exit ;;
967 ppc:Linux:*:*)
968- echo powerpc-unknown-linux-${LIBC}
969+ echo powerpc-${VENDOR}-linux-${LIBC}
970 exit ;;
971 ppc64le:Linux:*:*)
972- echo powerpc64le-unknown-linux-${LIBC}
973+ echo powerpc64le-${VENDOR}-linux-${LIBC}
974 exit ;;
975 ppcle:Linux:*:*)
976- echo powerpcle-unknown-linux-${LIBC}
977+ echo powerpcle-${VENDOR}-linux-${LIBC}
978 exit ;;
979 s390:Linux:*:* | s390x:Linux:*:*)
980 echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
981 exit ;;
982 sh64*:Linux:*:*)
983- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
984+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
985 exit ;;
986 sh*:Linux:*:*)
987- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
988+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
989 exit ;;
990 sparc:Linux:*:* | sparc64:Linux:*:*)
991- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
992+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
993 exit ;;
994 tile*:Linux:*:*)
995- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
996+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
997 exit ;;
998 vax:Linux:*:*)
999 echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1000 exit ;;
1001 x86_64:Linux:*:*)
1002- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1003+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
1004 exit ;;
1005 xtensa*:Linux:*:*)
1006- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1007+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
1008 exit ;;
1009 i*86:DYNIX/ptx:4*:*)
1010 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1011@@ -1045,16 +1055,16 @@
1012 echo ${UNAME_MACHINE}-pc-os2-emx
1013 exit ;;
1014 i*86:XTS-300:*:STOP)
1015- echo ${UNAME_MACHINE}-unknown-stop
1016+ echo ${UNAME_MACHINE}-${VENDOR}-stop
1017 exit ;;
1018 i*86:atheos:*:*)
1019- echo ${UNAME_MACHINE}-unknown-atheos
1020+ echo ${UNAME_MACHINE}-${VENDOR}-atheos
1021 exit ;;
1022 i*86:syllable:*:*)
1023 echo ${UNAME_MACHINE}-pc-syllable
1024 exit ;;
1025 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1026- echo i386-unknown-lynxos${UNAME_RELEASE}
1027+ echo i386-${VENODR}-lynxos${UNAME_RELEASE}
1028 exit ;;
1029 i*86:*DOS:*:*)
1030 echo ${UNAME_MACHINE}-pc-msdosdjgpp
1031@@ -1074,7 +1084,7 @@
1032 *Pentium) UNAME_MACHINE=i586 ;;
1033 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1034 esac
1035- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1036+ echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1037 exit ;;
1038 i*86:*:3.2:*)
1039 if test -f /usr/options/cb.name; then
1040@@ -1113,7 +1123,7 @@
1041 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1042 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1043 else # Add other i860-SVR4 vendors below as they are discovered.
1044- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1045+ echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1046 fi
1047 exit ;;
1048 mini*:CTIX:SYS*5:*)
1049@@ -1150,19 +1160,19 @@
1050 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1051 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1052 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1053- echo m68k-unknown-lynxos${UNAME_RELEASE}
1054+ echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
1055 exit ;;
1056 mc68030:UNIX_System_V:4.*:*)
1057 echo m68k-atari-sysv4
1058 exit ;;
1059 TSUNAMI:LynxOS:2.*:*)
1060- echo sparc-unknown-lynxos${UNAME_RELEASE}
1061+ echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
1062 exit ;;
1063 rs6000:LynxOS:2.*:*)
1064- echo rs6000-unknown-lynxos${UNAME_RELEASE}
1065+ echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
1066 exit ;;
1067 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1068- echo powerpc-unknown-lynxos${UNAME_RELEASE}
1069+ echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
1070 exit ;;
1071 SM[BE]S:UNIX_SV:*:*)
1072 echo mips-dde-sysv${UNAME_RELEASE}
1073@@ -1212,7 +1222,7 @@
1074 if [ -d /usr/nec ]; then
1075 echo mips-nec-sysv${UNAME_RELEASE}
1076 else
1077- echo mips-unknown-sysv${UNAME_RELEASE}
1078+ echo mips-${VENDOR}-sysv${UNAME_RELEASE}
1079 fi
1080 exit ;;
1081 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1082@@ -1228,7 +1238,7 @@
1083 echo i586-pc-haiku
1084 exit ;;
1085 x86_64:Haiku:*:*)
1086- echo x86_64-unknown-haiku
1087+ echo x86_64-${VENDOR}-haiku
1088 exit ;;
1089 SX-4:SUPER-UX:*:*)
1090 echo sx4-nec-superux${UNAME_RELEASE}
1091@@ -1260,26 +1270,16 @@
1092 if test "$UNAME_PROCESSOR" = unknown ; then
1093 UNAME_PROCESSOR=powerpc
1094 fi
1095- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1096- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1097- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1098- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1099- grep IS_64BIT_ARCH >/dev/null
1100- then
1101- case $UNAME_PROCESSOR in
1102- i386) UNAME_PROCESSOR=x86_64 ;;
1103- powerpc) UNAME_PROCESSOR=powerpc64 ;;
1104- esac
1105- fi
1106+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1107+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1108+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1109+ grep IS_64BIT_ARCH >/dev/null
1110+ then
1111+ case $UNAME_PROCESSOR in
1112+ i386) UNAME_PROCESSOR=x86_64 ;;
1113+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
1114+ esac
1115 fi
1116- elif test "$UNAME_PROCESSOR" = i386 ; then
1117- # Avoid executing cc on OS X 10.9, as it ships with a stub
1118- # that puts up a graphical alert prompting to install
1119- # developer tools. Any system running Mac OS X 10.7 or
1120- # later (Darwin 11 and later) is required to have a 64-bit
1121- # processor. This is not true of the ARM version of Darwin
1122- # that Apple uses in portable devices.
1123- UNAME_PROCESSOR=x86_64
1124 fi
1125 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1126 exit ;;
1127@@ -1321,13 +1321,13 @@
1128 else
1129 UNAME_MACHINE="$cputype"
1130 fi
1131- echo ${UNAME_MACHINE}-unknown-plan9
1132+ echo ${UNAME_MACHINE}-${VENDOR}-plan9
1133 exit ;;
1134 *:TOPS-10:*:*)
1135- echo pdp10-unknown-tops10
1136+ echo pdp10-${VENDOR}-tops10
1137 exit ;;
1138 *:TENEX:*:*)
1139- echo pdp10-unknown-tenex
1140+ echo pdp10-${VENDOR}-tenex
1141 exit ;;
1142 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1143 echo pdp10-dec-tops20
1144@@ -1336,16 +1336,16 @@
1145 echo pdp10-xkl-tops20
1146 exit ;;
1147 *:TOPS-20:*:*)
1148- echo pdp10-unknown-tops20
1149+ echo pdp10-${VENDOR}-tops20
1150 exit ;;
1151 *:ITS:*:*)
1152- echo pdp10-unknown-its
1153+ echo pdp10-${VENDOR}-its
1154 exit ;;
1155 SEI:*:*:SEIUX)
1156 echo mips-sei-seiux${UNAME_RELEASE}
1157 exit ;;
1158 *:DragonFly:*:*)
1159- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1160+ echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1161 exit ;;
1162 *:*VMS:*:*)
1163 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1164@@ -1367,10 +1367,158 @@
1165 echo ${UNAME_MACHINE}-pc-aros
1166 exit ;;
1167 x86_64:VMkernel:*:*)
1168- echo ${UNAME_MACHINE}-unknown-esx
1169+ echo ${UNAME_MACHINE}-${VENDOR}-esx
1170 exit ;;
1171 esac
1172
1173+eval $set_cc_for_build
1174+cat >$dummy.c <<EOF
1175+#ifdef _SEQUENT_
1176+# include <sys/types.h>
1177+# include <sys/utsname.h>
1178+#endif
1179+main ()
1180+{
1181+#if defined (sony)
1182+#if defined (MIPSEB)
1183+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1184+ I don't know.... */
1185+ printf ("mips-sony-bsd\n"); exit (0);
1186+#else
1187+#include <sys/param.h>
1188+ printf ("m68k-sony-newsos%s\n",
1189+#ifdef NEWSOS4
1190+ "4"
1191+#else
1192+ ""
1193+#endif
1194+ ); exit (0);
1195+#endif
1196+#endif
1197+
1198+#if defined (__arm) && defined (__acorn) && defined (__unix)
1199+ printf ("arm-acorn-riscix\n"); exit (0);
1200+#endif
1201+
1202+#if defined (hp300) && !defined (hpux)
1203+ printf ("m68k-hp-bsd\n"); exit (0);
1204+#endif
1205+
1206+#if defined (NeXT)
1207+#if !defined (__ARCHITECTURE__)
1208+#define __ARCHITECTURE__ "m68k"
1209+#endif
1210+ int version;
1211+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1212+ if (version < 4)
1213+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1214+ else
1215+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1216+ exit (0);
1217+#endif
1218+
1219+#if defined (MULTIMAX) || defined (n16)
1220+#if defined (UMAXV)
1221+ printf ("ns32k-encore-sysv\n"); exit (0);
1222+#else
1223+#if defined (CMU)
1224+ printf ("ns32k-encore-mach\n"); exit (0);
1225+#else
1226+ printf ("ns32k-encore-bsd\n"); exit (0);
1227+#endif
1228+#endif
1229+#endif
1230+
1231+#if defined (__386BSD__)
1232+ printf ("i386-pc-bsd\n"); exit (0);
1233+#endif
1234+
1235+#if defined (sequent)
1236+#if defined (i386)
1237+ printf ("i386-sequent-dynix\n"); exit (0);
1238+#endif
1239+#if defined (ns32000)
1240+ printf ("ns32k-sequent-dynix\n"); exit (0);
1241+#endif
1242+#endif
1243+
1244+#if defined (_SEQUENT_)
1245+ struct utsname un;
1246+
1247+ uname(&un);
1248+
1249+ if (strncmp(un.version, "V2", 2) == 0) {
1250+ printf ("i386-sequent-ptx2\n"); exit (0);
1251+ }
1252+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1253+ printf ("i386-sequent-ptx1\n"); exit (0);
1254+ }
1255+ printf ("i386-sequent-ptx\n"); exit (0);
1256+
1257+#endif
1258+
1259+#if defined (vax)
1260+# if !defined (ultrix)
1261+# include <sys/param.h>
1262+# if defined (BSD)
1263+# if BSD == 43
1264+ printf ("vax-dec-bsd4.3\n"); exit (0);
1265+# else
1266+# if BSD == 199006
1267+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
1268+# else
1269+ printf ("vax-dec-bsd\n"); exit (0);
1270+# endif
1271+# endif
1272+# else
1273+ printf ("vax-dec-bsd\n"); exit (0);
1274+# endif
1275+# else
1276+ printf ("vax-dec-ultrix\n"); exit (0);
1277+# endif
1278+#endif
1279+
1280+#if defined (alliant) && defined (i860)
1281+ printf ("i860-alliant-bsd\n"); exit (0);
1282+#endif
1283+
1284+ exit (1);
1285+}
1286+EOF
1287+
1288+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1289+ { echo "$SYSTEM_NAME"; exit; }
1290+
1291+# Apollos put the system type in the environment.
1292+
1293+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1294+
1295+# Convex versions that predate uname can use getsysinfo(1)
1296+
1297+if [ -x /usr/convex/getsysinfo ]
1298+then
1299+ case `getsysinfo -f cpu_type` in
1300+ c1*)
1301+ echo c1-convex-bsd
1302+ exit ;;
1303+ c2*)
1304+ if getsysinfo -f scalar_acc
1305+ then echo c32-convex-bsd
1306+ else echo c2-convex-bsd
1307+ fi
1308+ exit ;;
1309+ c34*)
1310+ echo c34-convex-bsd
1311+ exit ;;
1312+ c38*)
1313+ echo c38-convex-bsd
1314+ exit ;;
1315+ c4*)
1316+ echo c4-convex-bsd
1317+ exit ;;
1318+ esac
1319+fi
1320+
1321 cat >&2 <<EOF
1322 $0: unable to guess system type
1323
1324
1325=== modified file 'config.h.in'
1326--- config.h.in 2014-12-10 10:09:37 +0000
1327+++ config.h.in 2015-02-16 19:51:53 +0000
1328@@ -1,4 +1,4 @@
1329-/* config.h.in. Generated from configure.in by autoheader. */
1330+/* config.h.in. Generated from configure.ac by autoheader. */
1331
1332 /* Define if building universal (internal helper macro) */
1333 #undef AC_APPLE_UNIVERSAL_BUILD
1334@@ -46,6 +46,9 @@
1335 */
1336 #undef LT_OBJDIR
1337
1338+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
1339+#undef NO_MINUS_C_MINUS_O
1340+
1341 /* Name of package */
1342 #undef PACKAGE
1343
1344
1345=== modified file 'config.sub'
1346--- config.sub 2014-12-10 10:09:37 +0000
1347+++ config.sub 2015-02-16 19:51:53 +0000
1348@@ -1,8 +1,8 @@
1349 #! /bin/sh
1350 # Configuration validation subroutine script.
1351-# Copyright 1992-2014 Free Software Foundation, Inc.
1352+# Copyright 1992-2013 Free Software Foundation, Inc.
1353
1354-timestamp='2014-07-28'
1355+timestamp='2013-04-24'
1356
1357 # This file is free software; you can redistribute it and/or modify it
1358 # under the terms of the GNU General Public License as published by
1359@@ -68,7 +68,7 @@
1360 version="\
1361 GNU config.sub ($timestamp)
1362
1363-Copyright 1992-2014 Free Software Foundation, Inc.
1364+Copyright 1992-2013 Free Software Foundation, Inc.
1365
1366 This is free software; see the source for copying conditions. There is NO
1367 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1368@@ -257,7 +257,7 @@
1369 | avr | avr32 \
1370 | be32 | be64 \
1371 | bfin \
1372- | c4x | c8051 | clipper \
1373+ | c4x | clipper \
1374 | d10v | d30v | dlx | dsp16xx \
1375 | epiphany \
1376 | fido | fr30 | frv \
1377@@ -265,7 +265,6 @@
1378 | hexagon \
1379 | i370 | i860 | i960 | ia64 \
1380 | ip2k | iq2000 \
1381- | k1om \
1382 | le32 | le64 \
1383 | lm32 \
1384 | m32c | m32r | m32rle | m68000 | m68k | m88k \
1385@@ -283,10 +282,8 @@
1386 | mips64vr5900 | mips64vr5900el \
1387 | mipsisa32 | mipsisa32el \
1388 | mipsisa32r2 | mipsisa32r2el \
1389- | mipsisa32r6 | mipsisa32r6el \
1390 | mipsisa64 | mipsisa64el \
1391 | mipsisa64r2 | mipsisa64r2el \
1392- | mipsisa64r6 | mipsisa64r6el \
1393 | mipsisa64sb1 | mipsisa64sb1el \
1394 | mipsisa64sr71k | mipsisa64sr71kel \
1395 | mipsr5900 | mipsr5900el \
1396@@ -298,7 +295,8 @@
1397 | nds32 | nds32le | nds32be \
1398 | nios | nios2 | nios2eb | nios2el \
1399 | ns16k | ns32k \
1400- | open8 | or1k | or1knd | or32 \
1401+ | open8 \
1402+ | or1k | or32 \
1403 | pdp10 | pdp11 | pj | pjl \
1404 | powerpc | powerpc64 | powerpc64le | powerpcle \
1405 | pyramid \
1406@@ -326,7 +324,7 @@
1407 c6x)
1408 basic_machine=tic6x-unknown
1409 ;;
1410- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
1411+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
1412 basic_machine=$basic_machine-unknown
1413 os=-none
1414 ;;
1415@@ -374,7 +372,7 @@
1416 | be32-* | be64-* \
1417 | bfin-* | bs2000-* \
1418 | c[123]* | c30-* | [cjt]90-* | c4x-* \
1419- | c8051-* | clipper-* | craynv-* | cydra-* \
1420+ | clipper-* | craynv-* | cydra-* \
1421 | d10v-* | d30v-* | dlx-* \
1422 | elxsi-* \
1423 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1424@@ -383,7 +381,6 @@
1425 | hexagon-* \
1426 | i*86-* | i860-* | i960-* | ia64-* \
1427 | ip2k-* | iq2000-* \
1428- | k1om-* \
1429 | le32-* | le64-* \
1430 | lm32-* \
1431 | m32c-* | m32r-* | m32rle-* \
1432@@ -403,10 +400,8 @@
1433 | mips64vr5900-* | mips64vr5900el-* \
1434 | mipsisa32-* | mipsisa32el-* \
1435 | mipsisa32r2-* | mipsisa32r2el-* \
1436- | mipsisa32r6-* | mipsisa32r6el-* \
1437 | mipsisa64-* | mipsisa64el-* \
1438 | mipsisa64r2-* | mipsisa64r2el-* \
1439- | mipsisa64r6-* | mipsisa64r6el-* \
1440 | mipsisa64sb1-* | mipsisa64sb1el-* \
1441 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1442 | mipsr5900-* | mipsr5900el-* \
1443@@ -418,7 +413,6 @@
1444 | nios-* | nios2-* | nios2eb-* | nios2el-* \
1445 | none-* | np1-* | ns16k-* | ns32k-* \
1446 | open8-* \
1447- | or1k*-* \
1448 | orion-* \
1449 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1450 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
1451@@ -800,7 +794,7 @@
1452 os=-mingw64
1453 ;;
1454 mingw32)
1455- basic_machine=i686-pc
1456+ basic_machine=i386-pc
1457 os=-mingw32
1458 ;;
1459 mingw32ce)
1460@@ -828,10 +822,6 @@
1461 basic_machine=powerpc-unknown
1462 os=-morphos
1463 ;;
1464- moxiebox)
1465- basic_machine=moxie-unknown
1466- os=-moxiebox
1467- ;;
1468 msdos)
1469 basic_machine=i386-pc
1470 os=-msdos
1471@@ -840,7 +830,7 @@
1472 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
1473 ;;
1474 msys)
1475- basic_machine=i686-pc
1476+ basic_machine=i386-pc
1477 os=-msys
1478 ;;
1479 mvs)
1480@@ -1016,7 +1006,7 @@
1481 ;;
1482 ppc64) basic_machine=powerpc64-unknown
1483 ;;
1484- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1485+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1486 ;;
1487 ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1488 basic_machine=powerpc64le-unknown
1489@@ -1377,14 +1367,14 @@
1490 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1491 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1492 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1493- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1494+ | -uxpv* | -beos* | -mpeix* | -udk* \
1495 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1496 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1497 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1498 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1499 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1500 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1501- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
1502+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1503 # Remember, each alternative MUST END IN *, to match a version number.
1504 ;;
1505 -qnx*)
1506@@ -1556,9 +1546,6 @@
1507 c4x-* | tic4x-*)
1508 os=-coff
1509 ;;
1510- c8051-*)
1511- os=-elf
1512- ;;
1513 hexagon-*)
1514 os=-elf
1515 ;;
1516@@ -1602,6 +1589,9 @@
1517 mips*-*)
1518 os=-elf
1519 ;;
1520+ or1k-*)
1521+ os=-elf
1522+ ;;
1523 or32-*)
1524 os=-coff
1525 ;;
1526
1527=== modified file 'configure'
1528--- configure 2014-12-10 10:09:37 +0000
1529+++ configure 2015-02-16 19:51:53 +0000
1530@@ -1,6 +1,6 @@
1531 #! /bin/sh
1532 # Guess values for system-dependent variables and create Makefiles.
1533-# Generated by GNU Autoconf 2.69 for RSVG 2.40.6.
1534+# Generated by GNU Autoconf 2.69 for RSVG 2.40.7.
1535 #
1536 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg>.
1537 #
1538@@ -591,8 +591,8 @@
1539 # Identity of this package.
1540 PACKAGE_NAME='RSVG'
1541 PACKAGE_TARNAME='librsvg'
1542-PACKAGE_VERSION='2.40.6'
1543-PACKAGE_STRING='RSVG 2.40.6'
1544+PACKAGE_VERSION='2.40.7'
1545+PACKAGE_STRING='RSVG 2.40.7'
1546 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg'
1547 PACKAGE_URL=''
1548
1549@@ -671,14 +671,11 @@
1550 GTK_DOC_BUILD_HTML_TRUE
1551 ENABLE_GTK_DOC_FALSE
1552 ENABLE_GTK_DOC_TRUE
1553-HAVE_GTK_DOC_FALSE
1554-HAVE_GTK_DOC_TRUE
1555 GTKDOC_DEPS_LIBS
1556 GTKDOC_DEPS_CFLAGS
1557 HTML_DIR
1558 GTKDOC_MKPDF
1559 GTKDOC_REBASE
1560-GTKDOC_CHECK_PATH
1561 GTKDOC_CHECK
1562 BSYMBOLIC_LDFLAG
1563 ENABLE_PIXBUF_LOADER_FALSE
1564@@ -1425,7 +1422,7 @@
1565 # Omit some internal or obsolete options to make the list less imposing.
1566 # This message is too long to be a string in the A/UX 3.1 sh.
1567 cat <<_ACEOF
1568-\`configure' configures RSVG 2.40.6 to adapt to many kinds of systems.
1569+\`configure' configures RSVG 2.40.7 to adapt to many kinds of systems.
1570
1571 Usage: $0 [OPTION]... [VAR=VALUE]...
1572
1573@@ -1495,7 +1492,7 @@
1574
1575 if test -n "$ac_init_help"; then
1576 case $ac_init_help in
1577- short | recursive ) echo "Configuration of RSVG 2.40.6:";;
1578+ short | recursive ) echo "Configuration of RSVG 2.40.7:";;
1579 esac
1580 cat <<\_ACEOF
1581
1582@@ -1645,7 +1642,7 @@
1583 test -n "$ac_init_help" && exit $ac_status
1584 if $ac_init_version; then
1585 cat <<\_ACEOF
1586-RSVG configure 2.40.6
1587+RSVG configure 2.40.7
1588 generated by GNU Autoconf 2.69
1589
1590 Copyright (C) 2012 Free Software Foundation, Inc.
1591@@ -2014,7 +2011,7 @@
1592 This file contains any messages produced by compilers while
1593 running configure, to aid debugging if configure makes a mistake.
1594
1595-It was created by RSVG $as_me 2.40.6, which was
1596+It was created by RSVG $as_me 2.40.7, which was
1597 generated by GNU Autoconf 2.69. Invocation command line was
1598
1599 $ $0 $@
1600@@ -2368,7 +2365,7 @@
1601
1602
1603
1604-am__api_version='1.14'
1605+am__api_version='1.13'
1606
1607 ac_aux_dir=
1608 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1609@@ -2883,7 +2880,7 @@
1610
1611 # Define the identity of the package.
1612 PACKAGE='librsvg'
1613- VERSION='2.40.6'
1614+ VERSION='2.40.7'
1615
1616
1617 cat >>confdefs.h <<_ACEOF
1618@@ -2934,47 +2931,6 @@
1619
1620
1621
1622-# POSIX will say in a future version that running "rm -f" with no argument
1623-# is OK; and we want to be able to make that assumption in our Makefile
1624-# recipes. So use an aggressive probe to check that the usage we want is
1625-# actually supported "in the wild" to an acceptable degree.
1626-# See automake bug#10828.
1627-# To make any issue more visible, cause the running configure to be aborted
1628-# by default if the 'rm' program in use doesn't match our expectations; the
1629-# user can still override this though.
1630-if rm -f && rm -fr && rm -rf; then : OK; else
1631- cat >&2 <<'END'
1632-Oops!
1633-
1634-Your 'rm' program seems unable to run without file operands specified
1635-on the command line, even when the '-f' option is present. This is contrary
1636-to the behaviour of most rm programs out there, and not conforming with
1637-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
1638-
1639-Please tell bug-automake@gnu.org about your system, including the value
1640-of your $PATH and any error possibly output before this message. This
1641-can help us improve future automake versions.
1642-
1643-END
1644- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
1645- echo 'Configuration will proceed anyway, since you have set the' >&2
1646- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
1647- echo >&2
1648- else
1649- cat >&2 <<'END'
1650-Aborting the configuration process, to ensure you take notice of the issue.
1651-
1652-You can download and install GNU coreutils to get an 'rm' implementation
1653-that behaves properly: <http://www.gnu.org/software/coreutils/>.
1654-
1655-If you want to complete the configuration process using your problematic
1656-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
1657-to "yes", and re-run configure.
1658-
1659-END
1660- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
1661- fi
1662-fi
1663 # Check whether --enable-silent-rules was given.
1664 if test "${enable_silent_rules+set}" = set; then :
1665 enableval=$enable_silent_rules;
1666@@ -3062,13 +3018,13 @@
1667
1668 # ===========================================================================
1669
1670-RSVG_LT_VERSION_INFO=42:6:40
1671+RSVG_LT_VERSION_INFO=42:7:40
1672
1673 LIBRSVG_MAJOR_VERSION=2
1674
1675 LIBRSVG_MINOR_VERSION=40
1676
1677-LIBRSVG_MICRO_VERSION=6
1678+LIBRSVG_MICRO_VERSION=7
1679
1680
1681
1682@@ -3935,65 +3891,6 @@
1683 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1684 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1685
1686-ac_ext=c
1687-ac_cpp='$CPP $CPPFLAGS'
1688-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1689-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1690-ac_compiler_gnu=$ac_cv_c_compiler_gnu
1691-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
1692-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
1693-if ${am_cv_prog_cc_c_o+:} false; then :
1694- $as_echo_n "(cached) " >&6
1695-else
1696- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1697-/* end confdefs.h. */
1698-
1699-int
1700-main ()
1701-{
1702-
1703- ;
1704- return 0;
1705-}
1706-_ACEOF
1707- # Make sure it works both with $CC and with simple cc.
1708- # Following AC_PROG_CC_C_O, we do the test twice because some
1709- # compilers refuse to overwrite an existing .o file with -o,
1710- # though they will create one.
1711- am_cv_prog_cc_c_o=yes
1712- for am_i in 1 2; do
1713- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
1714- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
1715- ac_status=$?
1716- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1717- (exit $ac_status); } \
1718- && test -f conftest2.$ac_objext; then
1719- : OK
1720- else
1721- am_cv_prog_cc_c_o=no
1722- break
1723- fi
1724- done
1725- rm -f core conftest*
1726- unset am_i
1727-fi
1728-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
1729-$as_echo "$am_cv_prog_cc_c_o" >&6; }
1730-if test "$am_cv_prog_cc_c_o" != yes; then
1731- # Losing compiler, so override with the script.
1732- # FIXME: It is wrong to rewrite CC.
1733- # But if we don't then we get into trouble of one sort or another.
1734- # A longer-term fix would be to have automake use am__CC in this case,
1735- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1736- CC="$am_aux_dir/compile $CC"
1737-fi
1738-ac_ext=c
1739-ac_cpp='$CPP $CPPFLAGS'
1740-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1741-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1742-ac_compiler_gnu=$ac_cv_c_compiler_gnu
1743-
1744-
1745 depcc="$CC" am_compiler_list=
1746
1747 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1748@@ -4718,65 +4615,6 @@
1749 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1750 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1751
1752-ac_ext=c
1753-ac_cpp='$CPP $CPPFLAGS'
1754-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1755-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1756-ac_compiler_gnu=$ac_cv_c_compiler_gnu
1757-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
1758-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
1759-if ${am_cv_prog_cc_c_o+:} false; then :
1760- $as_echo_n "(cached) " >&6
1761-else
1762- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1763-/* end confdefs.h. */
1764-
1765-int
1766-main ()
1767-{
1768-
1769- ;
1770- return 0;
1771-}
1772-_ACEOF
1773- # Make sure it works both with $CC and with simple cc.
1774- # Following AC_PROG_CC_C_O, we do the test twice because some
1775- # compilers refuse to overwrite an existing .o file with -o,
1776- # though they will create one.
1777- am_cv_prog_cc_c_o=yes
1778- for am_i in 1 2; do
1779- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
1780- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
1781- ac_status=$?
1782- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1783- (exit $ac_status); } \
1784- && test -f conftest2.$ac_objext; then
1785- : OK
1786- else
1787- am_cv_prog_cc_c_o=no
1788- break
1789- fi
1790- done
1791- rm -f core conftest*
1792- unset am_i
1793-fi
1794-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
1795-$as_echo "$am_cv_prog_cc_c_o" >&6; }
1796-if test "$am_cv_prog_cc_c_o" != yes; then
1797- # Losing compiler, so override with the script.
1798- # FIXME: It is wrong to rewrite CC.
1799- # But if we don't then we get into trouble of one sort or another.
1800- # A longer-term fix would be to have automake use am__CC in this case,
1801- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1802- CC="$am_aux_dir/compile $CC"
1803-fi
1804-ac_ext=c
1805-ac_cpp='$CPP $CPPFLAGS'
1806-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1807-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1808-ac_compiler_gnu=$ac_cv_c_compiler_gnu
1809-
1810-
1811 depcc="$CC" am_compiler_list=
1812
1813 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1814@@ -5327,6 +5165,131 @@
1815
1816 fi
1817
1818+if test "x$CC" != xcc; then
1819+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
1820+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
1821+else
1822+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
1823+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
1824+fi
1825+set dummy $CC; ac_cc=`$as_echo "$2" |
1826+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
1827+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
1828+ $as_echo_n "(cached) " >&6
1829+else
1830+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1831+/* end confdefs.h. */
1832+
1833+int
1834+main ()
1835+{
1836+
1837+ ;
1838+ return 0;
1839+}
1840+_ACEOF
1841+# Make sure it works both with $CC and with simple cc.
1842+# We do the test twice because some compilers refuse to overwrite an
1843+# existing .o file with -o, though they will create one.
1844+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
1845+rm -f conftest2.*
1846+if { { case "(($ac_try" in
1847+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1848+ *) ac_try_echo=$ac_try;;
1849+esac
1850+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1851+$as_echo "$ac_try_echo"; } >&5
1852+ (eval "$ac_try") 2>&5
1853+ ac_status=$?
1854+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1855+ test $ac_status = 0; } &&
1856+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
1857+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1858+ *) ac_try_echo=$ac_try;;
1859+esac
1860+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1861+$as_echo "$ac_try_echo"; } >&5
1862+ (eval "$ac_try") 2>&5
1863+ ac_status=$?
1864+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1865+ test $ac_status = 0; };
1866+then
1867+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
1868+ if test "x$CC" != xcc; then
1869+ # Test first that cc exists at all.
1870+ if { ac_try='cc -c conftest.$ac_ext >&5'
1871+ { { case "(($ac_try" in
1872+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1873+ *) ac_try_echo=$ac_try;;
1874+esac
1875+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1876+$as_echo "$ac_try_echo"; } >&5
1877+ (eval "$ac_try") 2>&5
1878+ ac_status=$?
1879+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1880+ test $ac_status = 0; }; }; then
1881+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
1882+ rm -f conftest2.*
1883+ if { { case "(($ac_try" in
1884+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1885+ *) ac_try_echo=$ac_try;;
1886+esac
1887+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1888+$as_echo "$ac_try_echo"; } >&5
1889+ (eval "$ac_try") 2>&5
1890+ ac_status=$?
1891+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1892+ test $ac_status = 0; } &&
1893+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
1894+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1895+ *) ac_try_echo=$ac_try;;
1896+esac
1897+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1898+$as_echo "$ac_try_echo"; } >&5
1899+ (eval "$ac_try") 2>&5
1900+ ac_status=$?
1901+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1902+ test $ac_status = 0; };
1903+ then
1904+ # cc works too.
1905+ :
1906+ else
1907+ # cc exists but doesn't like -o.
1908+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
1909+ fi
1910+ fi
1911+ fi
1912+else
1913+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
1914+fi
1915+rm -f core conftest*
1916+
1917+fi
1918+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
1919+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1920+$as_echo "yes" >&6; }
1921+else
1922+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1923+$as_echo "no" >&6; }
1924+
1925+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
1926+
1927+fi
1928+
1929+# FIXME: we rely on the cache variable name because
1930+# there is no other way.
1931+set dummy $CC
1932+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
1933+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
1934+if test "$am_t" != yes; then
1935+ # Losing compiler, so override with the script.
1936+ # FIXME: It is wrong to rewrite CC.
1937+ # But if we don't then we get into trouble of one sort or another.
1938+ # A longer-term fix would be to have automake use am__CC in this case,
1939+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1940+ CC="$am_aux_dir/compile $CC"
1941+fi
1942+
1943
1944
1945 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
1946@@ -7954,7 +7917,7 @@
1947 rm -rf conftest*
1948 ;;
1949
1950-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
1951+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
1952 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1953 # Find out which ABI we are using.
1954 echo 'int i;' > conftest.$ac_ext
1955@@ -7972,10 +7935,7 @@
1956 x86_64-*linux*)
1957 LD="${LD-ld} -m elf_i386"
1958 ;;
1959- powerpc64le-*linux*)
1960- LD="${LD-ld} -m elf32lppclinux"
1961- ;;
1962- powerpc64-*linux*)
1963+ ppc64-*linux*|powerpc64-*linux*)
1964 LD="${LD-ld} -m elf32ppclinux"
1965 ;;
1966 s390x-*linux*)
1967@@ -7994,10 +7954,7 @@
1968 x86_64-*linux*)
1969 LD="${LD-ld} -m elf_x86_64"
1970 ;;
1971- powerpcle-*linux*)
1972- LD="${LD-ld} -m elf64lppc"
1973- ;;
1974- powerpc-*linux*)
1975+ ppc*-*linux*|powerpc*-*linux*)
1976 LD="${LD-ld} -m elf64ppc"
1977 ;;
1978 s390*-*linux*|s390*-*tpf*)
1979@@ -12178,14 +12135,10 @@
1980 # before this can be enabled.
1981 hardcode_into_libs=yes
1982
1983- # Add ABI-specific directories to the system library path.
1984- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1985-
1986 # Append ld.so.conf contents to the search path
1987 if test -f /etc/ld.so.conf; then
1988 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
1989- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1990-
1991+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1992 fi
1993
1994 # We used to test for /lib/ld.so.1 and disable shared libraries on
1995@@ -14241,123 +14194,32 @@
1996
1997
1998 ##################################################
1999-# Compiler warnings
2000-##################################################
2001-
2002-save_CFLAGS="$CFLAGS"
2003-CFLAGS=
2004-
2005- for flag in \
2006- -Wall -Wextra \
2007- -Wunused -Wreturn-type -Wswitch -Wcomment -Wtrigraphs \
2008- -Wchar-subscripts -Wparentheses -Winline -Wredundant-decls \
2009- -Wformat-nonliteral -Werror=format-security \
2010- -Wsign-compare -Werror=implicit-function-declaration \
2011- -Wpointer-arith -Wwrite-strings -Wstrict-prototypes \
2012- -Wnoaggregate-return -Wcast-align -Wimplicit -Wuninitialized \
2013- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs \
2014- -Wpacked -Wmissing-format-attribute -Wshadow \
2015- -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
2016- -Wdeclaration-after-statement -Wold-style-definition \
2017- -Wno-missing-field-initializers -Wno-unused-parameter \
2018- -Wunused-variable -Wunused-function \
2019- -Wempty-body -Wno-switch-enum \
2020- -fno-common; do
2021-
2022- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5
2023-$as_echo_n "checking if $CC supports $flag flag... " >&6; }
2024-if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
2025- $as_echo_n "(cached) " >&6
2026-else
2027-
2028- if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
2029- $as_echo_n "(cached) " >&6
2030-else
2031- ac_save_CFLAGS="$CFLAGS"
2032- CFLAGS="$CFLAGS $flag"
2033- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2034-/* end confdefs.h. */
2035-int a;
2036-_ACEOF
2037-if ac_fn_c_try_compile "$LINENO"; then :
2038- eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'"
2039-else
2040- eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'"
2041-fi
2042-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2043- CFLAGS="$ac_save_CFLAGS"
2044-
2045-fi
2046-
2047-
2048- if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
2049-
2050-fi
2051-
2052-fi
2053-eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`
2054- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2055-$as_echo "$ac_res" >&6; }
2056-
2057- if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
2058- CFLAGS="$CFLAGS $flag"; DEBUG_CFLAGS="$DEBUG_CFLAGS $flag";
2059-fi
2060-
2061- done
2062-
2063-AM_CFLAGS="$AM_CFLAGS $CFLAGS"
2064-CFLAGS="$save_CFLAGS"
2065-
2066-##################################################
2067 # Checks for gtk-doc and docbook-tools
2068 ##################################################
2069
2070
2071
2072
2073- gtk_doc_requires="gtk-doc >= 1.13"
2074- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
2075-$as_echo_n "checking for gtk-doc... " >&6; }
2076- if test -n "$PKG_CONFIG" && \
2077- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5
2078- ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5
2079- ac_status=$?
2080- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2081- test $ac_status = 0; }; then
2082- have_gtk_doc=yes
2083-else
2084- have_gtk_doc=no
2085-fi
2086- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5
2087-$as_echo "$have_gtk_doc" >&6; }
2088-
2089- if test "$have_gtk_doc" = "no"; then
2090- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
2091- You will not be able to create source packages with 'make dist'
2092- because $gtk_doc_requires is not found." >&5
2093-$as_echo "$as_me: WARNING:
2094- You will not be able to create source packages with 'make dist'
2095- because $gtk_doc_requires is not found." >&2;}
2096- fi
2097-
2098- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
2099+ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
2100 set dummy gtkdoc-check; ac_word=$2
2101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2102 $as_echo_n "checking for $ac_word... " >&6; }
2103-if ${ac_cv_prog_GTKDOC_CHECK+:} false; then :
2104+if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
2105 $as_echo_n "(cached) " >&6
2106 else
2107- if test -n "$GTKDOC_CHECK"; then
2108- ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
2109-else
2110-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2111+ case $GTKDOC_CHECK in
2112+ [\\/]* | ?:[\\/]*)
2113+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
2114+ ;;
2115+ *)
2116+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2117 for as_dir in $PATH
2118 do
2119 IFS=$as_save_IFS
2120 test -z "$as_dir" && as_dir=.
2121 for ac_exec_ext in '' $ac_executable_extensions; do
2122 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2123- ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test"
2124+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
2125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2126 break 2
2127 fi
2128@@ -14365,9 +14227,10 @@
2129 done
2130 IFS=$as_save_IFS
2131
2132-fi
2133-fi
2134-GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
2135+ ;;
2136+esac
2137+fi
2138+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
2139 if test -n "$GTKDOC_CHECK"; then
2140 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
2141 $as_echo "$GTKDOC_CHECK" >&6; }
2142@@ -14377,46 +14240,6 @@
2143 fi
2144
2145
2146- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
2147-set dummy gtkdoc-check; ac_word=$2
2148-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2149-$as_echo_n "checking for $ac_word... " >&6; }
2150-if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
2151- $as_echo_n "(cached) " >&6
2152-else
2153- case $GTKDOC_CHECK_PATH in
2154- [\\/]* | ?:[\\/]*)
2155- ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
2156- ;;
2157- *)
2158- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2159-for as_dir in $PATH
2160-do
2161- IFS=$as_save_IFS
2162- test -z "$as_dir" && as_dir=.
2163- for ac_exec_ext in '' $ac_executable_extensions; do
2164- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2165- ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
2166- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2167- break 2
2168- fi
2169-done
2170- done
2171-IFS=$as_save_IFS
2172-
2173- ;;
2174-esac
2175-fi
2176-GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
2177-if test -n "$GTKDOC_CHECK_PATH"; then
2178- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
2179-$as_echo "$GTKDOC_CHECK_PATH" >&6; }
2180-else
2181- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2182-$as_echo "no" >&6; }
2183-fi
2184-
2185-
2186 for ac_prog in gtkdoc-rebase
2187 do
2188 # Extract the first word of "$ac_prog", so it can be a program name with args.
2189@@ -14523,19 +14346,18 @@
2190 fi
2191
2192
2193- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
2194-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
2195- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
2196-$as_echo "$enable_gtk_doc" >&6; }
2197-
2198- if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
2199- as_fn_error $? "
2200- You must have $gtk_doc_requires installed to build documentation for
2201- $PACKAGE_NAME. Please install gtk-doc or disable building the
2202- documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5
2203- fi
2204-
2205- if test "x$PACKAGE_NAME" != "xglib"; then
2206+ if test x$enable_gtk_doc = xyes; then
2207+ if test -n "$PKG_CONFIG" && \
2208+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.13\""; } >&5
2209+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.13") 2>&5
2210+ ac_status=$?
2211+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2212+ test $ac_status = 0; }; then
2213+ :
2214+else
2215+ as_fn_error $? "You need to have gtk-doc >= 1.13 installed to build $PACKAGE_NAME" "$LINENO" 5
2216+fi
2217+ if test "x$PACKAGE_NAME" != "xglib"; then
2218
2219 pkg_failed=no
2220 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
2221@@ -14607,8 +14429,14 @@
2222 $as_echo "yes" >&6; }
2223
2224 fi
2225+ fi
2226 fi
2227
2228+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
2229+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
2230+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
2231+$as_echo "$enable_gtk_doc" >&6; }
2232+
2233 # Check whether --enable-gtk-doc-html was given.
2234 if test "${enable_gtk_doc_html+set}" = set; then :
2235 enableval=$enable_gtk_doc_html;
2236@@ -14633,14 +14461,6 @@
2237 fi
2238
2239
2240- if test x$have_gtk_doc = xyes; then
2241- HAVE_GTK_DOC_TRUE=
2242- HAVE_GTK_DOC_FALSE='#'
2243-else
2244- HAVE_GTK_DOC_TRUE='#'
2245- HAVE_GTK_DOC_FALSE=
2246-fi
2247-
2248 if test x$enable_gtk_doc = xyes; then
2249 ENABLE_GTK_DOC_TRUE=
2250 ENABLE_GTK_DOC_FALSE='#'
2251@@ -15298,10 +15118,6 @@
2252 as_fn_error $? "conditional \"ENABLE_PIXBUF_LOADER\" was never defined.
2253 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2254 fi
2255-if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
2256- as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
2257-Usually this means the macro was only invoked conditionally." "$LINENO" 5
2258-fi
2259 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
2260 as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
2261 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2262@@ -15731,7 +15547,7 @@
2263 # report actual input values of CONFIG_FILES etc. instead of their
2264 # values after options handling.
2265 ac_log="
2266-This file was extended by RSVG $as_me 2.40.6, which was
2267+This file was extended by RSVG $as_me 2.40.7, which was
2268 generated by GNU Autoconf 2.69. Invocation command line was
2269
2270 CONFIG_FILES = $CONFIG_FILES
2271@@ -15797,7 +15613,7 @@
2272 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2273 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2274 ac_cs_version="\\
2275-RSVG config.status 2.40.6
2276+RSVG config.status 2.40.7
2277 configured by $0, generated by GNU Autoconf 2.69,
2278 with options \\"\$ac_cs_config\\"
2279
2280
2281=== added file 'configure.ac'
2282--- configure.ac 1970-01-01 00:00:00 +0000
2283+++ configure.ac 2015-02-16 19:51:53 +0000
2284@@ -0,0 +1,294 @@
2285+m4_define([rsvg_major_version],[2])
2286+m4_define([rsvg_minor_version],[40])
2287+m4_define([rsvg_micro_version],[7])
2288+m4_define([rsvg_extra_version],[])
2289+m4_define([rsvg_version],[rsvg_major_version.rsvg_minor_version.rsvg_micro_version()rsvg_extra_version])
2290+m4_define([rsvg_lt_version_info],m4_eval(rsvg_major_version + rsvg_minor_version):rsvg_micro_version:rsvg_minor_version)
2291+
2292+AC_INIT([RSVG],[rsvg_version],[https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg],[librsvg])
2293+
2294+AC_CONFIG_HEADERS([config.h])
2295+AC_CONFIG_SRCDIR([rsvg.h])
2296+AC_CONFIG_MACRO_DIR([m4])
2297+
2298+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
2299+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
2300+
2301+AM_MAINTAINER_MODE([enable])
2302+
2303+dnl ===========================================================================
2304+dnl API versioning
2305+dnl ===========================================================================
2306+
2307+RSVG_API_VERSION=2.0
2308+RSVG_API_MAJOR_VERSION=2
2309+RSVG_API_MINOR_VERSION=0
2310+
2311+AC_SUBST([RSVG_API_VERSION])
2312+AC_SUBST([RSVG_API_MAJOR_VERSION])
2313+AC_SUBST([RSVG_API_MINOR_VERSION])
2314+AC_SUBST([RSVG_API_VERSION_U],[AS_TR_SH([$RSVG_API_VERSION])])
2315+
2316+dnl ===========================================================================
2317+
2318+GLIB_REQUIRED=2.12.0
2319+GIO_REQUIRED=2.24.0
2320+LIBXML_REQUIRED=2.7.0
2321+CAIRO_REQUIRED=1.2.0
2322+PANGOCAIRO_REQUIRED=1.32.6
2323+GDK_PIXBUF_REQUIRED=2.20
2324+GTK3_REQUIRED=3.2.0
2325+CROCO_REQUIRED=0.6.1
2326+
2327+# ===========================================================================
2328+
2329+AC_SUBST([RSVG_LT_VERSION_INFO],[rsvg_lt_version_info])
2330+AC_SUBST([LIBRSVG_MAJOR_VERSION],[rsvg_major_version])
2331+AC_SUBST([LIBRSVG_MINOR_VERSION],[rsvg_minor_version])
2332+AC_SUBST([LIBRSVG_MICRO_VERSION],[rsvg_micro_version])
2333+
2334+dnl ===========================================================================
2335+
2336+AC_PROG_LN_S
2337+AC_ISC_POSIX
2338+AC_PROG_CC
2339+AC_PROG_CPP
2340+AC_PROG_AWK
2341+AC_STDC_HEADERS
2342+AM_PROG_CC_C_O
2343+
2344+AC_C_BIGENDIAN
2345+
2346+PKG_PROG_PKG_CONFIG
2347+
2348+LT_INIT([win32-dll])
2349+LT_LIB_M
2350+
2351+dnl ===========================================================================
2352+
2353+#AC_CANONICAL_HOST
2354+
2355+AC_MSG_CHECKING([for some Win32 platform])
2356+case "$host" in
2357+ *-*-mingw*|*-*-cygwin*)
2358+ platform_win32=yes
2359+ ;;
2360+ *)
2361+ platform_win32=no
2362+ ;;
2363+esac
2364+AC_MSG_RESULT([$platform_win32])
2365+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
2366+
2367+AC_MSG_CHECKING([for native Win32])
2368+case "$host" in
2369+ *-*-mingw*)
2370+ native_win32=yes
2371+ ;;
2372+ *)
2373+ native_win32=no
2374+ ;;
2375+esac
2376+AC_MSG_RESULT([$native_win32])
2377+AM_CONDITIONAL(OS_WIN32, test "$native_win32" = "yes")
2378+
2379+dnl ===========================================================================
2380+
2381+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
2382+AC_SUBST(GLIB_MKENUMS)
2383+
2384+PKG_CHECK_MODULES(LIBRSVG, \
2385+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
2386+ glib-2.0 >= $GLIB_REQUIRED \
2387+ gio-2.0 >= $GIO_REQUIRED \
2388+ libxml-2.0 >= $LIBXML_REQUIRED \
2389+ pangocairo >= $PANGOCAIRO_REQUIRED \
2390+ cairo >= $CAIRO_REQUIRED \
2391+ cairo-png >= $CAIRO_REQUIRED
2392+ libcroco-0.6 >= $CROCO_REQUIRED)
2393+
2394+PKG_CHECK_MODULES([GTHREAD],[gthread-2.0 >= $GLIB_REQUIRED])
2395+
2396+PKG_CHECK_MODULES([GMODULE],[gmodule-2.0])
2397+
2398+case "$host" in
2399+ *-*-mingw*)
2400+ PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 gio-windows-2.0 gdk-pixbuf-2.0 cairo pangocairo])
2401+ ;;
2402+ *)
2403+ PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 gio-unix-2.0 gdk-pixbuf-2.0 cairo pangocairo])
2404+ ;;
2405+esac
2406+
2407+dnl ===========================================================================
2408+
2409+AC_CHECK_FUNCS(strtok_r)
2410+
2411+# ===========================================================================
2412+# GTK
2413+# ===========================================================================
2414+
2415+PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
2416+
2417+GTK3_BINARY_VERSION=
2418+
2419+if test "$have_gtk_3" = "yes"; then
2420+ GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
2421+fi
2422+
2423+AC_SUBST([GTK3_BINARY_VERSION])
2424+
2425+AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
2426+
2427+dnl ===========================================================================
2428+dnl GDK-Pixbuf SVG loader
2429+dnl ===========================================================================
2430+
2431+AC_MSG_CHECKING([whether to build the GDK-Pixbuf SVG loader])
2432+AC_ARG_ENABLE([pixbuf-loader],
2433+ [AS_HELP_STRING([--disable-pixbuf-loader],[Disable a RSVG based GdkPixbuf loader (default=yes)])],
2434+ [],[enable_pixbuf_loader=yes])
2435+AC_MSG_RESULT([$enable_pixbuf_loader])
2436+
2437+gdk_pixbuf_moduledir=
2438+if test "$enable_pixbuf_loader" = "yes"; then
2439+ PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED])
2440+
2441+ AC_PATH_PROGS([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders-32],[none])
2442+
2443+ if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then
2444+ AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path])
2445+ fi
2446+
2447+ # First try the standalone gdk-pixbuf
2448+ gdk_pixbuf_binary_version="`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`"
2449+ gdk_pixbuf_binarydir="`$PKG_CONFIG --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0`"
2450+ gdk_pixbuf_moduledir=`$PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0`
2451+ gdk_pixbuf_cache_file=`$PKG_CONFIG --variable gdk_pixbuf_cache_file gdk-pixbuf-2.0`
2452+fi
2453+
2454+AC_SUBST([gdk_pixbuf_binary_version])
2455+AC_SUBST([gdk_pixbuf_binarydir])
2456+AC_SUBST([gdk_pixbuf_moduledir])
2457+AC_SUBST([gdk_pixbuf_cache_file])
2458+
2459+AM_CONDITIONAL([ENABLE_PIXBUF_LOADER],[test "$enable_pixbuf_loader" = "yes"])
2460+
2461+##########################################################
2462+# Check for -Bsymbolic-functions linker flag used to avoid
2463+# intra-library PLT jumps, if available.
2464+##########################################################
2465+
2466+AC_ARG_ENABLE([Bsymbolic],
2467+ [AS_HELP_STRING([--disable-Bsymbolic],
2468+ [disable linking with -Bsymbolic])],
2469+ [],[enable_Bsymbolic=yes])
2470+
2471+BSYMBOLIC_LDFLAG=
2472+if test "$enable_Bsymbolic" != "no"; then
2473+ CC_CHECK_LDFLAGS(["-Wl,-Bsymbolic-functions"],
2474+ [BSYMBOLIC_LDFLAG="-Wl,-Bsymbolic-functions"],
2475+ [if test "$enable_Bsymbolic" = "auto"; then
2476+ AC_MSG_WARN([-Bsymbolic not supported by ld; disabling])
2477+ enable_Bsymbolic=no
2478+ else
2479+ AC_MSG_ERROR([-Bsymbolic requested but not supported by ld. Use --disable-Bsymbolic to disable])
2480+ fi])
2481+fi
2482+
2483+AC_SUBST([BSYMBOLIC_LDFLAG])
2484+
2485+##################################################
2486+# Checks for gtk-doc and docbook-tools
2487+##################################################
2488+
2489+GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
2490+
2491+AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)])
2492+AC_SUBST([GDK_PIXBUF_PREFIX],[$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)])
2493+AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)])
2494+AC_SUBST([CAIRO_PREFIX],[$($PKG_CONFIG --variable=prefix cairo)])
2495+
2496+dnl ===========================================================================
2497+dnl Do we build the miscellaenous tools provided with librsvg ?
2498+
2499+AC_ARG_ENABLE(tools,
2500+ AC_HELP_STRING([--disable-tools],
2501+ [do not build miscellaenous tools [default=no]]),
2502+ [build_misc_tools=$enableval],
2503+ [build_misc_tools=yes])
2504+
2505+AC_MSG_CHECKING(whether to build miscellaenous tools)
2506+if test "x$build_misc_tools" = "xyes" ; then
2507+ AC_MSG_RESULT(yes)
2508+else
2509+ AC_MSG_RESULT(no)
2510+fi
2511+AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" = "xyes"])
2512+
2513+dnl ===========================================================================
2514+dnl Build introspectable bindings
2515+
2516+# No automagic please!
2517+if test -z "$enable_introspection"; then
2518+ enable_introspection=yes
2519+fi
2520+
2521+GOBJECT_INTROSPECTION_CHECK([0.10.8])
2522+
2523+# Vala bindings
2524+VAPIGEN_CHECK([0.17.1.26],,,[no])
2525+
2526+dnl ===========================================================================
2527+
2528+m4_copy([AC_DEFUN],[glib_DEFUN])
2529+glib_DEFUN([GLIB_LC_MESSAGES],
2530+ [AC_CHECK_HEADERS([locale.h])
2531+ if test $ac_cv_header_locale_h = yes; then
2532+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
2533+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
2534+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
2535+ if test $am_cv_val_LC_MESSAGES = yes; then
2536+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
2537+ [Define if your <locale.h> file defines LC_MESSAGES.])
2538+ fi
2539+ fi])
2540+
2541+GLIB_LC_MESSAGES
2542+
2543+dnl ===========================================================================
2544+
2545+AC_SUBST([AM_CPPFLAGS])
2546+AC_SUBST([AM_CFLAGS])
2547+AC_SUBST([AM_LDFLAGS])
2548+
2549+AC_CONFIG_FILES([
2550+librsvg-features.h
2551+Makefile
2552+librsvg-zip
2553+gdk-pixbuf-loader/Makefile
2554+tests/Makefile
2555+tests/pdiff/Makefile
2556+tools/Makefile
2557+doc/Makefile
2558+doc/version.xml
2559+])
2560+
2561+AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}.pc:librsvg.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION])
2562+AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}-uninstalled.pc:librsvg-uninstalled.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION])
2563+
2564+AC_OUTPUT
2565+
2566+dnl =============================================================================================
2567+echo "
2568+librsvg-$VERSION
2569+
2570+ prefix: ${prefix}
2571+ compiler: ${CC}
2572+
2573+ Build introspectable bindings: ${found_introspection}
2574+ Build Vala bindings: ${enable_vala}
2575+ Build GdkPixbuf loader: ${enable_pixbuf_loader}
2576+ GTK 3.0: ${have_gtk_3}
2577+ Build miscellaenous tools: ${build_misc_tools}
2578+"
2579
2580=== removed file 'configure.in'
2581--- configure.in 2014-12-10 10:09:37 +0000
2582+++ configure.in 1970-01-01 00:00:00 +0000
2583@@ -1,319 +0,0 @@
2584-m4_define([rsvg_major_version],[2])
2585-m4_define([rsvg_minor_version],[40])
2586-m4_define([rsvg_micro_version],[6])
2587-m4_define([rsvg_extra_version],[])
2588-m4_define([rsvg_version],[rsvg_major_version.rsvg_minor_version.rsvg_micro_version()rsvg_extra_version])
2589-m4_define([rsvg_lt_version_info],m4_eval(rsvg_major_version + rsvg_minor_version):rsvg_micro_version:rsvg_minor_version)
2590-
2591-AC_INIT([RSVG],[rsvg_version],[https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg],[librsvg])
2592-
2593-AC_CONFIG_HEADERS([config.h])
2594-AC_CONFIG_SRCDIR([rsvg.h])
2595-AC_CONFIG_MACRO_DIR([m4])
2596-
2597-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
2598-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
2599-
2600-AM_MAINTAINER_MODE([enable])
2601-
2602-dnl ===========================================================================
2603-dnl API versioning
2604-dnl ===========================================================================
2605-
2606-RSVG_API_VERSION=2.0
2607-RSVG_API_MAJOR_VERSION=2
2608-RSVG_API_MINOR_VERSION=0
2609-
2610-AC_SUBST([RSVG_API_VERSION])
2611-AC_SUBST([RSVG_API_MAJOR_VERSION])
2612-AC_SUBST([RSVG_API_MINOR_VERSION])
2613-AC_SUBST([RSVG_API_VERSION_U],[AS_TR_SH([$RSVG_API_VERSION])])
2614-
2615-dnl ===========================================================================
2616-
2617-GLIB_REQUIRED=2.12.0
2618-GIO_REQUIRED=2.24.0
2619-LIBXML_REQUIRED=2.7.0
2620-CAIRO_REQUIRED=1.2.0
2621-PANGOCAIRO_REQUIRED=1.32.6
2622-GDK_PIXBUF_REQUIRED=2.20
2623-GTK3_REQUIRED=3.2.0
2624-CROCO_REQUIRED=0.6.1
2625-
2626-# ===========================================================================
2627-
2628-AC_SUBST([RSVG_LT_VERSION_INFO],[rsvg_lt_version_info])
2629-AC_SUBST([LIBRSVG_MAJOR_VERSION],[rsvg_major_version])
2630-AC_SUBST([LIBRSVG_MINOR_VERSION],[rsvg_minor_version])
2631-AC_SUBST([LIBRSVG_MICRO_VERSION],[rsvg_micro_version])
2632-
2633-dnl ===========================================================================
2634-
2635-AC_PROG_LN_S
2636-AC_ISC_POSIX
2637-AC_PROG_CC
2638-AC_PROG_CPP
2639-AC_PROG_AWK
2640-AC_STDC_HEADERS
2641-AM_PROG_CC_C_O
2642-
2643-AC_C_BIGENDIAN
2644-
2645-PKG_PROG_PKG_CONFIG
2646-
2647-LT_INIT([win32-dll])
2648-LT_LIB_M
2649-
2650-dnl ===========================================================================
2651-
2652-#AC_CANONICAL_HOST
2653-
2654-AC_MSG_CHECKING([for some Win32 platform])
2655-case "$host" in
2656- *-*-mingw*|*-*-cygwin*)
2657- platform_win32=yes
2658- ;;
2659- *)
2660- platform_win32=no
2661- ;;
2662-esac
2663-AC_MSG_RESULT([$platform_win32])
2664-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
2665-
2666-AC_MSG_CHECKING([for native Win32])
2667-case "$host" in
2668- *-*-mingw*)
2669- native_win32=yes
2670- ;;
2671- *)
2672- native_win32=no
2673- ;;
2674-esac
2675-AC_MSG_RESULT([$native_win32])
2676-AM_CONDITIONAL(OS_WIN32, test "$native_win32" = "yes")
2677-
2678-dnl ===========================================================================
2679-
2680-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
2681-AC_SUBST(GLIB_MKENUMS)
2682-
2683-PKG_CHECK_MODULES(LIBRSVG, \
2684- gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
2685- glib-2.0 >= $GLIB_REQUIRED \
2686- gio-2.0 >= $GIO_REQUIRED \
2687- libxml-2.0 >= $LIBXML_REQUIRED \
2688- pangocairo >= $PANGOCAIRO_REQUIRED \
2689- cairo >= $CAIRO_REQUIRED \
2690- cairo-png >= $CAIRO_REQUIRED
2691- libcroco-0.6 >= $CROCO_REQUIRED)
2692-
2693-PKG_CHECK_MODULES([GTHREAD],[gthread-2.0 >= $GLIB_REQUIRED])
2694-
2695-PKG_CHECK_MODULES([GMODULE],[gmodule-2.0])
2696-
2697-case "$host" in
2698- *-*-mingw*)
2699- PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 gio-windows-2.0 gdk-pixbuf-2.0 cairo pangocairo])
2700- ;;
2701- *)
2702- PKG_CHECK_MODULES([RSVG_CONVERT],[gio-2.0 gio-unix-2.0 gdk-pixbuf-2.0 cairo pangocairo])
2703- ;;
2704-esac
2705-
2706-dnl ===========================================================================
2707-
2708-AC_CHECK_FUNCS(strtok_r)
2709-
2710-# ===========================================================================
2711-# GTK
2712-# ===========================================================================
2713-
2714-PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
2715-
2716-GTK3_BINARY_VERSION=
2717-
2718-if test "$have_gtk_3" = "yes"; then
2719- GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
2720-fi
2721-
2722-AC_SUBST([GTK3_BINARY_VERSION])
2723-
2724-AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
2725-
2726-dnl ===========================================================================
2727-dnl GDK-Pixbuf SVG loader
2728-dnl ===========================================================================
2729-
2730-AC_MSG_CHECKING([whether to build the GDK-Pixbuf SVG loader])
2731-AC_ARG_ENABLE([pixbuf-loader],
2732- [AS_HELP_STRING([--disable-pixbuf-loader],[Disable a RSVG based GdkPixbuf loader (default=yes)])],
2733- [],[enable_pixbuf_loader=yes])
2734-AC_MSG_RESULT([$enable_pixbuf_loader])
2735-
2736-gdk_pixbuf_moduledir=
2737-if test "$enable_pixbuf_loader" = "yes"; then
2738- PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED])
2739-
2740- AC_PATH_PROGS([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders-32],[none])
2741-
2742- if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then
2743- AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path])
2744- fi
2745-
2746- # First try the standalone gdk-pixbuf
2747- gdk_pixbuf_binary_version="`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`"
2748- gdk_pixbuf_binarydir="`$PKG_CONFIG --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0`"
2749- gdk_pixbuf_moduledir=`$PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0`
2750- gdk_pixbuf_cache_file=`$PKG_CONFIG --variable gdk_pixbuf_cache_file gdk-pixbuf-2.0`
2751-fi
2752-
2753-AC_SUBST([gdk_pixbuf_binary_version])
2754-AC_SUBST([gdk_pixbuf_binarydir])
2755-AC_SUBST([gdk_pixbuf_moduledir])
2756-AC_SUBST([gdk_pixbuf_cache_file])
2757-
2758-AM_CONDITIONAL([ENABLE_PIXBUF_LOADER],[test "$enable_pixbuf_loader" = "yes"])
2759-
2760-##########################################################
2761-# Check for -Bsymbolic-functions linker flag used to avoid
2762-# intra-library PLT jumps, if available.
2763-##########################################################
2764-
2765-AC_ARG_ENABLE([Bsymbolic],
2766- [AS_HELP_STRING([--disable-Bsymbolic],
2767- [disable linking with -Bsymbolic])],
2768- [],[enable_Bsymbolic=yes])
2769-
2770-BSYMBOLIC_LDFLAG=
2771-if test "$enable_Bsymbolic" != "no"; then
2772- CC_CHECK_LDFLAGS(["-Wl,-Bsymbolic-functions"],
2773- [BSYMBOLIC_LDFLAG="-Wl,-Bsymbolic-functions"],
2774- [if test "$enable_Bsymbolic" = "auto"; then
2775- AC_MSG_WARN([-Bsymbolic not supported by ld; disabling])
2776- enable_Bsymbolic=no
2777- else
2778- AC_MSG_ERROR([-Bsymbolic requested but not supported by ld. Use --disable-Bsymbolic to disable])
2779- fi])
2780-fi
2781-
2782-AC_SUBST([BSYMBOLIC_LDFLAG])
2783-
2784-##################################################
2785-# Compiler warnings
2786-##################################################
2787-
2788-save_CFLAGS="$CFLAGS"
2789-CFLAGS=
2790-CC_CHECK_CFLAGS_APPEND([ \
2791- -Wall -Wextra \
2792- -Wunused -Wreturn-type -Wswitch -Wcomment -Wtrigraphs \
2793- -Wchar-subscripts -Wparentheses -Winline -Wredundant-decls \
2794- -Wformat-nonliteral -Werror=format-security \
2795- -Wsign-compare -Werror=implicit-function-declaration \
2796- -Wpointer-arith -Wwrite-strings -Wstrict-prototypes \
2797- -Wnoaggregate-return -Wcast-align -Wimplicit -Wuninitialized \
2798- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs \
2799- -Wpacked -Wmissing-format-attribute -Wshadow \
2800- -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
2801- -Wdeclaration-after-statement -Wold-style-definition \
2802- -Wno-missing-field-initializers -Wno-unused-parameter \
2803- -Wunused-variable -Wunused-function \
2804- -Wempty-body -Wno-switch-enum \
2805- -fno-common])
2806-AM_CFLAGS="$AM_CFLAGS $CFLAGS"
2807-CFLAGS="$save_CFLAGS"
2808-
2809-##################################################
2810-# Checks for gtk-doc and docbook-tools
2811-##################################################
2812-
2813-GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
2814-
2815-AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)])
2816-AC_SUBST([GDK_PIXBUF_PREFIX],[$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)])
2817-AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)])
2818-AC_SUBST([CAIRO_PREFIX],[$($PKG_CONFIG --variable=prefix cairo)])
2819-
2820-dnl ===========================================================================
2821-dnl Do we build the miscellaenous tools provided with librsvg ?
2822-
2823-AC_ARG_ENABLE(tools,
2824- AC_HELP_STRING([--disable-tools],
2825- [do not build miscellaenous tools [default=no]]),
2826- [build_misc_tools=$enableval],
2827- [build_misc_tools=yes])
2828-
2829-AC_MSG_CHECKING(whether to build miscellaenous tools)
2830-if test "x$build_misc_tools" = "xyes" ; then
2831- AC_MSG_RESULT(yes)
2832-else
2833- AC_MSG_RESULT(no)
2834-fi
2835-AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" = "xyes"])
2836-
2837-dnl ===========================================================================
2838-dnl Build introspectable bindings
2839-
2840-# No automagic please!
2841-if test -z "$enable_introspection"; then
2842- enable_introspection=yes
2843-fi
2844-
2845-GOBJECT_INTROSPECTION_CHECK([0.10.8])
2846-
2847-# Vala bindings
2848-VAPIGEN_CHECK([0.17.1.26],,,[no])
2849-
2850-dnl ===========================================================================
2851-
2852-m4_copy([AC_DEFUN],[glib_DEFUN])
2853-glib_DEFUN([GLIB_LC_MESSAGES],
2854- [AC_CHECK_HEADERS([locale.h])
2855- if test $ac_cv_header_locale_h = yes; then
2856- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
2857- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
2858- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
2859- if test $am_cv_val_LC_MESSAGES = yes; then
2860- AC_DEFINE(HAVE_LC_MESSAGES, 1,
2861- [Define if your <locale.h> file defines LC_MESSAGES.])
2862- fi
2863- fi])
2864-
2865-GLIB_LC_MESSAGES
2866-
2867-dnl ===========================================================================
2868-
2869-AC_SUBST([AM_CPPFLAGS])
2870-AC_SUBST([AM_CFLAGS])
2871-AC_SUBST([AM_LDFLAGS])
2872-
2873-AC_CONFIG_FILES([
2874-librsvg-features.h
2875-Makefile
2876-librsvg-zip
2877-gdk-pixbuf-loader/Makefile
2878-tests/Makefile
2879-tests/pdiff/Makefile
2880-tools/Makefile
2881-doc/Makefile
2882-doc/version.xml
2883-])
2884-
2885-AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}.pc:librsvg.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION])
2886-AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}-uninstalled.pc:librsvg-uninstalled.pc.in],[],[RSVG_API_VERSION=$RSVG_API_VERSION])
2887-
2888-AC_OUTPUT
2889-
2890-dnl =============================================================================================
2891-echo "
2892-librsvg-$VERSION
2893-
2894- prefix: ${prefix}
2895- compiler: ${CC}
2896-
2897- Build introspectable bindings: ${found_introspection}
2898- Build Vala bindings: ${enable_vala}
2899- Build GdkPixbuf loader: ${enable_pixbuf_loader}
2900- GTK 3.0: ${have_gtk_3}
2901- Build miscellaenous tools: ${build_misc_tools}
2902-"
2903
2904=== modified file 'debian/changelog'
2905--- debian/changelog 2014-12-10 10:09:37 +0000
2906+++ debian/changelog 2015-02-16 19:51:53 +0000
2907@@ -1,3 +1,9 @@
2908+librsvg (2.40.7-0ubuntu1) vivid; urgency=medium
2909+
2910+ * New upstream release.
2911+
2912+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 17 Feb 2015 06:21:11 +1100
2913+
2914 librsvg (2.40.6-1) experimental; urgency=medium
2915
2916 * New upstream release 2.40.6.
2917
2918=== modified file 'debian/control'
2919--- debian/control 2014-12-10 10:09:37 +0000
2920+++ debian/control 2015-02-16 19:51:53 +0000
2921@@ -5,7 +5,8 @@
2922 Source: librsvg
2923 Section: libs
2924 Priority: optional
2925-Maintainer: Josselin Mouette <joss@debian.org>
2926+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
2927+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
2928 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Iain Lane <laney@debian.org>, Michael Biebl <biebl@debian.org>
2929 Build-Depends: cdbs (>= 0.4.93),
2930 debhelper (>= 8.1.3),
2931
2932=== modified file 'debian/control.in'
2933--- debian/control.in 2014-10-14 16:46:07 +0000
2934+++ debian/control.in 2015-02-16 19:51:53 +0000
2935@@ -1,7 +1,8 @@
2936 Source: librsvg
2937 Section: libs
2938 Priority: optional
2939-Maintainer: Josselin Mouette <joss@debian.org>
2940+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
2941+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
2942 Uploaders: @GNOME_TEAM@
2943 Build-Depends: cdbs (>= 0.4.93),
2944 debhelper (>= 8.1.3),
2945
2946=== modified file 'debian/patches/20_rsvg_compat.patch'
2947--- debian/patches/20_rsvg_compat.patch 2014-08-19 01:59:58 +0000
2948+++ debian/patches/20_rsvg_compat.patch 2015-02-16 19:51:53 +0000
2949@@ -1,17 +1,19 @@
2950-Index: librsvg-2.40.3/rsvg-convert.c
2951-===================================================================
2952---- librsvg-2.40.3.orig/rsvg-convert.c 2014-08-19 01:55:20.857179988 +0200
2953-+++ librsvg-2.40.3/rsvg-convert.c 2014-08-19 01:55:20.853179920 +0200
2954-@@ -115,6 +115,8 @@
2955+---
2956+ rsvg-convert.c | 27 +++++++++++++++++++++++----
2957+ 1 file changed, 23 insertions(+), 4 deletions(-)
2958+
2959+--- a/rsvg-convert.c
2960++++ b/rsvg-convert.c
2961+@@ -125,6 +125,8 @@ main (int argc, char **argv)
2962 RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
2963 RsvgDimensionData dimensions;
2964 FILE *output_file = stdout;
2965 + char *basename;
2966 + gboolean rsvg_compat = FALSE;
2967
2968- GOptionEntry options_table[] = {
2969- {"dpi-x", 'd', 0, G_OPTION_ARG_DOUBLE, &dpi_x,
2970-@@ -168,6 +170,27 @@
2971+ #ifdef G_OS_WIN32
2972+ HANDLE handle;
2973+@@ -182,6 +184,27 @@ main (int argc, char **argv)
2974 return 0;
2975 }
2976
2977@@ -39,7 +41,7 @@
2978 if (output != NULL) {
2979 output_file = fopen (output, "wb");
2980 if (!output_file) {
2981-@@ -179,10 +202,6 @@
2982+@@ -193,10 +216,6 @@ main (int argc, char **argv)
2983 g_free (output);
2984 }
2985
2986
2987=== modified file 'doc/Makefile.in'
2988--- doc/Makefile.in 2014-12-10 10:09:37 +0000
2989+++ doc/Makefile.in 2015-02-16 19:51:53 +0000
2990@@ -1,4 +1,4 @@
2991-# Makefile.in generated by automake 1.14.1 from Makefile.am.
2992+# Makefile.in generated by automake 1.13.4 from Makefile.am.
2993 # @configure_input@
2994
2995 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
2996@@ -91,7 +91,7 @@
2997 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
2998 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
2999 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \
3000- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
3001+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
3002 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
3003 $(ACLOCAL_M4)
3004 mkinstalldirs = $(install_sh) -d
3005@@ -165,7 +165,6 @@
3006 GTK3_CFLAGS = @GTK3_CFLAGS@
3007 GTK3_LIBS = @GTK3_LIBS@
3008 GTKDOC_CHECK = @GTKDOC_CHECK@
3009-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
3010 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
3011 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
3012 GTKDOC_MKPDF = @GTKDOC_MKPDF@
3013@@ -464,11 +463,11 @@
3014 $(DOC_MODULE)-undeclared.txt \
3015 $(DOC_MODULE)-unused.txt
3016
3017-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
3018-@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP =
3019-@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
3020-@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP =
3021-@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
3022+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
3023+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP =
3024+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
3025+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP =
3026+@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
3027
3028 #### setup ####
3029 GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
3030@@ -584,7 +583,6 @@
3031 dist-hook
3032 check-am: all-am
3033 check: check-am
3034-@ENABLE_GTK_DOC_FALSE@all-local:
3035 all-am: Makefile all-local
3036 installdirs:
3037 install: install-am
3038@@ -702,15 +700,8 @@
3039 uninstall-am uninstall-local
3040
3041
3042-gtkdoc-check.test: Makefile
3043- $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
3044- echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
3045- chmod +x $@
3046-
3047-all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
3048-.PHONY: all-gtk-doc
3049-
3050-@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
3051+@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
3052+@ENABLE_GTK_DOC_FALSE@all-local:
3053
3054 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
3055
3056@@ -721,16 +712,14 @@
3057 files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
3058 if test "x$$files" != "x" ; then \
3059 for file in $$files ; do \
3060- destdir=`dirname $(abs_builddir)/$$file`; \
3061- test -d "$$destdir" || mkdir -p "$$destdir"; \
3062 test -f $(abs_srcdir)/$$file && \
3063- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
3064+ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
3065 done; \
3066 fi; \
3067 fi
3068 $(AM_V_at)touch setup-build.stamp
3069
3070-scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
3071+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
3072 $(GTK_DOC_V_SCAN)_source_dir='' ; \
3073 for i in $(DOC_SOURCE_DIR) ; do \
3074 _source_dir="$${_source_dir} --source-dir=$$i" ; \
3075@@ -819,9 +808,6 @@
3076 clean-local:
3077 @rm -f *~ *.bak
3078 @rm -rf .libs
3079- @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
3080- rm -f $(DOC_MODULE).types; \
3081- fi
3082
3083 distclean-local:
3084 @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
3085@@ -866,14 +852,12 @@
3086 #
3087 # Require gtk-doc when making dist
3088 #
3089-@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
3090-@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
3091-@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***"
3092-@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***"
3093-@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***"
3094-@HAVE_GTK_DOC_FALSE@ @false
3095+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
3096+@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
3097+@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist"
3098+@ENABLE_GTK_DOC_FALSE@ @false
3099
3100-dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
3101+dist-hook: dist-check-gtkdoc dist-hook-local
3102 @mkdir $(distdir)/html
3103 @cp ./html/* $(distdir)/html
3104 @-cp ./$(DOC_MODULE).pdf $(distdir)/
3105
3106=== modified file 'doc/html/RsvgHandle.html'
3107--- doc/html/RsvgHandle.html 2014-12-10 10:09:37 +0000
3108+++ doc/html/RsvgHandle.html 2015-02-16 19:51:53 +0000
3109@@ -2,28 +2,34 @@
3110 <html>
3111 <head>
3112 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3113-<title>RSVG Libary Reference Manual: RsvgHandle</title>
3114+<title>RsvgHandle</title>
3115 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
3116 <link rel="home" href="index.html" title="RSVG Libary Reference Manual">
3117 <link rel="up" href="rsvg.html" title="Part I. API Reference">
3118 <link rel="prev" href="rsvg.html" title="Part I. API Reference">
3119 <link rel="next" href="rsvg-Using-RSVG-with-GIO.html" title="Using RSVG with GIO">
3120-<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
3121+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
3122 <link rel="stylesheet" href="style.css" type="text/css">
3123 </head>
3124 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
3125-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
3126-<td width="100%" align="left" class="shortcuts">
3127-<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
3128- <a href="#RsvgHandle.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
3129- <a href="#RsvgHandle.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
3130- <a href="#RsvgHandle.properties" class="shortcut">Properties</a></span>
3131-</td>
3132-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
3133-<td><a accesskey="u" href="rsvg.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
3134-<td><a accesskey="p" href="rsvg.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
3135-<td><a accesskey="n" href="rsvg-Using-RSVG-with-GIO.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
3136-</tr></table>
3137+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
3138+<tr valign="middle">
3139+<td><a accesskey="p" href="rsvg.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
3140+<td><a accesskey="u" href="rsvg.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
3141+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
3142+<th width="100%" align="center">RSVG Libary Reference Manual</th>
3143+<td><a accesskey="n" href="rsvg-Using-RSVG-with-GIO.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
3144+</tr>
3145+<tr><td colspan="5" class="shortcuts">
3146+<a href="#RsvgHandle.synopsis" class="shortcut">Top</a>
3147+  | 
3148+ <a href="#RsvgHandle.description" class="shortcut">Description</a>
3149+  | 
3150+ <a href="#RsvgHandle.object-hierarchy" class="shortcut">Object Hierarchy</a>
3151+  | 
3152+ <a href="#RsvgHandle.properties" class="shortcut">Properties</a>
3153+</td></tr>
3154+</table>
3155 <div class="refentry">
3156 <a name="RsvgHandle"></a><div class="titlepage"></div>
3157 <div class="refnamediv"><table width="100%"><tr>
3158@@ -31,1183 +37,162 @@
3159 <h2><span class="refentrytitle"><a name="RsvgHandle.top_of_page"></a>RsvgHandle</span></h2>
3160 <p>RsvgHandle — Create and manipulate SVG objects</p>
3161 </td>
3162-<td class="gallery_image" valign="top" align="right"></td>
3163+<td valign="top" align="right"></td>
3164 </tr></table></div>
3165+<div class="refsynopsisdiv">
3166+<a name="RsvgHandle.synopsis"></a><h2>Synopsis</h2>
3167+<a name="RsvgError"></a><pre class="synopsis">enum <a class="link" href="RsvgHandle.html#RsvgError-enum" title="enum RsvgError">RsvgError</a>;
3168+#define <a class="link" href="RsvgHandle.html#RSVG-ERROR:CAPS" title="RSVG_ERROR">RSVG_ERROR</a>
3169+<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="RsvgHandle.html#rsvg-error-quark" title="rsvg_error_quark ()">rsvg_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
3170+ <a class="link" href="RsvgHandle.html#RsvgHandle-struct" title="RsvgHandle">RsvgHandle</a>;
3171+typedef <a class="link" href="RsvgHandle.html#RsvgHandlePrivate" title="RsvgHandlePrivate">RsvgHandlePrivate</a>;
3172+struct <a class="link" href="RsvgHandle.html#RsvgHandleClass" title="struct RsvgHandleClass">RsvgHandleClass</a>;
3173+struct <a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData">RsvgDimensionData</a>;
3174+struct <a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData">RsvgPositionData</a>;
3175+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-cleanup" title="rsvg_cleanup ()">rsvg_cleanup</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
3176+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-set-default-dpi" title="rsvg_set_default_dpi ()">rsvg_set_default_dpi</a> (<em class="parameter"><code><span class="type">double</span> dpi</code></em>);
3177+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-set-default-dpi-x-y" title="rsvg_set_default_dpi_x_y ()">rsvg_set_default_dpi_x_y</a> (<em class="parameter"><code><span class="type">double</span> dpi_x</code></em>,
3178+ <em class="parameter"><code><span class="type">double</span> dpi_y</code></em>);
3179+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-set-dpi" title="rsvg_handle_set_dpi ()">rsvg_handle_set_dpi</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3180+ <em class="parameter"><code><span class="type">double</span> dpi</code></em>);
3181+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-set-dpi-x-y" title="rsvg_handle_set_dpi_x_y ()">rsvg_handle_set_dpi_x_y</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3182+ <em class="parameter"><code><span class="type">double</span> dpi_x</code></em>,
3183+ <em class="parameter"><code><span class="type">double</span> dpi_y</code></em>);
3184+<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> * <a class="link" href="RsvgHandle.html#rsvg-handle-new" title="rsvg_handle_new ()">rsvg_handle_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
3185+<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> * <a class="link" href="RsvgHandle.html#rsvg-handle-new-with-flags" title="rsvg_handle_new_with_flags ()">rsvg_handle_new_with_flags</a> (<em class="parameter"><code><a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a> flags</code></em>);
3186+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-write" title="rsvg_handle_write ()">rsvg_handle_write</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3187+ <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a> *buf</code></em>,
3188+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> count</code></em>,
3189+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
3190+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-close" title="rsvg_handle_close ()">rsvg_handle_close</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3191+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
3192+const <span class="returnvalue">char</span> * <a class="link" href="RsvgHandle.html#rsvg-handle-get-base-uri" title="rsvg_handle_get_base_uri ()">rsvg_handle_get_base_uri</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);
3193+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-set-base-uri" title="rsvg_handle_set_base_uri ()">rsvg_handle_set_base_uri</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3194+ <em class="parameter"><code>const <span class="type">char</span> *base_uri</code></em>);
3195+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-get-dimensions" title="rsvg_handle_get_dimensions ()">rsvg_handle_get_dimensions</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3196+ <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>);
3197+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-get-dimensions-sub" title="rsvg_handle_get_dimensions_sub ()">rsvg_handle_get_dimensions_sub</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3198+ <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>,
3199+ <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);
3200+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-get-position-sub" title="rsvg_handle_get_position_sub ()">rsvg_handle_get_position_sub</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3201+ <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>,
3202+ <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);
3203+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="RsvgHandle.html#rsvg-handle-has-sub" title="rsvg_handle_has_sub ()">rsvg_handle_has_sub</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3204+ <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);
3205+const <span class="returnvalue">char</span> * <a class="link" href="RsvgHandle.html#rsvg-handle-get-title" title="rsvg_handle_get_title ()">rsvg_handle_get_title</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);
3206+const <span class="returnvalue">char</span> * <a class="link" href="RsvgHandle.html#rsvg-handle-get-desc" title="rsvg_handle_get_desc ()">rsvg_handle_get_desc</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);
3207+const <span class="returnvalue">char</span> * <a class="link" href="RsvgHandle.html#rsvg-handle-get-metadata" title="rsvg_handle_get_metadata ()">rsvg_handle_get_metadata</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);
3208+<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> * <a class="link" href="RsvgHandle.html#rsvg-handle-new-from-data" title="rsvg_handle_new_from_data ()">rsvg_handle_new_from_data</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *data</code></em>,
3209+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> data_len</code></em>,
3210+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
3211+<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> * <a class="link" href="RsvgHandle.html#rsvg-handle-new-from-file" title="rsvg_handle_new_from_file ()">rsvg_handle_new_from_file</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *file_name</code></em>,
3212+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
3213+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="RsvgHandle.html#rsvg-error-get-type" title="rsvg_error_get_type ()">rsvg_error_get_type</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
3214+#define <a class="link" href="RsvgHandle.html#RSVG-TYPE-ERROR:CAPS" title="RSVG_TYPE_ERROR">RSVG_TYPE_ERROR</a>
3215+
3216+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-init" title="rsvg_init ()">rsvg_init</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
3217+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-term" title="rsvg_term ()">rsvg_term</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
3218+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-free" title="rsvg_handle_free ()">rsvg_handle_free</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);
3219+<span class="returnvalue">void</span> <a class="link" href="RsvgHandle.html#rsvg-handle-set-size-callback" title="rsvg_handle_set_size_callback ()">rsvg_handle_set_size_callback</a> (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3220+ <em class="parameter"><code><span class="type">RsvgSizeFunc</span> size_func</code></em>,
3221+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>,
3222+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> user_data_destroy</code></em>);
3223+</pre>
3224+</div>
3225 <div class="refsect1">
3226-<a name="RsvgHandle.functions"></a><h2>Functions</h2>
3227-<div class="informaltable"><table width="100%" border="0">
3228-<colgroup>
3229-<col width="150px" class="functions_return">
3230-<col class="functions_name">
3231-</colgroup>
3232-<tbody>
3233-<tr>
3234-<td class="define_keyword">#define</td>
3235-<td class="function_name"><a class="link" href="RsvgHandle.html#RSVG-ERROR:CAPS" title="RSVG_ERROR">RSVG_ERROR</a></td>
3236-</tr>
3237-<tr>
3238-<td class="function_type">
3239-<a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>
3240-</td>
3241-<td class="function_name">
3242-<a class="link" href="RsvgHandle.html#rsvg-error-quark" title="rsvg_error_quark ()">rsvg_error_quark</a> <span class="c_punctuation">()</span>
3243-</td>
3244-</tr>
3245-<tr>
3246-<td class="function_type">
3247-<span class="returnvalue">void</span>
3248-</td>
3249-<td class="function_name">
3250-<a class="link" href="RsvgHandle.html#rsvg-cleanup" title="rsvg_cleanup ()">rsvg_cleanup</a> <span class="c_punctuation">()</span>
3251-</td>
3252-</tr>
3253-<tr>
3254-<td class="function_type">
3255-<span class="returnvalue">void</span>
3256-</td>
3257-<td class="function_name">
3258-<a class="link" href="RsvgHandle.html#rsvg-set-default-dpi" title="rsvg_set_default_dpi ()">rsvg_set_default_dpi</a> <span class="c_punctuation">()</span>
3259-</td>
3260-</tr>
3261-<tr>
3262-<td class="function_type">
3263-<span class="returnvalue">void</span>
3264-</td>
3265-<td class="function_name">
3266-<a class="link" href="RsvgHandle.html#rsvg-set-default-dpi-x-y" title="rsvg_set_default_dpi_x_y ()">rsvg_set_default_dpi_x_y</a> <span class="c_punctuation">()</span>
3267-</td>
3268-</tr>
3269-<tr>
3270-<td class="function_type">
3271-<span class="returnvalue">void</span>
3272-</td>
3273-<td class="function_name">
3274-<a class="link" href="RsvgHandle.html#rsvg-handle-set-dpi" title="rsvg_handle_set_dpi ()">rsvg_handle_set_dpi</a> <span class="c_punctuation">()</span>
3275-</td>
3276-</tr>
3277-<tr>
3278-<td class="function_type">
3279-<span class="returnvalue">void</span>
3280-</td>
3281-<td class="function_name">
3282-<a class="link" href="RsvgHandle.html#rsvg-handle-set-dpi-x-y" title="rsvg_handle_set_dpi_x_y ()">rsvg_handle_set_dpi_x_y</a> <span class="c_punctuation">()</span>
3283-</td>
3284-</tr>
3285-<tr>
3286-<td class="function_type">
3287-<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
3288-</td>
3289-<td class="function_name">
3290-<a class="link" href="RsvgHandle.html#rsvg-handle-new" title="rsvg_handle_new ()">rsvg_handle_new</a> <span class="c_punctuation">()</span>
3291-</td>
3292-</tr>
3293-<tr>
3294-<td class="function_type">
3295-<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
3296-</td>
3297-<td class="function_name">
3298-<a class="link" href="RsvgHandle.html#rsvg-handle-new-with-flags" title="rsvg_handle_new_with_flags ()">rsvg_handle_new_with_flags</a> <span class="c_punctuation">()</span>
3299-</td>
3300-</tr>
3301-<tr>
3302-<td class="function_type">
3303-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3304-</td>
3305-<td class="function_name">
3306-<a class="link" href="RsvgHandle.html#rsvg-handle-write" title="rsvg_handle_write ()">rsvg_handle_write</a> <span class="c_punctuation">()</span>
3307-</td>
3308-</tr>
3309-<tr>
3310-<td class="function_type">
3311-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3312-</td>
3313-<td class="function_name">
3314-<a class="link" href="RsvgHandle.html#rsvg-handle-close" title="rsvg_handle_close ()">rsvg_handle_close</a> <span class="c_punctuation">()</span>
3315-</td>
3316-</tr>
3317-<tr>
3318-<td class="function_type">const <span class="returnvalue">char</span> *
3319-</td>
3320-<td class="function_name">
3321-<a class="link" href="RsvgHandle.html#rsvg-handle-get-base-uri" title="rsvg_handle_get_base_uri ()">rsvg_handle_get_base_uri</a> <span class="c_punctuation">()</span>
3322-</td>
3323-</tr>
3324-<tr>
3325-<td class="function_type">
3326-<span class="returnvalue">void</span>
3327-</td>
3328-<td class="function_name">
3329-<a class="link" href="RsvgHandle.html#rsvg-handle-set-base-uri" title="rsvg_handle_set_base_uri ()">rsvg_handle_set_base_uri</a> <span class="c_punctuation">()</span>
3330-</td>
3331-</tr>
3332-<tr>
3333-<td class="function_type">
3334-<span class="returnvalue">void</span>
3335-</td>
3336-<td class="function_name">
3337-<a class="link" href="RsvgHandle.html#rsvg-handle-get-dimensions" title="rsvg_handle_get_dimensions ()">rsvg_handle_get_dimensions</a> <span class="c_punctuation">()</span>
3338-</td>
3339-</tr>
3340-<tr>
3341-<td class="function_type">
3342-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3343-</td>
3344-<td class="function_name">
3345-<a class="link" href="RsvgHandle.html#rsvg-handle-get-dimensions-sub" title="rsvg_handle_get_dimensions_sub ()">rsvg_handle_get_dimensions_sub</a> <span class="c_punctuation">()</span>
3346-</td>
3347-</tr>
3348-<tr>
3349-<td class="function_type">
3350-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3351-</td>
3352-<td class="function_name">
3353-<a class="link" href="RsvgHandle.html#rsvg-handle-get-position-sub" title="rsvg_handle_get_position_sub ()">rsvg_handle_get_position_sub</a> <span class="c_punctuation">()</span>
3354-</td>
3355-</tr>
3356-<tr>
3357-<td class="function_type">
3358-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3359-</td>
3360-<td class="function_name">
3361-<a class="link" href="RsvgHandle.html#rsvg-handle-has-sub" title="rsvg_handle_has_sub ()">rsvg_handle_has_sub</a> <span class="c_punctuation">()</span>
3362-</td>
3363-</tr>
3364-<tr>
3365-<td class="function_type">const <span class="returnvalue">char</span> *
3366-</td>
3367-<td class="function_name">
3368-<a class="link" href="RsvgHandle.html#rsvg-handle-get-title" title="rsvg_handle_get_title ()">rsvg_handle_get_title</a> <span class="c_punctuation">()</span>
3369-</td>
3370-</tr>
3371-<tr>
3372-<td class="function_type">const <span class="returnvalue">char</span> *
3373-</td>
3374-<td class="function_name">
3375-<a class="link" href="RsvgHandle.html#rsvg-handle-get-desc" title="rsvg_handle_get_desc ()">rsvg_handle_get_desc</a> <span class="c_punctuation">()</span>
3376-</td>
3377-</tr>
3378-<tr>
3379-<td class="function_type">const <span class="returnvalue">char</span> *
3380-</td>
3381-<td class="function_name">
3382-<a class="link" href="RsvgHandle.html#rsvg-handle-get-metadata" title="rsvg_handle_get_metadata ()">rsvg_handle_get_metadata</a> <span class="c_punctuation">()</span>
3383-</td>
3384-</tr>
3385-<tr>
3386-<td class="function_type">
3387-<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
3388-</td>
3389-<td class="function_name">
3390-<a class="link" href="RsvgHandle.html#rsvg-handle-new-from-data" title="rsvg_handle_new_from_data ()">rsvg_handle_new_from_data</a> <span class="c_punctuation">()</span>
3391-</td>
3392-</tr>
3393-<tr>
3394-<td class="function_type">
3395-<a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
3396-</td>
3397-<td class="function_name">
3398-<a class="link" href="RsvgHandle.html#rsvg-handle-new-from-file" title="rsvg_handle_new_from_file ()">rsvg_handle_new_from_file</a> <span class="c_punctuation">()</span>
3399-</td>
3400-</tr>
3401-<tr>
3402-<td class="function_type">
3403-<a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
3404-</td>
3405-<td class="function_name">
3406-<a class="link" href="RsvgHandle.html#rsvg-error-get-type" title="rsvg_error_get_type ()">rsvg_error_get_type</a> <span class="c_punctuation">()</span>
3407-</td>
3408-</tr>
3409-<tr>
3410-<td class="define_keyword">#define</td>
3411-<td class="function_name"><a class="link" href="RsvgHandle.html#RSVG-TYPE-ERROR:CAPS" title="RSVG_TYPE_ERROR">RSVG_TYPE_ERROR</a></td>
3412-</tr>
3413-<tr>
3414-<td class="function_type">
3415-<span class="returnvalue">void</span>
3416-</td>
3417-<td class="function_name">
3418-<a class="link" href="RsvgHandle.html#rsvg-init" title="rsvg_init ()">rsvg_init</a> <span class="c_punctuation">()</span>
3419-</td>
3420-</tr>
3421-<tr>
3422-<td class="function_type">
3423-<span class="returnvalue">void</span>
3424-</td>
3425-<td class="function_name">
3426-<a class="link" href="RsvgHandle.html#rsvg-term" title="rsvg_term ()">rsvg_term</a> <span class="c_punctuation">()</span>
3427-</td>
3428-</tr>
3429-<tr>
3430-<td class="function_type">
3431-<span class="returnvalue">void</span>
3432-</td>
3433-<td class="function_name">
3434-<a class="link" href="RsvgHandle.html#rsvg-handle-free" title="rsvg_handle_free ()">rsvg_handle_free</a> <span class="c_punctuation">()</span>
3435-</td>
3436-</tr>
3437-<tr>
3438-<td class="function_type">
3439-<span class="returnvalue">void</span>
3440-</td>
3441-<td class="function_name">
3442-<a class="link" href="RsvgHandle.html#rsvg-handle-set-size-callback" title="rsvg_handle_set_size_callback ()">rsvg_handle_set_size_callback</a> <span class="c_punctuation">()</span>
3443-</td>
3444-</tr>
3445-</tbody>
3446-</table></div>
3447+<a name="RsvgHandle.object-hierarchy"></a><h2>Object Hierarchy</h2>
3448+<pre class="synopsis">
3449+ GEnum
3450+ +----RsvgError
3451+</pre>
3452+<pre class="synopsis">
3453+ <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
3454+ +----RsvgHandle
3455+</pre>
3456 </div>
3457 <div class="refsect1">
3458 <a name="RsvgHandle.properties"></a><h2>Properties</h2>
3459-<div class="informaltable"><table border="0">
3460-<colgroup>
3461-<col width="150px" class="properties_type">
3462-<col width="300px" class="properties_name">
3463-<col width="200px" class="properties_flags">
3464-</colgroup>
3465-<tbody>
3466-<tr>
3467-<td class="property_type">
3468-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
3469-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--base-uri" title="The “base-uri” property">base-uri</a></td>
3470-<td class="property_flags">Read / Write / Construct</td>
3471-</tr>
3472-<tr>
3473-<td class="property_type">
3474-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
3475-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--desc" title="The “desc” property">desc</a></td>
3476-<td class="property_flags">Read</td>
3477-</tr>
3478-<tr>
3479-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a></td>
3480-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--dpi-x" title="The “dpi-x” property">dpi-x</a></td>
3481-<td class="property_flags">Read / Write / Construct</td>
3482-</tr>
3483-<tr>
3484-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a></td>
3485-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--dpi-y" title="The “dpi-y” property">dpi-y</a></td>
3486-<td class="property_flags">Read / Write / Construct</td>
3487-</tr>
3488-<tr>
3489-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a></td>
3490-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--em" title="The “em” property">em</a></td>
3491-<td class="property_flags">Read</td>
3492-</tr>
3493-<tr>
3494-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a></td>
3495-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--ex" title="The “ex” property">ex</a></td>
3496-<td class="property_flags">Read</td>
3497-</tr>
3498-<tr>
3499-<td class="property_type"><a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags" title="enum RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a></td>
3500-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--flags" title="The “flags” property">flags</a></td>
3501-<td class="property_flags">Read / Write / Construct Only</td>
3502-</tr>
3503-<tr>
3504-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
3505-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--height" title="The “height” property">height</a></td>
3506-<td class="property_flags">Read</td>
3507-</tr>
3508-<tr>
3509-<td class="property_type">
3510-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
3511-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--metadata" title="The “metadata” property">metadata</a></td>
3512-<td class="property_flags">Read</td>
3513-</tr>
3514-<tr>
3515-<td class="property_type">
3516-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
3517-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--title" title="The “title” property">title</a></td>
3518-<td class="property_flags">Read</td>
3519-</tr>
3520-<tr>
3521-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
3522-<td class="property_name"><a class="link" href="RsvgHandle.html#RsvgHandle--width" title="The “width” property">width</a></td>
3523-<td class="property_flags">Read</td>
3524-</tr>
3525-</tbody>
3526-</table></div>
3527-</div>
3528-<div class="refsect1">
3529-<a name="RsvgHandle.other"></a><h2>Types and Values</h2>
3530-<div class="informaltable"><table width="100%" border="0">
3531-<colgroup>
3532-<col width="150px" class="name">
3533-<col class="description">
3534-</colgroup>
3535-<tbody>
3536-<tr>
3537-<td class="datatype_keyword">enum</td>
3538-<td class="function_name"><a class="link" href="RsvgHandle.html#RsvgError" title="enum RsvgError">RsvgError</a></td>
3539-</tr>
3540-<tr>
3541-<td class="datatype_keyword">struct</td>
3542-<td class="function_name"><a class="link" href="RsvgHandle.html#RsvgHandle-struct" title="struct RsvgHandle">RsvgHandle</a></td>
3543-</tr>
3544-<tr>
3545-<td class="typedef_keyword">typedef</td>
3546-<td class="function_name"><a class="link" href="RsvgHandle.html#RsvgHandlePrivate" title="RsvgHandlePrivate">RsvgHandlePrivate</a></td>
3547-</tr>
3548-<tr>
3549-<td class="datatype_keyword">struct</td>
3550-<td class="function_name"><a class="link" href="RsvgHandle.html#RsvgHandleClass" title="struct RsvgHandleClass">RsvgHandleClass</a></td>
3551-</tr>
3552-<tr>
3553-<td class="datatype_keyword">struct</td>
3554-<td class="function_name"><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData">RsvgDimensionData</a></td>
3555-</tr>
3556-<tr>
3557-<td class="datatype_keyword">struct</td>
3558-<td class="function_name"><a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData">RsvgPositionData</a></td>
3559-</tr>
3560-</tbody>
3561-</table></div>
3562-</div>
3563-<div class="refsect1">
3564-<a name="RsvgHandle.object-hierarchy"></a><h2>Object Hierarchy</h2>
3565-<pre class="screen"> <a href="https://developer.gnome.org/gobject/unstable/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
3566- <span class="lineart">╰──</span> RsvgError
3567- <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
3568- <span class="lineart">╰──</span> RsvgHandle
3569+<pre class="synopsis">
3570+ "<a class="link" href="RsvgHandle.html#RsvgHandle--base-uri" title='The "base-uri" property'>base-uri</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct
3571+ "<a class="link" href="RsvgHandle.html#RsvgHandle--desc" title='The "desc" property'>desc</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
3572+ "<a class="link" href="RsvgHandle.html#RsvgHandle--dpi-x" title='The "dpi-x" property'>dpi-x</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> : Read / Write / Construct
3573+ "<a class="link" href="RsvgHandle.html#RsvgHandle--dpi-y" title='The "dpi-y" property'>dpi-y</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> : Read / Write / Construct
3574+ "<a class="link" href="RsvgHandle.html#RsvgHandle--em" title='The "em" property'>em</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> : Read
3575+ "<a class="link" href="RsvgHandle.html#RsvgHandle--ex" title='The "ex" property'>ex</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> : Read
3576+ "<a class="link" href="RsvgHandle.html#RsvgHandle--flags" title='The "flags" property'>flags</a>" <a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a> : Read / Write / Construct Only
3577+ "<a class="link" href="RsvgHandle.html#RsvgHandle--height" title='The "height" property'>height</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> : Read
3578+ "<a class="link" href="RsvgHandle.html#RsvgHandle--metadata" title='The "metadata" property'>metadata</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
3579+ "<a class="link" href="RsvgHandle.html#RsvgHandle--title" title='The "title" property'>title</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
3580+ "<a class="link" href="RsvgHandle.html#RsvgHandle--width" title='The "width" property'>width</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> : Read
3581 </pre>
3582 </div>
3583 <div class="refsect1">
3584 <a name="RsvgHandle.description"></a><h2>Description</h2>
3585-<p>librsvg is a component used within software applications to enable
3586+<p>
3587+librsvg is a component used within software applications to enable
3588 support for SVG-format scalable graphics. In contrast to raster
3589 formats, scalable vector graphics provide users and artists a way
3590 to create, view, and provide imagery that is not limited to the
3591-pixel or dot density that an output device is capable of.</p>
3592-<p>Many software developers use the librsvg library to render
3593-SVG graphics. It is lightweight and portable.</p>
3594+pixel or dot density that an output device is capable of.
3595+</p>
3596+<p>
3597+Many software developers use the librsvg library to render
3598+SVG graphics. It is lightweight and portable.
3599+</p>
3600 </div>
3601 <div class="refsect1">
3602-<a name="RsvgHandle.functions_details"></a><h2>Functions</h2>
3603+<a name="RsvgHandle.details"></a><h2>Details</h2>
3604+<div class="refsect2">
3605+<a name="RsvgError-enum"></a><h3>enum RsvgError</h3>
3606+<pre class="programlisting">typedef enum {
3607+ RSVG_ERROR_FAILED
3608+} RsvgError;
3609+</pre>
3610+<p>
3611+An enumeration representing possible errors
3612+</p>
3613+<div class="variablelist"><table border="0" class="variablelist">
3614+<colgroup>
3615+<col align="left" valign="top">
3616+<col>
3617+</colgroup>
3618+<tbody><tr>
3619+<td><p><a name="RSVG-ERROR-FAILED:CAPS"></a><span class="term"><code class="literal">RSVG_ERROR_FAILED</code></span></p></td>
3620+<td>the request failed
3621+</td>
3622+</tr></tbody>
3623+</table></div>
3624+</div>
3625+<hr>
3626 <div class="refsect2">
3627 <a name="RSVG-ERROR:CAPS"></a><h3>RSVG_ERROR</h3>
3628 <pre class="programlisting">#define RSVG_ERROR</pre>
3629 </div>
3630 <hr>
3631 <div class="refsect2">
3632-<a name="rsvg-error-quark"></a><h3>rsvg_error_quark ()</h3>
3633-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>
3634-rsvg_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3635-<p>The error domain for RSVG</p>
3636-<div class="refsect3">
3637-<a name="id-1.2.3.8.3.5"></a><h4>Returns</h4>
3638-<p> The error domain</p>
3639-<p></p>
3640-</div>
3641-</div>
3642-<hr>
3643-<div class="refsect2">
3644-<a name="rsvg-cleanup"></a><h3>rsvg_cleanup ()</h3>
3645-<pre class="programlisting"><span class="returnvalue">void</span>
3646-rsvg_cleanup (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3647-<p>This function should not be called from normal programs.
3648-See <code class="function">xmlCleanupParser()</code> for more information.</p>
3649-<p class="since">Since 2.36</p>
3650-</div>
3651-<hr>
3652-<div class="refsect2">
3653-<a name="rsvg-set-default-dpi"></a><h3>rsvg_set_default_dpi ()</h3>
3654-<pre class="programlisting"><span class="returnvalue">void</span>
3655-rsvg_set_default_dpi (<em class="parameter"><code><span class="type">double</span> dpi</code></em>);</pre>
3656-<p>Sets the DPI for the all future outgoing pixbufs. Common values are
3657-75, 90, and 300 DPI. Passing a number &lt;= 0 to <em class="parameter"><code>dpi</code></em>
3658- will
3659-reset the DPI to whatever the default value happens to be.</p>
3660-<div class="refsect3">
3661-<a name="id-1.2.3.8.5.5"></a><h4>Parameters</h4>
3662-<div class="informaltable"><table width="100%" border="0">
3663-<colgroup>
3664-<col width="150px" class="parameters_name">
3665-<col class="parameters_description">
3666-<col width="200px" class="parameters_annotations">
3667-</colgroup>
3668-<tbody><tr>
3669-<td class="parameter_name"><p>dpi</p></td>
3670-<td class="parameter_description"><p>Dots Per Inch (aka Pixels Per Inch)</p></td>
3671-<td class="parameter_annotations"> </td>
3672-</tr></tbody>
3673-</table></div>
3674-</div>
3675-<p class="since">Since 2.8</p>
3676-</div>
3677-<hr>
3678-<div class="refsect2">
3679-<a name="rsvg-set-default-dpi-x-y"></a><h3>rsvg_set_default_dpi_x_y ()</h3>
3680-<pre class="programlisting"><span class="returnvalue">void</span>
3681-rsvg_set_default_dpi_x_y (<em class="parameter"><code><span class="type">double</span> dpi_x</code></em>,
3682- <em class="parameter"><code><span class="type">double</span> dpi_y</code></em>);</pre>
3683-<p>Sets the DPI for the all future outgoing pixbufs. Common values are
3684-75, 90, and 300 DPI. Passing a number &lt;= 0 to <em class="parameter"><code>dpi</code></em>
3685- will
3686-reset the DPI to whatever the default value happens to be.</p>
3687-<div class="refsect3">
3688-<a name="id-1.2.3.8.6.5"></a><h4>Parameters</h4>
3689-<div class="informaltable"><table width="100%" border="0">
3690-<colgroup>
3691-<col width="150px" class="parameters_name">
3692-<col class="parameters_description">
3693-<col width="200px" class="parameters_annotations">
3694-</colgroup>
3695-<tbody>
3696-<tr>
3697-<td class="parameter_name"><p>dpi_x</p></td>
3698-<td class="parameter_description"><p>Dots Per Inch (aka Pixels Per Inch)</p></td>
3699-<td class="parameter_annotations"> </td>
3700-</tr>
3701-<tr>
3702-<td class="parameter_name"><p>dpi_y</p></td>
3703-<td class="parameter_description"><p>Dots Per Inch (aka Pixels Per Inch)</p></td>
3704-<td class="parameter_annotations"> </td>
3705-</tr>
3706-</tbody>
3707-</table></div>
3708-</div>
3709-<p class="since">Since 2.8</p>
3710-</div>
3711-<hr>
3712-<div class="refsect2">
3713-<a name="rsvg-handle-set-dpi"></a><h3>rsvg_handle_set_dpi ()</h3>
3714-<pre class="programlisting"><span class="returnvalue">void</span>
3715-rsvg_handle_set_dpi (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3716- <em class="parameter"><code><span class="type">double</span> dpi</code></em>);</pre>
3717-<p>Sets the DPI for the outgoing pixbuf. Common values are
3718-75, 90, and 300 DPI. Passing a number &lt;= 0 to <em class="parameter"><code>dpi</code></em>
3719- will
3720-reset the DPI to whatever the default value happens to be.</p>
3721-<div class="refsect3">
3722-<a name="id-1.2.3.8.7.5"></a><h4>Parameters</h4>
3723-<div class="informaltable"><table width="100%" border="0">
3724-<colgroup>
3725-<col width="150px" class="parameters_name">
3726-<col class="parameters_description">
3727-<col width="200px" class="parameters_annotations">
3728-</colgroup>
3729-<tbody>
3730-<tr>
3731-<td class="parameter_name"><p>handle</p></td>
3732-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
3733-<td class="parameter_annotations"> </td>
3734-</tr>
3735-<tr>
3736-<td class="parameter_name"><p>dpi</p></td>
3737-<td class="parameter_description"><p>Dots Per Inch (aka Pixels Per Inch)</p></td>
3738-<td class="parameter_annotations"> </td>
3739-</tr>
3740-</tbody>
3741-</table></div>
3742-</div>
3743-<p class="since">Since 2.8</p>
3744-</div>
3745-<hr>
3746-<div class="refsect2">
3747-<a name="rsvg-handle-set-dpi-x-y"></a><h3>rsvg_handle_set_dpi_x_y ()</h3>
3748-<pre class="programlisting"><span class="returnvalue">void</span>
3749-rsvg_handle_set_dpi_x_y (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3750- <em class="parameter"><code><span class="type">double</span> dpi_x</code></em>,
3751- <em class="parameter"><code><span class="type">double</span> dpi_y</code></em>);</pre>
3752-<p>Sets the DPI for the outgoing pixbuf. Common values are
3753-75, 90, and 300 DPI. Passing a number &lt;= 0 to <span class="type">dpi_x</span> or <em class="parameter"><code>dpi_y</code></em>
3754- will
3755-reset the DPI to whatever the default value happens to be.</p>
3756-<div class="refsect3">
3757-<a name="id-1.2.3.8.8.5"></a><h4>Parameters</h4>
3758-<div class="informaltable"><table width="100%" border="0">
3759-<colgroup>
3760-<col width="150px" class="parameters_name">
3761-<col class="parameters_description">
3762-<col width="200px" class="parameters_annotations">
3763-</colgroup>
3764-<tbody>
3765-<tr>
3766-<td class="parameter_name"><p>handle</p></td>
3767-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
3768-<td class="parameter_annotations"> </td>
3769-</tr>
3770-<tr>
3771-<td class="parameter_name"><p>dpi_x</p></td>
3772-<td class="parameter_description"><p>Dots Per Inch (aka Pixels Per Inch)</p></td>
3773-<td class="parameter_annotations"> </td>
3774-</tr>
3775-<tr>
3776-<td class="parameter_name"><p>dpi_y</p></td>
3777-<td class="parameter_description"><p>Dots Per Inch (aka Pixels Per Inch)</p></td>
3778-<td class="parameter_annotations"> </td>
3779-</tr>
3780-</tbody>
3781-</table></div>
3782-</div>
3783-<p class="since">Since 2.8</p>
3784-</div>
3785-<hr>
3786-<div class="refsect2">
3787-<a name="rsvg-handle-new"></a><h3>rsvg_handle_new ()</h3>
3788-<pre class="programlisting"><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
3789-rsvg_handle_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
3790-<p>Returns a new rsvg handle. Must be freed with <em class="parameter"><code>g_object_unref</code></em>
3791-. This
3792-handle can be used for dynamically loading an image. You need to feed it
3793-data using <em class="parameter"><code>rsvg_handle_write</code></em>
3794-, then call <em class="parameter"><code>rsvg_handle_close</code></em>
3795- when done.
3796-Afterwords, you can render it using Cairo or get a GdkPixbuf from it. When
3797-finished, free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>. No more than one image can be loaded
3798-with one handle.</p>
3799-<div class="refsect3">
3800-<a name="id-1.2.3.8.9.5"></a><h4>Returns</h4>
3801-<p> A new <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p>
3802-<p></p>
3803-</div>
3804-</div>
3805-<hr>
3806-<div class="refsect2">
3807-<a name="rsvg-handle-new-with-flags"></a><h3>rsvg_handle_new_with_flags ()</h3>
3808-<pre class="programlisting"><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
3809-rsvg_handle_new_with_flags (<em class="parameter"><code><a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags" title="enum RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a> flags</code></em>);</pre>
3810-<p>Creates a new <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> with flags <em class="parameter"><code>flags</code></em>
3811-.</p>
3812-<div class="refsect3">
3813-<a name="id-1.2.3.8.10.5"></a><h4>Parameters</h4>
3814-<div class="informaltable"><table width="100%" border="0">
3815-<colgroup>
3816-<col width="150px" class="parameters_name">
3817-<col class="parameters_description">
3818-<col width="200px" class="parameters_annotations">
3819-</colgroup>
3820-<tbody><tr>
3821-<td class="parameter_name"><p>flags</p></td>
3822-<td class="parameter_description"><p>flags from <a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags" title="enum RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a></p></td>
3823-<td class="parameter_annotations"> </td>
3824-</tr></tbody>
3825-</table></div>
3826-</div>
3827-<div class="refsect3">
3828-<a name="id-1.2.3.8.10.6"></a><h4>Returns</h4>
3829-<p> a new <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>. </p>
3830-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
3831-</div>
3832-<p class="since">Since 2.36</p>
3833-</div>
3834-<hr>
3835-<div class="refsect2">
3836-<a name="rsvg-handle-write"></a><h3>rsvg_handle_write ()</h3>
3837-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3838-rsvg_handle_write (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3839- <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a> *buf</code></em>,
3840- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> count</code></em>,
3841- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
3842-<p>Loads the next <em class="parameter"><code>count</code></em>
3843- bytes of the image. This will return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the data
3844-was loaded successful, and <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an error occurred. In the latter case,
3845-the loader will be closed, and will not accept further writes. If <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is
3846-returned, <em class="parameter"><code>error</code></em>
3847- will be set to an error from the <a class="link" href="RsvgHandle.html#RsvgError" title="enum RsvgError"><span class="type">RsvgError</span></a> domain. Errors
3848-from <a href="https://developer.gnome.org/gio/unstable/gio-GIOError.html#GIOErrorEnum"><span class="type">GIOErrorEnum</span></a> are also possible.</p>
3849-<div class="refsect3">
3850-<a name="id-1.2.3.8.11.5"></a><h4>Parameters</h4>
3851-<div class="informaltable"><table width="100%" border="0">
3852-<colgroup>
3853-<col width="150px" class="parameters_name">
3854-<col class="parameters_description">
3855-<col width="200px" class="parameters_annotations">
3856-</colgroup>
3857-<tbody>
3858-<tr>
3859-<td class="parameter_name"><p>handle</p></td>
3860-<td class="parameter_description"><p>an <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
3861-<td class="parameter_annotations"> </td>
3862-</tr>
3863-<tr>
3864-<td class="parameter_name"><p>buf</p></td>
3865-<td class="parameter_description"><p> pointer to svg data. </p></td>
3866-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint8]</span></td>
3867-</tr>
3868-<tr>
3869-<td class="parameter_name"><p>count</p></td>
3870-<td class="parameter_description"><p>length of the <em class="parameter"><code>buf</code></em>
3871-buffer in bytes</p></td>
3872-<td class="parameter_annotations"> </td>
3873-</tr>
3874-<tr>
3875-<td class="parameter_name"><p>error</p></td>
3876-<td class="parameter_description"><p> a location to store a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
3877-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
3878-</tr>
3879-</tbody>
3880-</table></div>
3881-</div>
3882-<div class="refsect3">
3883-<a name="id-1.2.3.8.11.6"></a><h4>Returns</h4>
3884-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on error</p>
3885-<p></p>
3886-</div>
3887-</div>
3888-<hr>
3889-<div class="refsect2">
3890-<a name="rsvg-handle-close"></a><h3>rsvg_handle_close ()</h3>
3891-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
3892-rsvg_handle_close (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3893- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
3894-<p>Closes <em class="parameter"><code>handle</code></em>
3895-, to indicate that loading the image is complete. This will
3896-return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the loader closed successfully. Note that <em class="parameter"><code>handle</code></em>
3897- isn't
3898-freed until <em class="parameter"><code>g_object_unref</code></em>
3899- is called.</p>
3900-<div class="refsect3">
3901-<a name="id-1.2.3.8.12.5"></a><h4>Parameters</h4>
3902-<div class="informaltable"><table width="100%" border="0">
3903-<colgroup>
3904-<col width="150px" class="parameters_name">
3905-<col class="parameters_description">
3906-<col width="200px" class="parameters_annotations">
3907-</colgroup>
3908-<tbody>
3909-<tr>
3910-<td class="parameter_name"><p>handle</p></td>
3911-<td class="parameter_description"><p>a <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
3912-<td class="parameter_annotations"> </td>
3913-</tr>
3914-<tr>
3915-<td class="parameter_name"><p>error</p></td>
3916-<td class="parameter_description"><p> a location to store a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
3917-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
3918-</tr>
3919-</tbody>
3920-</table></div>
3921-</div>
3922-<div class="refsect3">
3923-<a name="id-1.2.3.8.12.6"></a><h4>Returns</h4>
3924-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on error</p>
3925-<p></p>
3926-</div>
3927-</div>
3928-<hr>
3929-<div class="refsect2">
3930-<a name="rsvg-handle-get-base-uri"></a><h3>rsvg_handle_get_base_uri ()</h3>
3931-<pre class="programlisting">const <span class="returnvalue">char</span> *
3932-rsvg_handle_get_base_uri (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);</pre>
3933-<p>Gets the base uri for this <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>.</p>
3934-<div class="refsect3">
3935-<a name="id-1.2.3.8.13.5"></a><h4>Parameters</h4>
3936-<div class="informaltable"><table width="100%" border="0">
3937-<colgroup>
3938-<col width="150px" class="parameters_name">
3939-<col class="parameters_description">
3940-<col width="200px" class="parameters_annotations">
3941-</colgroup>
3942-<tbody><tr>
3943-<td class="parameter_name"><p>handle</p></td>
3944-<td class="parameter_description"><p>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
3945-<td class="parameter_annotations"> </td>
3946-</tr></tbody>
3947-</table></div>
3948-</div>
3949-<div class="refsect3">
3950-<a name="id-1.2.3.8.13.6"></a><h4>Returns</h4>
3951-<p> the base uri, possibly null</p>
3952-<p></p>
3953-</div>
3954-<p class="since">Since 2.8</p>
3955-</div>
3956-<hr>
3957-<div class="refsect2">
3958-<a name="rsvg-handle-set-base-uri"></a><h3>rsvg_handle_set_base_uri ()</h3>
3959-<pre class="programlisting"><span class="returnvalue">void</span>
3960-rsvg_handle_set_base_uri (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3961- <em class="parameter"><code>const <span class="type">char</span> *base_uri</code></em>);</pre>
3962-<p>Set the base URI for this SVG. This can only be called before <a class="link" href="RsvgHandle.html#rsvg-handle-write" title="rsvg_handle_write ()"><code class="function">rsvg_handle_write()</code></a>
3963-has been called.</p>
3964-<div class="refsect3">
3965-<a name="id-1.2.3.8.14.5"></a><h4>Parameters</h4>
3966-<div class="informaltable"><table width="100%" border="0">
3967-<colgroup>
3968-<col width="150px" class="parameters_name">
3969-<col class="parameters_description">
3970-<col width="200px" class="parameters_annotations">
3971-</colgroup>
3972-<tbody>
3973-<tr>
3974-<td class="parameter_name"><p>handle</p></td>
3975-<td class="parameter_description"><p>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
3976-<td class="parameter_annotations"> </td>
3977-</tr>
3978-<tr>
3979-<td class="parameter_name"><p>base_uri</p></td>
3980-<td class="parameter_description"><p>The base uri</p></td>
3981-<td class="parameter_annotations"> </td>
3982-</tr>
3983-</tbody>
3984-</table></div>
3985-</div>
3986-<p class="since">Since 2.9</p>
3987-</div>
3988-<hr>
3989-<div class="refsect2">
3990-<a name="rsvg-handle-get-dimensions"></a><h3>rsvg_handle_get_dimensions ()</h3>
3991-<pre class="programlisting"><span class="returnvalue">void</span>
3992-rsvg_handle_get_dimensions (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
3993- <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>);</pre>
3994-<p>Get the SVG's size. Do not call from within the size_func callback, because an infinite loop will occur.</p>
3995-<div class="refsect3">
3996-<a name="id-1.2.3.8.15.5"></a><h4>Parameters</h4>
3997-<div class="informaltable"><table width="100%" border="0">
3998-<colgroup>
3999-<col width="150px" class="parameters_name">
4000-<col class="parameters_description">
4001-<col width="200px" class="parameters_annotations">
4002-</colgroup>
4003-<tbody>
4004-<tr>
4005-<td class="parameter_name"><p>handle</p></td>
4006-<td class="parameter_description"><p>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4007-<td class="parameter_annotations"> </td>
4008-</tr>
4009-<tr>
4010-<td class="parameter_name"><p>dimension_data</p></td>
4011-<td class="parameter_description"><p> A place to store the SVG's size. </p></td>
4012-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
4013-</tr>
4014-</tbody>
4015-</table></div>
4016-</div>
4017-<p class="since">Since 2.14</p>
4018-</div>
4019-<hr>
4020-<div class="refsect2">
4021-<a name="rsvg-handle-get-dimensions-sub"></a><h3>rsvg_handle_get_dimensions_sub ()</h3>
4022-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
4023-rsvg_handle_get_dimensions_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4024- <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>,
4025- <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre>
4026-<p>Get the size of a subelement of the SVG file. Do not call from within the size_func callback, because an infinite loop will occur.</p>
4027-<div class="refsect3">
4028-<a name="id-1.2.3.8.16.5"></a><h4>Parameters</h4>
4029-<div class="informaltable"><table width="100%" border="0">
4030-<colgroup>
4031-<col width="150px" class="parameters_name">
4032-<col class="parameters_description">
4033-<col width="200px" class="parameters_annotations">
4034-</colgroup>
4035-<tbody>
4036-<tr>
4037-<td class="parameter_name"><p>handle</p></td>
4038-<td class="parameter_description"><p>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4039-<td class="parameter_annotations"> </td>
4040-</tr>
4041-<tr>
4042-<td class="parameter_name"><p>dimension_data</p></td>
4043-<td class="parameter_description"><p> A place to store the SVG's size. </p></td>
4044-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
4045-</tr>
4046-<tr>
4047-<td class="parameter_name"><p>id</p></td>
4048-<td class="parameter_description"><p> An element's id within the SVG, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to get
4049-the dimension of the whole SVG. For example, if you have a layer
4050-called "layer1" for that you want to get the dimension, pass
4051-"<span class="type">layer1</span>" as the id. </p></td>
4052-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td>
4053-</tr>
4054-</tbody>
4055-</table></div>
4056-</div>
4057-<p class="since">Since 2.22</p>
4058-</div>
4059-<hr>
4060-<div class="refsect2">
4061-<a name="rsvg-handle-get-position-sub"></a><h3>rsvg_handle_get_position_sub ()</h3>
4062-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
4063-rsvg_handle_get_position_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4064- <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>,
4065- <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre>
4066-<p>Get the position of a subelement of the SVG file. Do not call from within
4067-the size_func callback, because an infinite loop will occur.</p>
4068-<div class="refsect3">
4069-<a name="id-1.2.3.8.17.5"></a><h4>Parameters</h4>
4070-<div class="informaltable"><table width="100%" border="0">
4071-<colgroup>
4072-<col width="150px" class="parameters_name">
4073-<col class="parameters_description">
4074-<col width="200px" class="parameters_annotations">
4075-</colgroup>
4076-<tbody>
4077-<tr>
4078-<td class="parameter_name"><p>handle</p></td>
4079-<td class="parameter_description"><p>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4080-<td class="parameter_annotations"> </td>
4081-</tr>
4082-<tr>
4083-<td class="parameter_name"><p>position_data</p></td>
4084-<td class="parameter_description"><p> A place to store the SVG fragment's position. </p></td>
4085-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
4086-</tr>
4087-<tr>
4088-<td class="parameter_name"><p>id</p></td>
4089-<td class="parameter_description"><p>An element's id within the SVG.
4090-For example, if you have a layer called "layer1" for that you want to get
4091-the position, pass "#<span class="type">layer1</span>" as the id.</p></td>
4092-<td class="parameter_annotations"> </td>
4093-</tr>
4094-</tbody>
4095-</table></div>
4096-</div>
4097-<p class="since">Since 2.22</p>
4098-</div>
4099-<hr>
4100-<div class="refsect2">
4101-<a name="rsvg-handle-has-sub"></a><h3>rsvg_handle_has_sub ()</h3>
4102-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
4103-rsvg_handle_has_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4104- <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre>
4105-<p>Checks whether the element <em class="parameter"><code>id</code></em>
4106- exists in the SVG document.</p>
4107-<div class="refsect3">
4108-<a name="id-1.2.3.8.18.5"></a><h4>Parameters</h4>
4109-<div class="informaltable"><table width="100%" border="0">
4110-<colgroup>
4111-<col width="150px" class="parameters_name">
4112-<col class="parameters_description">
4113-<col width="200px" class="parameters_annotations">
4114-</colgroup>
4115-<tbody>
4116-<tr>
4117-<td class="parameter_name"><p>handle</p></td>
4118-<td class="parameter_description"><p>a <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4119-<td class="parameter_annotations"> </td>
4120-</tr>
4121-<tr>
4122-<td class="parameter_name"><p>id</p></td>
4123-<td class="parameter_description"><p>an element's id within the SVG</p></td>
4124-<td class="parameter_annotations"> </td>
4125-</tr>
4126-</tbody>
4127-</table></div>
4128-</div>
4129-<div class="refsect3">
4130-<a name="id-1.2.3.8.18.6"></a><h4>Returns</h4>
4131-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>id</code></em>
4132-exists in the SVG document</p>
4133-<p></p>
4134-</div>
4135-<p class="since">Since 2.22</p>
4136-</div>
4137-<hr>
4138-<div class="refsect2">
4139-<a name="rsvg-handle-get-title"></a><h3>rsvg_handle_get_title ()</h3>
4140-<pre class="programlisting">const <span class="returnvalue">char</span> *
4141-rsvg_handle_get_title (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);</pre>
4142-<div class="warning"><p><code class="literal">rsvg_handle_get_title</code> has been deprecated since version 2.36 and should not be used in newly-written code.</p></div>
4143-<p>Returns the SVG's title in UTF-8 or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. You must make a copy
4144-of this title if you wish to use it after <em class="parameter"><code>handle</code></em>
4145- has been freed.</p>
4146-<div class="refsect3">
4147-<a name="id-1.2.3.8.19.7"></a><h4>Parameters</h4>
4148-<div class="informaltable"><table width="100%" border="0">
4149-<colgroup>
4150-<col width="150px" class="parameters_name">
4151-<col class="parameters_description">
4152-<col width="200px" class="parameters_annotations">
4153-</colgroup>
4154-<tbody><tr>
4155-<td class="parameter_name"><p>handle</p></td>
4156-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4157-<td class="parameter_annotations"> </td>
4158-</tr></tbody>
4159-</table></div>
4160-</div>
4161-<div class="refsect3">
4162-<a name="id-1.2.3.8.19.8"></a><h4>Returns</h4>
4163-<p> The SVG's title. </p>
4164-<p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p>
4165-</div>
4166-<p class="since">Since 2.4</p>
4167-</div>
4168-<hr>
4169-<div class="refsect2">
4170-<a name="rsvg-handle-get-desc"></a><h3>rsvg_handle_get_desc ()</h3>
4171-<pre class="programlisting">const <span class="returnvalue">char</span> *
4172-rsvg_handle_get_desc (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);</pre>
4173-<div class="warning"><p><code class="literal">rsvg_handle_get_desc</code> has been deprecated since version 2.36 and should not be used in newly-written code.</p></div>
4174-<p>Returns the SVG's description in UTF-8 or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. You must make a copy
4175-of this description if you wish to use it after <em class="parameter"><code>handle</code></em>
4176- has been freed.</p>
4177-<div class="refsect3">
4178-<a name="id-1.2.3.8.20.7"></a><h4>Parameters</h4>
4179-<div class="informaltable"><table width="100%" border="0">
4180-<colgroup>
4181-<col width="150px" class="parameters_name">
4182-<col class="parameters_description">
4183-<col width="200px" class="parameters_annotations">
4184-</colgroup>
4185-<tbody><tr>
4186-<td class="parameter_name"><p>handle</p></td>
4187-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4188-<td class="parameter_annotations"> </td>
4189-</tr></tbody>
4190-</table></div>
4191-</div>
4192-<div class="refsect3">
4193-<a name="id-1.2.3.8.20.8"></a><h4>Returns</h4>
4194-<p> The SVG's description. </p>
4195-<p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p>
4196-</div>
4197-<p class="since">Since 2.4</p>
4198-</div>
4199-<hr>
4200-<div class="refsect2">
4201-<a name="rsvg-handle-get-metadata"></a><h3>rsvg_handle_get_metadata ()</h3>
4202-<pre class="programlisting">const <span class="returnvalue">char</span> *
4203-rsvg_handle_get_metadata (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);</pre>
4204-<div class="warning"><p><code class="literal">rsvg_handle_get_metadata</code> has been deprecated since version 2.36 and should not be used in newly-written code.</p></div>
4205-<p>Returns the SVG's metadata in UTF-8 or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. You must make a copy
4206-of this metadata if you wish to use it after <em class="parameter"><code>handle</code></em>
4207- has been freed.</p>
4208-<div class="refsect3">
4209-<a name="id-1.2.3.8.21.7"></a><h4>Parameters</h4>
4210-<div class="informaltable"><table width="100%" border="0">
4211-<colgroup>
4212-<col width="150px" class="parameters_name">
4213-<col class="parameters_description">
4214-<col width="200px" class="parameters_annotations">
4215-</colgroup>
4216-<tbody><tr>
4217-<td class="parameter_name"><p>handle</p></td>
4218-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4219-<td class="parameter_annotations"> </td>
4220-</tr></tbody>
4221-</table></div>
4222-</div>
4223-<div class="refsect3">
4224-<a name="id-1.2.3.8.21.8"></a><h4>Returns</h4>
4225-<p> The SVG's title. </p>
4226-<p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p>
4227-</div>
4228-<p class="since">Since 2.9</p>
4229-</div>
4230-<hr>
4231-<div class="refsect2">
4232-<a name="rsvg-handle-new-from-data"></a><h3>rsvg_handle_new_from_data ()</h3>
4233-<pre class="programlisting"><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
4234-rsvg_handle_new_from_data (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *data</code></em>,
4235- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> data_len</code></em>,
4236- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
4237-<p>Loads the SVG specified by <em class="parameter"><code>data</code></em>
4238-.</p>
4239-<div class="refsect3">
4240-<a name="id-1.2.3.8.22.5"></a><h4>Parameters</h4>
4241-<div class="informaltable"><table width="100%" border="0">
4242-<colgroup>
4243-<col width="150px" class="parameters_name">
4244-<col class="parameters_description">
4245-<col width="200px" class="parameters_annotations">
4246-</colgroup>
4247-<tbody>
4248-<tr>
4249-<td class="parameter_name"><p>data</p></td>
4250-<td class="parameter_description"><p> The SVG data. </p></td>
4251-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=data_len]</span></td>
4252-</tr>
4253-<tr>
4254-<td class="parameter_name"><p>data_len</p></td>
4255-<td class="parameter_description"><p>The length of <em class="parameter"><code>data</code></em>
4256-, in bytes</p></td>
4257-<td class="parameter_annotations"> </td>
4258-</tr>
4259-<tr>
4260-<td class="parameter_name"><p>error</p></td>
4261-<td class="parameter_description"><p>return location for errors</p></td>
4262-<td class="parameter_annotations"> </td>
4263-</tr>
4264-</tbody>
4265-</table></div>
4266-</div>
4267-<div class="refsect3">
4268-<a name="id-1.2.3.8.22.6"></a><h4>Returns</h4>
4269-<p> A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if an error occurs.</p>
4270-<p></p>
4271-</div>
4272-<p class="since">Since 2.14</p>
4273-</div>
4274-<hr>
4275-<div class="refsect2">
4276-<a name="rsvg-handle-new-from-file"></a><h3>rsvg_handle_new_from_file ()</h3>
4277-<pre class="programlisting"><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> *
4278-rsvg_handle_new_from_file (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *file_name</code></em>,
4279- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
4280-<p>Loads the SVG specified by <em class="parameter"><code>file_name</code></em>
4281-.</p>
4282-<div class="refsect3">
4283-<a name="id-1.2.3.8.23.5"></a><h4>Parameters</h4>
4284-<div class="informaltable"><table width="100%" border="0">
4285-<colgroup>
4286-<col width="150px" class="parameters_name">
4287-<col class="parameters_description">
4288-<col width="200px" class="parameters_annotations">
4289-</colgroup>
4290-<tbody>
4291-<tr>
4292-<td class="parameter_name"><p>file_name</p></td>
4293-<td class="parameter_description"><p>The file name to load. If built with gnome-vfs, can be a URI.</p></td>
4294-<td class="parameter_annotations"> </td>
4295-</tr>
4296-<tr>
4297-<td class="parameter_name"><p>error</p></td>
4298-<td class="parameter_description"><p>return location for errors</p></td>
4299-<td class="parameter_annotations"> </td>
4300-</tr>
4301-</tbody>
4302-</table></div>
4303-</div>
4304-<div class="refsect3">
4305-<a name="id-1.2.3.8.23.6"></a><h4>Returns</h4>
4306-<p> A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if an error occurs.</p>
4307-<p></p>
4308-</div>
4309-<p class="since">Since 2.14</p>
4310-</div>
4311-<hr>
4312-<div class="refsect2">
4313-<a name="rsvg-error-get-type"></a><h3>rsvg_error_get_type ()</h3>
4314-<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
4315-rsvg_error_get_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
4316-</div>
4317-<hr>
4318-<div class="refsect2">
4319-<a name="RSVG-TYPE-ERROR:CAPS"></a><h3>RSVG_TYPE_ERROR</h3>
4320-<pre class="programlisting">#define RSVG_TYPE_ERROR</pre>
4321-</div>
4322-<hr>
4323-<div class="refsect2">
4324-<a name="rsvg-init"></a><h3>rsvg_init ()</h3>
4325-<pre class="programlisting"><span class="returnvalue">void</span>
4326-rsvg_init (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
4327-<div class="warning">
4328-<p><code class="literal">rsvg_init</code> has been deprecated since version 2.36 and should not be used in newly-written code.</p>
4329-<p>Use <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init"><code class="function">g_type_init()</code></a></p>
4330-</div>
4331-<p>Initializes librsvg</p>
4332-<p class="since">Since 2.9</p>
4333-</div>
4334-<hr>
4335-<div class="refsect2">
4336-<a name="rsvg-term"></a><h3>rsvg_term ()</h3>
4337-<pre class="programlisting"><span class="returnvalue">void</span>
4338-rsvg_term (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
4339-<div class="warning"><p><code class="literal">rsvg_term</code> has been deprecated since version 2.36 and should not be used in newly-written code.</p></div>
4340-<p>This function does nothing.</p>
4341-<p class="since">Since 2.9</p>
4342-</div>
4343-<hr>
4344-<div class="refsect2">
4345-<a name="rsvg-handle-free"></a><h3>rsvg_handle_free ()</h3>
4346-<pre class="programlisting"><span class="returnvalue">void</span>
4347-rsvg_handle_free (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);</pre>
4348-<div class="warning">
4349-<p><code class="literal">rsvg_handle_free</code> is deprecated and should not be used in newly-written code.</p>
4350-<p>Use <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a> instead.</p>
4351-</div>
4352-<p>Frees <em class="parameter"><code>handle</code></em>
4353-.</p>
4354-<div class="refsect3">
4355-<a name="id-1.2.3.8.28.6"></a><h4>Parameters</h4>
4356-<div class="informaltable"><table width="100%" border="0">
4357-<colgroup>
4358-<col width="150px" class="parameters_name">
4359-<col class="parameters_description">
4360-<col width="200px" class="parameters_annotations">
4361-</colgroup>
4362-<tbody><tr>
4363-<td class="parameter_name"><p>handle</p></td>
4364-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4365-<td class="parameter_annotations"> </td>
4366-</tr></tbody>
4367-</table></div>
4368-</div>
4369-</div>
4370-<hr>
4371-<div class="refsect2">
4372-<a name="rsvg-handle-set-size-callback"></a><h3>rsvg_handle_set_size_callback ()</h3>
4373-<pre class="programlisting"><span class="returnvalue">void</span>
4374-rsvg_handle_set_size_callback (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4375- <em class="parameter"><code><span class="type">RsvgSizeFunc</span> size_func</code></em>,
4376- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>,
4377- <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> user_data_destroy</code></em>);</pre>
4378-<div class="warning">
4379-<p><code class="literal">rsvg_handle_set_size_callback</code> is deprecated and should not be used in newly-written code.</p>
4380-<p>Set up a cairo matrix and use <a class="link" href="rsvg-Using-RSVG-with-cairo.html#rsvg-handle-render-cairo" title="rsvg_handle_render_cairo ()"><code class="function">rsvg_handle_render_cairo()</code></a> instead.</p>
4381-</div>
4382-<p>Sets the sizing function for the <em class="parameter"><code>handle</code></em>
4383-. This function is called right
4384-after the size of the image has been loaded. The size of the image is passed
4385-in to the function, which may then modify these values to set the real size
4386-of the generated pixbuf. If the image has no associated size, then the size
4387-arguments are set to -1.</p>
4388-<div class="refsect3">
4389-<a name="id-1.2.3.8.29.6"></a><h4>Parameters</h4>
4390-<div class="informaltable"><table width="100%" border="0">
4391-<colgroup>
4392-<col width="150px" class="parameters_name">
4393-<col class="parameters_description">
4394-<col width="200px" class="parameters_annotations">
4395-</colgroup>
4396-<tbody>
4397-<tr>
4398-<td class="parameter_name"><p>handle</p></td>
4399-<td class="parameter_description"><p>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p></td>
4400-<td class="parameter_annotations"> </td>
4401-</tr>
4402-<tr>
4403-<td class="parameter_name"><p>size_func</p></td>
4404-<td class="parameter_description"><p> A sizing function, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
4405-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td>
4406-</tr>
4407-<tr>
4408-<td class="parameter_name"><p>user_data</p></td>
4409-<td class="parameter_description"><p>User data to pass to <em class="parameter"><code>size_func</code></em>
4410-, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
4411-<td class="parameter_annotations"> </td>
4412-</tr>
4413-<tr>
4414-<td class="parameter_name"><p>user_data_destroy</p></td>
4415-<td class="parameter_description"><p>Destroy function for <em class="parameter"><code>user_data</code></em>
4416-, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
4417-<td class="parameter_annotations"> </td>
4418-</tr>
4419-</tbody>
4420-</table></div>
4421-</div>
4422-</div>
4423-</div>
4424-<div class="refsect1">
4425-<a name="RsvgHandle.other_details"></a><h2>Types and Values</h2>
4426-<div class="refsect2">
4427-<a name="RsvgError"></a><h3>enum RsvgError</h3>
4428-<p>An enumeration representing possible errors</p>
4429-<div class="refsect3">
4430-<a name="id-1.2.3.9.2.4"></a><h4>Members</h4>
4431-<div class="informaltable"><table width="100%" border="0">
4432-<colgroup>
4433-<col width="300px" class="enum_members_name">
4434-<col class="enum_members_description">
4435-<col width="200px" class="enum_members_annotations">
4436-</colgroup>
4437-<tbody><tr>
4438-<td class="enum_member_name"><p><a name="RSVG-ERROR-FAILED:CAPS"></a>RSVG_ERROR_FAILED</p></td>
4439-<td class="enum_member_description">
4440-<p>the request failed</p>
4441-</td>
4442-<td class="enum_member_annotations"> </td>
4443-</tr></tbody>
4444-</table></div>
4445-</div>
4446-</div>
4447-<hr>
4448-<div class="refsect2">
4449-<a name="RsvgHandle-struct"></a><h3>struct RsvgHandle</h3>
4450-<pre class="programlisting">struct RsvgHandle;</pre>
4451-<p>The <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> is an object representing the parsed form of a SVG</p>
4452+<a name="rsvg-error-quark"></a><h3>rsvg_error_quark ()</h3>
4453+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> rsvg_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
4454+<p>
4455+The error domain for RSVG
4456+</p>
4457+<div class="variablelist"><table border="0" class="variablelist">
4458+<colgroup>
4459+<col align="left" valign="top">
4460+<col>
4461+</colgroup>
4462+<tbody><tr>
4463+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
4464+<td>The error domain</td>
4465+</tr></tbody>
4466+</table></div>
4467+</div>
4468+<hr>
4469+<div class="refsect2">
4470+<a name="RsvgHandle-struct"></a><h3>RsvgHandle</h3>
4471+<pre class="programlisting">typedef struct _RsvgHandle RsvgHandle;</pre>
4472+<p>
4473+The <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> is an object representing the parsed form of a SVG
4474+</p>
4475 </div>
4476 <hr>
4477 <div class="refsect2">
4478@@ -1220,23 +205,20 @@
4479 GObjectClass parent;
4480 };
4481 </pre>
4482-<p>Class structure for <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a></p>
4483-<div class="refsect3">
4484-<a name="id-1.2.3.9.5.5"></a><h4>Members</h4>
4485-<div class="informaltable"><table width="100%" border="0">
4486+<p>
4487+Class structure for <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4488+</p>
4489+<div class="variablelist"><table border="0" class="variablelist">
4490 <colgroup>
4491-<col width="300px" class="struct_members_name">
4492-<col class="struct_members_description">
4493-<col width="200px" class="struct_members_annotations">
4494+<col align="left" valign="top">
4495+<col>
4496 </colgroup>
4497 <tbody><tr>
4498-<td class="struct_member_name"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="RsvgHandleClass.parent"></a>parent</code></em>;</p></td>
4499-<td class="struct_member_description"><p>parent class</p></td>
4500-<td class="struct_member_annotations"> </td>
4501+<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="RsvgHandleClass.parent"></a>parent</code></em>;</span></p></td>
4502+<td>parent class</td>
4503 </tr></tbody>
4504 </table></div>
4505 </div>
4506-</div>
4507 <hr>
4508 <div class="refsect2">
4509 <a name="RsvgDimensionData"></a><h3>struct RsvgDimensionData</h3>
4510@@ -1247,39 +229,31 @@
4511 gdouble ex;
4512 };
4513 </pre>
4514-<div class="refsect3">
4515-<a name="id-1.2.3.9.6.4"></a><h4>Members</h4>
4516-<div class="informaltable"><table width="100%" border="0">
4517+<div class="variablelist"><table border="0" class="variablelist">
4518 <colgroup>
4519-<col width="300px" class="struct_members_name">
4520-<col class="struct_members_description">
4521-<col width="200px" class="struct_members_annotations">
4522+<col align="left" valign="top">
4523+<col>
4524 </colgroup>
4525 <tbody>
4526 <tr>
4527-<td class="struct_member_name"><p><span class="type">int</span> <em class="structfield"><code><a name="RsvgDimensionData.width"></a>width</code></em>;</p></td>
4528-<td class="struct_member_description"><p>SVG's width, in pixels</p></td>
4529-<td class="struct_member_annotations"> </td>
4530-</tr>
4531-<tr>
4532-<td class="struct_member_name"><p><span class="type">int</span> <em class="structfield"><code><a name="RsvgDimensionData.height"></a>height</code></em>;</p></td>
4533-<td class="struct_member_description"><p>SVG's height, in pixels</p></td>
4534-<td class="struct_member_annotations"> </td>
4535-</tr>
4536-<tr>
4537-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="RsvgDimensionData.em"></a>em</code></em>;</p></td>
4538-<td class="struct_member_description"><p>em</p></td>
4539-<td class="struct_member_annotations"> </td>
4540-</tr>
4541-<tr>
4542-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="RsvgDimensionData.ex"></a>ex</code></em>;</p></td>
4543-<td class="struct_member_description"><p>ex</p></td>
4544-<td class="struct_member_annotations"> </td>
4545+<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="RsvgDimensionData.width"></a>width</code></em>;</span></p></td>
4546+<td>SVG's width, in pixels</td>
4547+</tr>
4548+<tr>
4549+<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="RsvgDimensionData.height"></a>height</code></em>;</span></p></td>
4550+<td>SVG's height, in pixels</td>
4551+</tr>
4552+<tr>
4553+<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="RsvgDimensionData.em"></a>em</code></em>;</span></p></td>
4554+<td>em</td>
4555+</tr>
4556+<tr>
4557+<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="RsvgDimensionData.ex"></a>ex</code></em>;</span></p></td>
4558+<td>ex</td>
4559 </tr>
4560 </tbody>
4561 </table></div>
4562 </div>
4563-</div>
4564 <hr>
4565 <div class="refsect2">
4566 <a name="RsvgPositionData"></a><h3>struct RsvgPositionData</h3>
4567@@ -1288,126 +262,837 @@
4568 int y;
4569 };
4570 </pre>
4571-<p>Position of an SVG fragment.</p>
4572-<div class="refsect3">
4573-<a name="id-1.2.3.9.7.5"></a><h4>Members</h4>
4574-<div class="informaltable"><table width="100%" border="0">
4575-<colgroup>
4576-<col width="300px" class="struct_members_name">
4577-<col class="struct_members_description">
4578-<col width="200px" class="struct_members_annotations">
4579-</colgroup>
4580-<tbody>
4581-<tr>
4582-<td class="struct_member_name"><p><span class="type">int</span> <em class="structfield"><code><a name="RsvgPositionData.x"></a>x</code></em>;</p></td>
4583-<td class="struct_member_description"><p>position on the x axis</p></td>
4584-<td class="struct_member_annotations"> </td>
4585-</tr>
4586-<tr>
4587-<td class="struct_member_name"><p><span class="type">int</span> <em class="structfield"><code><a name="RsvgPositionData.y"></a>y</code></em>;</p></td>
4588-<td class="struct_member_description"><p>position on the y axis</p></td>
4589-<td class="struct_member_annotations"> </td>
4590-</tr>
4591-</tbody>
4592-</table></div>
4593-</div>
4594+<p>
4595+Position of an SVG fragment.
4596+</p>
4597+<div class="variablelist"><table border="0" class="variablelist">
4598+<colgroup>
4599+<col align="left" valign="top">
4600+<col>
4601+</colgroup>
4602+<tbody>
4603+<tr>
4604+<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="RsvgPositionData.x"></a>x</code></em>;</span></p></td>
4605+<td>position on the x axis</td>
4606+</tr>
4607+<tr>
4608+<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="RsvgPositionData.y"></a>y</code></em>;</span></p></td>
4609+<td>position on the y axis</td>
4610+</tr>
4611+</tbody>
4612+</table></div>
4613+</div>
4614+<hr>
4615+<div class="refsect2">
4616+<a name="rsvg-cleanup"></a><h3>rsvg_cleanup ()</h3>
4617+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_cleanup (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
4618+<p>
4619+This function should not be called from normal programs.
4620+See <code class="function">xmlCleanupParser()</code> for more information.
4621+</p>
4622+<p class="since">Since 2.36</p>
4623+</div>
4624+<hr>
4625+<div class="refsect2">
4626+<a name="rsvg-set-default-dpi"></a><h3>rsvg_set_default_dpi ()</h3>
4627+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_set_default_dpi (<em class="parameter"><code><span class="type">double</span> dpi</code></em>);</pre>
4628+<p>
4629+Sets the DPI for the all future outgoing pixbufs. Common values are
4630+75, 90, and 300 DPI. Passing a number &lt;= 0 to <em class="parameter"><code>dpi</code></em> will
4631+reset the DPI to whatever the default value happens to be.
4632+</p>
4633+<div class="variablelist"><table border="0" class="variablelist">
4634+<colgroup>
4635+<col align="left" valign="top">
4636+<col>
4637+</colgroup>
4638+<tbody><tr>
4639+<td><p><span class="term"><em class="parameter"><code>dpi</code></em> :</span></p></td>
4640+<td>Dots Per Inch (aka Pixels Per Inch)</td>
4641+</tr></tbody>
4642+</table></div>
4643+<p class="since">Since 2.8</p>
4644+</div>
4645+<hr>
4646+<div class="refsect2">
4647+<a name="rsvg-set-default-dpi-x-y"></a><h3>rsvg_set_default_dpi_x_y ()</h3>
4648+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_set_default_dpi_x_y (<em class="parameter"><code><span class="type">double</span> dpi_x</code></em>,
4649+ <em class="parameter"><code><span class="type">double</span> dpi_y</code></em>);</pre>
4650+<p>
4651+Sets the DPI for the all future outgoing pixbufs. Common values are
4652+75, 90, and 300 DPI. Passing a number &lt;= 0 to <em class="parameter"><code>dpi</code></em> will
4653+reset the DPI to whatever the default value happens to be.
4654+</p>
4655+<div class="variablelist"><table border="0" class="variablelist">
4656+<colgroup>
4657+<col align="left" valign="top">
4658+<col>
4659+</colgroup>
4660+<tbody>
4661+<tr>
4662+<td><p><span class="term"><em class="parameter"><code>dpi_x</code></em> :</span></p></td>
4663+<td>Dots Per Inch (aka Pixels Per Inch)</td>
4664+</tr>
4665+<tr>
4666+<td><p><span class="term"><em class="parameter"><code>dpi_y</code></em> :</span></p></td>
4667+<td>Dots Per Inch (aka Pixels Per Inch)</td>
4668+</tr>
4669+</tbody>
4670+</table></div>
4671+<p class="since">Since 2.8</p>
4672+</div>
4673+<hr>
4674+<div class="refsect2">
4675+<a name="rsvg-handle-set-dpi"></a><h3>rsvg_handle_set_dpi ()</h3>
4676+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_handle_set_dpi (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4677+ <em class="parameter"><code><span class="type">double</span> dpi</code></em>);</pre>
4678+<p>
4679+Sets the DPI for the outgoing pixbuf. Common values are
4680+75, 90, and 300 DPI. Passing a number &lt;= 0 to <em class="parameter"><code>dpi</code></em> will
4681+reset the DPI to whatever the default value happens to be.
4682+</p>
4683+<div class="variablelist"><table border="0" class="variablelist">
4684+<colgroup>
4685+<col align="left" valign="top">
4686+<col>
4687+</colgroup>
4688+<tbody>
4689+<tr>
4690+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4691+<td>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4692+</td>
4693+</tr>
4694+<tr>
4695+<td><p><span class="term"><em class="parameter"><code>dpi</code></em> :</span></p></td>
4696+<td>Dots Per Inch (aka Pixels Per Inch)</td>
4697+</tr>
4698+</tbody>
4699+</table></div>
4700+<p class="since">Since 2.8</p>
4701+</div>
4702+<hr>
4703+<div class="refsect2">
4704+<a name="rsvg-handle-set-dpi-x-y"></a><h3>rsvg_handle_set_dpi_x_y ()</h3>
4705+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_handle_set_dpi_x_y (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4706+ <em class="parameter"><code><span class="type">double</span> dpi_x</code></em>,
4707+ <em class="parameter"><code><span class="type">double</span> dpi_y</code></em>);</pre>
4708+<p>
4709+Sets the DPI for the outgoing pixbuf. Common values are
4710+75, 90, and 300 DPI. Passing a number &lt;= 0 to <span class="type">dpi_x</span> or <em class="parameter"><code>dpi_y</code></em> will
4711+reset the DPI to whatever the default value happens to be.
4712+</p>
4713+<div class="variablelist"><table border="0" class="variablelist">
4714+<colgroup>
4715+<col align="left" valign="top">
4716+<col>
4717+</colgroup>
4718+<tbody>
4719+<tr>
4720+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4721+<td>An <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4722+</td>
4723+</tr>
4724+<tr>
4725+<td><p><span class="term"><em class="parameter"><code>dpi_x</code></em> :</span></p></td>
4726+<td>Dots Per Inch (aka Pixels Per Inch)</td>
4727+</tr>
4728+<tr>
4729+<td><p><span class="term"><em class="parameter"><code>dpi_y</code></em> :</span></p></td>
4730+<td>Dots Per Inch (aka Pixels Per Inch)</td>
4731+</tr>
4732+</tbody>
4733+</table></div>
4734+<p class="since">Since 2.8</p>
4735+</div>
4736+<hr>
4737+<div class="refsect2">
4738+<a name="rsvg-handle-new"></a><h3>rsvg_handle_new ()</h3>
4739+<pre class="programlisting"><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> * rsvg_handle_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
4740+<p>
4741+Returns a new rsvg handle. Must be freed with <em class="parameter"><code>g_object_unref</code></em>. This
4742+handle can be used for dynamically loading an image. You need to feed it
4743+data using <em class="parameter"><code>rsvg_handle_write</code></em>, then call <em class="parameter"><code>rsvg_handle_close</code></em> when done.
4744+Afterwords, you can render it using Cairo or get a GdkPixbuf from it. When
4745+finished, free with <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>. No more than one image can be loaded
4746+with one handle.
4747+</p>
4748+<div class="variablelist"><table border="0" class="variablelist">
4749+<colgroup>
4750+<col align="left" valign="top">
4751+<col>
4752+</colgroup>
4753+<tbody><tr>
4754+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
4755+<td>A new <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4756+</td>
4757+</tr></tbody>
4758+</table></div>
4759+</div>
4760+<hr>
4761+<div class="refsect2">
4762+<a name="rsvg-handle-new-with-flags"></a><h3>rsvg_handle_new_with_flags ()</h3>
4763+<pre class="programlisting"><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="returnvalue">RsvgHandle</span></a> * rsvg_handle_new_with_flags (<em class="parameter"><code><a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a> flags</code></em>);</pre>
4764+<p>
4765+Creates a new <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> with flags <em class="parameter"><code>flags</code></em>.
4766+</p>
4767+<div class="variablelist"><table border="0" class="variablelist">
4768+<colgroup>
4769+<col align="left" valign="top">
4770+<col>
4771+</colgroup>
4772+<tbody>
4773+<tr>
4774+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
4775+<td>flags from <a class="link" href="rsvg-Using-RSVG-with-GIO.html#RsvgHandleFlags"><span class="type">RsvgHandleFlags</span></a>
4776+</td>
4777+</tr>
4778+<tr>
4779+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
4780+<td>a new <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
4781+</td>
4782+</tr>
4783+</tbody>
4784+</table></div>
4785+<p class="since">Since 2.36</p>
4786+</div>
4787+<hr>
4788+<div class="refsect2">
4789+<a name="rsvg-handle-write"></a><h3>rsvg_handle_write ()</h3>
4790+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> rsvg_handle_write (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4791+ <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a> *buf</code></em>,
4792+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> count</code></em>,
4793+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
4794+<p>
4795+Loads the next <em class="parameter"><code>count</code></em> bytes of the image. This will return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the data
4796+was loaded successful, and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an error occurred. In the latter case,
4797+the loader will be closed, and will not accept further writes. If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is
4798+returned, <em class="parameter"><code>error</code></em> will be set to an error from the <a class="link" href="RsvgHandle.html#RsvgError"><span class="type">RsvgError</span></a> domain. Errors
4799+from <a href="http://library.gnome.org/devel/gio/unstable/gio-GIOError.html#GIOErrorEnum"><span class="type">GIOErrorEnum</span></a> are also possible.
4800+</p>
4801+<div class="variablelist"><table border="0" class="variablelist">
4802+<colgroup>
4803+<col align="left" valign="top">
4804+<col>
4805+</colgroup>
4806+<tbody>
4807+<tr>
4808+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4809+<td>an <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4810+</td>
4811+</tr>
4812+<tr>
4813+<td><p><span class="term"><em class="parameter"><code>buf</code></em> :</span></p></td>
4814+<td>pointer to svg data. <span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guchar]</span>
4815+</td>
4816+</tr>
4817+<tr>
4818+<td><p><span class="term"><em class="parameter"><code>count</code></em> :</span></p></td>
4819+<td>length of the <em class="parameter"><code>buf</code></em> buffer in bytes</td>
4820+</tr>
4821+<tr>
4822+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
4823+<td>a location to store a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
4824+</td>
4825+</tr>
4826+<tr>
4827+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
4828+<td>
4829+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on error</td>
4830+</tr>
4831+</tbody>
4832+</table></div>
4833+</div>
4834+<hr>
4835+<div class="refsect2">
4836+<a name="rsvg-handle-close"></a><h3>rsvg_handle_close ()</h3>
4837+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> rsvg_handle_close (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4838+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
4839+<p>
4840+Closes <em class="parameter"><code>handle</code></em>, to indicate that loading the image is complete. This will
4841+return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the loader closed successfully. Note that <em class="parameter"><code>handle</code></em> isn't
4842+freed until <em class="parameter"><code>g_object_unref</code></em> is called.
4843+</p>
4844+<div class="variablelist"><table border="0" class="variablelist">
4845+<colgroup>
4846+<col align="left" valign="top">
4847+<col>
4848+</colgroup>
4849+<tbody>
4850+<tr>
4851+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4852+<td>a <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4853+</td>
4854+</tr>
4855+<tr>
4856+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
4857+<td>a location to store a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
4858+</td>
4859+</tr>
4860+<tr>
4861+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
4862+<td>
4863+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on error</td>
4864+</tr>
4865+</tbody>
4866+</table></div>
4867+</div>
4868+<hr>
4869+<div class="refsect2">
4870+<a name="rsvg-handle-get-base-uri"></a><h3>rsvg_handle_get_base_uri ()</h3>
4871+<pre class="programlisting">const <span class="returnvalue">char</span> * rsvg_handle_get_base_uri (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>);</pre>
4872+<p>
4873+Gets the base uri for this <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>.
4874+</p>
4875+<div class="variablelist"><table border="0" class="variablelist">
4876+<colgroup>
4877+<col align="left" valign="top">
4878+<col>
4879+</colgroup>
4880+<tbody>
4881+<tr>
4882+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4883+<td>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4884+</td>
4885+</tr>
4886+<tr>
4887+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
4888+<td>the base uri, possibly null</td>
4889+</tr>
4890+</tbody>
4891+</table></div>
4892+<p class="since">Since 2.8</p>
4893+</div>
4894+<hr>
4895+<div class="refsect2">
4896+<a name="rsvg-handle-set-base-uri"></a><h3>rsvg_handle_set_base_uri ()</h3>
4897+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_handle_set_base_uri (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4898+ <em class="parameter"><code>const <span class="type">char</span> *base_uri</code></em>);</pre>
4899+<p>
4900+Set the base URI for this SVG. This can only be called before <a class="link" href="RsvgHandle.html#rsvg-handle-write" title="rsvg_handle_write ()"><code class="function">rsvg_handle_write()</code></a>
4901+has been called.
4902+</p>
4903+<div class="variablelist"><table border="0" class="variablelist">
4904+<colgroup>
4905+<col align="left" valign="top">
4906+<col>
4907+</colgroup>
4908+<tbody>
4909+<tr>
4910+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4911+<td>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4912+</td>
4913+</tr>
4914+<tr>
4915+<td><p><span class="term"><em class="parameter"><code>base_uri</code></em> :</span></p></td>
4916+<td>The base uri</td>
4917+</tr>
4918+</tbody>
4919+</table></div>
4920+<p class="since">Since 2.9</p>
4921+</div>
4922+<hr>
4923+<div class="refsect2">
4924+<a name="rsvg-handle-get-dimensions"></a><h3>rsvg_handle_get_dimensions ()</h3>
4925+<pre class="programlisting"><span class="returnvalue">void</span> rsvg_handle_get_dimensions (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4926+ <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>);</pre>
4927+<p>
4928+Get the SVG's size. Do not call from within the size_func callback, because an infinite loop will occur.
4929+</p>
4930+<div class="variablelist"><table border="0" class="variablelist">
4931+<colgroup>
4932+<col align="left" valign="top">
4933+<col>
4934+</colgroup>
4935+<tbody>
4936+<tr>
4937+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4938+<td>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4939+</td>
4940+</tr>
4941+<tr>
4942+<td><p><span class="term"><em class="parameter"><code>dimension_data</code></em> :</span></p></td>
4943+<td>A place to store the SVG's size. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
4944+</td>
4945+</tr>
4946+</tbody>
4947+</table></div>
4948+<p class="since">Since 2.14</p>
4949+</div>
4950+<hr>
4951+<div class="refsect2">
4952+<a name="rsvg-handle-get-dimensions-sub"></a><h3>rsvg_handle_get_dimensions_sub ()</h3>
4953+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> rsvg_handle_get_dimensions_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4954+ <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgDimensionData" title="struct RsvgDimensionData"><span class="type">RsvgDimensionData</span></a> *dimension_data</code></em>,
4955+ <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre>
4956+<p>
4957+Get the size of a subelement of the SVG file. Do not call from within the size_func callback, because an infinite loop will occur.
4958+</p>
4959+<div class="variablelist"><table border="0" class="variablelist">
4960+<colgroup>
4961+<col align="left" valign="top">
4962+<col>
4963+</colgroup>
4964+<tbody>
4965+<tr>
4966+<td><p><span class="term"><em class="parameter"><code>handle</code></em> :</span></p></td>
4967+<td>A <a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a>
4968+</td>
4969+</tr>
4970+<tr>
4971+<td><p><span class="term"><em class="parameter"><code>dimension_data</code></em> :</span></p></td>
4972+<td>A place to store the SVG's size. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
4973+</td>
4974+</tr>
4975+<tr>
4976+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
4977+<td>An element's id within the SVG, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to get
4978+the dimension of the whole SVG. For example, if you have a layer
4979+called "layer1" for that you want to get the dimension, pass
4980+"<span class="type">layer1</span>" as the id. <span class="annotation">[nullable]</span>
4981+</td>
4982+</tr>
4983+</tbody>
4984+</table></div>
4985+<p class="since">Since 2.22</p>
4986+</div>
4987+<hr>
4988+<div class="refsect2">
4989+<a name="rsvg-handle-get-position-sub"></a><h3>rsvg_handle_get_position_sub ()</h3>
4990+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> rsvg_handle_get_position_sub (<em class="parameter"><code><a class="link" href="RsvgHandle.html" title="RsvgHandle"><span class="type">RsvgHandle</span></a> *handle</code></em>,
4991+ <em class="parameter"><code><a class="link" href="RsvgHandle.html#RsvgPositionData" title="struct RsvgPositionData"><span class="type">RsvgPositionData</span></a> *position_data</code></em>,
4992+ <em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre>
4993+<p>
4994+Get the position of a subelement of the SVG file. Do not call from within
4995+the size_func callback, because an infinite loop will occur.
4996+</p>
4997+<div class="variablelist"><table border="0" class="variablelist">
4998+<colgroup>
4999+<col align="left" valign="top">
5000+<col>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: