r30858 - in /desktop/unstable/pango1.0/debian: changelog patches/00git_transfer_annotations.patch patches/series
mpitt at users.alioth.debian.org
mpitt at users.alioth.debian.org
Thu Oct 20 07:10:04 UTC 2011
Author: mpitt
Date: Thu Oct 20 07:10:03 2011
New Revision: 30858
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30858
Log:
Add 00git_transfer_annotations.patch: Add missing (transfer none)
allocations which didn't make it into 1.29.4, but cause crashes due to
double-free.
Added:
desktop/unstable/pango1.0/debian/patches/00git_transfer_annotations.patch
Modified:
desktop/unstable/pango1.0/debian/changelog
desktop/unstable/pango1.0/debian/patches/series
Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=30858&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Thu Oct 20 07:10:03 2011
@@ -13,6 +13,9 @@
*.gir/*.typelib, to fix missing enum gtypes in the GIR due to the separate
build tree. Add a test that the installed .gir really contains the
gtypes.
+ * Add 00git_transfer_annotations.patch: Add missing (transfer none)
+ allocations which didn't make it into 1.29.4, but cause crashes due to
+ double-free.
-- Michael Biebl <biebl at debian.org> Sat, 08 Oct 2011 02:20:24 +0200
Added: desktop/unstable/pango1.0/debian/patches/00git_transfer_annotations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/00git_transfer_annotations.patch?rev=30858&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/00git_transfer_annotations.patch (added)
+++ desktop/unstable/pango1.0/debian/patches/00git_transfer_annotations.patch [utf-8] Thu Oct 20 07:10:03 2011
@@ -1,0 +1,50 @@
+diff --git a/pango/pango-context.c b/pango/pango-context.c
+index 110a6f3..af0ccfa 100644
+--- a/pango/pango-context.c
++++ b/pango/pango-context.c
+@@ -339,8 +339,8 @@ pango_context_set_font_description (PangoContext *context,
+ *
+ * Retrieve the default font description for the context.
+ *
+- * Return value: a pointer to the context's default font description.
+- * This value must not be modified or freed.
++ * Return value: (transfer none): a pointer to the context's default font
++ * description. This value must not be modified or freed.
+ **/
+ PangoFontDescription *
+ pango_context_get_font_description (PangoContext *context)
+diff --git a/pango/pango-layout.c b/pango/pango-layout.c
+index 40f92fa..e5155b5 100644
+--- a/pango/pango-layout.c
++++ b/pango/pango-layout.c
+@@ -1422,10 +1422,10 @@ pango_layout_get_lines_readonly (PangoLayout *layout)
+ * Use the faster pango_layout_get_line_readonly() if you do not plan
+ * to modify the contents of the line (glyphs, glyph widths, etc.).
+ *
+- * Return value: the requested #PangoLayoutLine, or %NULL if the
+- * index is out of range. This layout line can
+- * be ref'ed and retained, but will become invalid
+- * if changes are made to the #PangoLayout.
++ * Return value: (transfer none): the requested #PangoLayoutLine, or %NULL if
++ * the index is out of range. This layout line can be ref'ed and
++ * retained, but will become invalid if changes are made to the
++ * #PangoLayout.
+ **/
+ PangoLayoutLine *
+ pango_layout_get_line (PangoLayout *layout,
+@@ -1464,11 +1464,10 @@ pango_layout_get_line (PangoLayout *layout,
+ * but the user is not expected
+ * to modify the contents of the line (glyphs, glyph widths, etc.).
+ *
+- * Return value: the requested #PangoLayoutLine, or %NULL if the
+- * index is out of range. This layout line can
+- * be ref'ed and retained, but will become invalid
+- * if changes are made to the #PangoLayout.
+- * No changes should be made to the line.
++ * Return value: (transfer none): the requested #PangoLayoutLine, or %NULL if
++ * the index is out of range. This layout line can be ref'ed and
++ * retained, but will become invalid if changes are made to the
++ * #PangoLayout. No changes should be made to the line.
+ *
+ * Since: 1.16
+ **/
Modified: desktop/unstable/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/series?rev=30858&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/series [utf-8] Thu Oct 20 07:10:03 2011
@@ -1,3 +1,4 @@
+00git_transfer_annotations.patch
10_scan-module-files-in-dirs.patch
11_module-files-append-module-files-d.patch
12_module-files-append-compat-module-files-d.patch
More information about the pkg-gnome-commits
mailing list