Attachment 104780 Details for Bug 82741 – minor fixes to the docs

[patch] minor fixes to the docs

cairo-1.12.16-docs.patch (text/plain), 5.49 KB, created by Rafał Mużyło on 2014-08-18 02:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafał Mużyło

Created: 2014-08-18 02:24:34 UTC

Size: 5.49 KB

patch

obsolete

>diff -dupr cairo-1.12.16-old/build/Makefile.am.gtk-doc cairo-1.12.16/build/Makefile.am.gtk-doc
>--- cairo-1.12.16-old/build/Makefile.am.gtk-doc	2013-08-26 17:07:21.000000000 +0200
>+++ cairo-1.12.16/build/Makefile.am.gtk-doc	2014-08-18 02:21:23.491889921 +0200
>@@ -42,8 +42,8 @@ EXTRA_DIST += 				\
> 	$(DOC_MODULE)-sections.txt	\
> 	$(DOC_MODULE)-overrides.txt
> 
>-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
>-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
>+DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp \
>+	   $(srcdir)/sgml.stamp $(srcdir)/html.stamp
> 
> SCANOBJ_FILES = 		 \
> 	$(DOC_MODULE).args 	 \
>@@ -88,26 +88,11 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
> $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
> 	@true
> 
>-#### templates ####
>-
>-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
>-	@echo 'gtk-doc: Rebuilding template files'
>-	@-chmod -R u+w $(srcdir)
>-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
>-	touch tmpl-build.stamp
>-
>-tmpl.stamp: tmpl-build.stamp
>-	@true
>-
>-tmpl/*.sgml:
>-	@true
>-
>-
> #### xml ####
> 
> # gtkdoc-mkdb is broken and requires a --root-dir=$(srcdir) option
> # The _srcdir diversion is fragile but works for make check; make distcheck
>-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
>+sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(expand_content_files)
> 	@echo 'gtk-doc: Building XML'
> 	@-chmod -R u+w $(srcdir)
> 	_srcdir="`pwd`/$(DOC_SOURCE_DIR)"; \
>@@ -176,10 +161,8 @@ dist-check-gtkdoc:
> endif
> 
> dist-hook: dist-check-gtkdoc dist-hook-local
>-	mkdir $(distdir)/tmpl
> 	mkdir $(distdir)/xml
> 	mkdir $(distdir)/html
>-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
> 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
> 	cp $(srcdir)/html/* $(distdir)/html
> 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
>diff -dupr cairo-1.12.16-old/src/cairo.c cairo-1.12.16/src/cairo.c
>--- cairo-1.12.16-old/src/cairo.c	2013-08-26 17:07:21.000000000 +0200
>+++ cairo-1.12.16/src/cairo.c	2014-08-18 02:55:23.725659612 +0200
>@@ -621,7 +621,7 @@ slim_hidden_def (cairo_set_operator);
> 
> 
> #if 0
>-/**
>+/*
>  * cairo_set_opacity:
>  * @cr: a #cairo_t
>  * @opacity: the level of opacity to use when compositing
>@@ -939,8 +939,8 @@ cairo_set_fill_rule (cairo_t *cr, cairo_
>  * cairo_set_line_width() and ignore this note.
>  *
>  * As with the other stroke parameters, the current line width is
>- * examined by cairo_stroke(), cairo_stroke_extents(), and
>- * cairo_stroke_to_path(), but does not have any effect during path
>+ * examined by cairo_stroke(), and cairo_stroke_extents(),
>+ * but does not have any effect during path
>  * construction.
>  *
>  * The default line width value is 2.0.
>@@ -974,8 +974,8 @@ slim_hidden_def (cairo_set_line_width);
>  * styles are drawn.
>  *
>  * As with the other stroke parameters, the current line cap style is
>- * examined by cairo_stroke(), cairo_stroke_extents(), and
>- * cairo_stroke_to_path(), but does not have any effect during path
>+ * examined by cairo_stroke() and cairo_stroke_extents(),
>+ * but does not have any effect during path
>  * construction.
>  *
>  * The default line cap style is %CAIRO_LINE_CAP_BUTT.
>@@ -1006,8 +1006,8 @@ slim_hidden_def (cairo_set_line_cap);
>  * styles are drawn.
>  *
>  * As with the other stroke parameters, the current line join style is
>- * examined by cairo_stroke(), cairo_stroke_extents(), and
>- * cairo_stroke_to_path(), but does not have any effect during path
>+ * examined by cairo_stroke() and cairo_stroke_extents(),
>+ * but does not have any effect during path
>  * construction.
>  *
>  * The default line join style is %CAIRO_LINE_JOIN_MITER.
>@@ -1142,8 +1142,8 @@ cairo_get_dash (cairo_t *cr,
>  * converted to a bevel.
>  *
>  * As with the other stroke parameters, the current line miter limit is
>- * examined by cairo_stroke(), cairo_stroke_extents(), and
>- * cairo_stroke_to_path(), but does not have any effect during path
>+ * examined by cairo_stroke() and cairo_stroke_extents(),
>+ * but does not have any effect during path
>  * construction.
>  *
>  * The default miter limit value is 10.0, which will convert joins
>@@ -3671,7 +3671,7 @@ cairo_has_current_point (cairo_t *cr)
>  * cairo_move_to(), cairo_line_to(), cairo_curve_to(),
>  * cairo_rel_move_to(), cairo_rel_line_to(), cairo_rel_curve_to(),
>  * cairo_arc(), cairo_arc_negative(), cairo_rectangle(),
>- * cairo_text_path(), cairo_glyph_path(), cairo_stroke_to_path().
>+ * cairo_text_path(), cairo_glyph_path().
>  *
>  * Some functions use and alter the current point but do not
>  * otherwise change current path:
>diff -dupr cairo-1.12.16-old/src/cairo-version.c cairo-1.12.16/src/cairo-version.c
>--- cairo-1.12.16-old/src/cairo-version.c	2013-08-26 17:07:21.000000000 +0200
>+++ cairo-1.12.16/src/cairo-version.c	2014-08-18 03:32:35.541341838 +0200
>@@ -79,7 +79,6 @@
>  * 1.0.1 - Development on a maintenance branch (toward 1.0.2 release)
>  * 1.1.1 - Development on head (toward 1.1.2 snapshot and 1.2.0 release)
>  * </screen></informalexample>
>- * </para>
>  * <refsect2>
>  * <title>Compatibility</title>
>  * <para>
>@@ -115,8 +114,8 @@
>  * <informalexample><screen>
>  * Compile-time
>  * ------------
>- * CAIRO_VERSION_STRING    Human-readable
>- * CAIRO_VERSION           Encoded, suitable for comparison
>+ * #CAIRO_VERSION_STRING    Human-readable
>+ * #CAIRO_VERSION           Encoded, suitable for comparison
>  * &nbsp;
>  * Run-time
>  * --------

Actions: View | Splinter Review

Attachments on bug 82741: 104780

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.