[gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     82bbb0c5d2b1e51a9da785af9680e72676dd8fa6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 07:29:14 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 07:29:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=82bbb0c5

x11-libs/gdk-pixbuf: fix introspection annotations

---
 .../files/gdk-pixbuf-2.23.1-fix-annotations.patch  |   39 ++++++++++++++++++++
 ...f-2.23.1.ebuild => gdk-pixbuf-2.23.1-r1.ebuild} |    2 +
 2 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.23.1-fix-annotations.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.23.1-fix-annotations.patch
new file mode 100644
index 0000000..be107f6
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.23.1-fix-annotations.patch
@@ -0,0 +1,39 @@
+From 0a363032832ea243e0bae62df4113e18bb5cde99 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
+Date: Fri, 18 Mar 2011 09:25:02 +0530
+Subject: [PATCH] introspection: add more zero-termination array annotations
+
+https://bugzilla.gnome.org/show_bug.cgi?id=639515
+---
+ gdk-pixbuf/gdk-pixbuf-io.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
+index 3b75f73..466e661 100644
+--- a/gdk-pixbuf/gdk-pixbuf-io.c
++++ b/gdk-pixbuf/gdk-pixbuf-io.c
+@@ -2235,8 +2235,8 @@ gdk_pixbuf_save (GdkPixbuf  *pixbuf,
+  * @pixbuf: a #GdkPixbuf.
+  * @filename: name of file to save.
+  * @type: name of file format.
+- * @option_keys: name of options to set, %NULL-terminated
+- * @option_values: values for named options
++ * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated
++ * @option_values: (array zero-terminated=1): values for named options
+  * @error: (allow-none): return location for error, or %NULL
+  *
+  * Saves pixbuf to a file in @type, which is currently "jpeg", "png", "tiff", "ico" or "bmp".
+@@ -2532,8 +2532,8 @@ save_to_buffer_callback (const gchar *data,
+  * @buffer: location to receive a pointer to the new buffer.
+  * @buffer_size: location to receive the size of the new buffer.
+  * @type: name of file format.
+- * @option_keys: name of options to set, %NULL-terminated
+- * @option_values: values for named options
++ * @option_keys: (array zero-terminated=1): name of options to set, %NULL-terminated
++ * @option_values: (array zero-terminated=1): values for named options
+  * @error: (allow-none): return location for error, or %NULL
+  *
+  * Saves pixbuf to a new buffer in format @type, which is currently "jpeg",
+-- 
+1.7.3.4
+

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1-r1.ebuild
similarity index 97%
rename from x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1-r1.ebuild
index e143a80..ae0a2fb 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1-r1.ebuild
@@ -39,6 +39,8 @@ src_prepare() {
 	# Only build against libX11 if the user wants to do so
 	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
 
+	epatch "${FILESDIR}/${PN}-2.23.1-fix-annotations.patch"
+
 	elibtoolize
 	eautoreconf
 }