From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-326464-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Q0Uya-0007lj-IN
	for garchives@archives.gentoo.org; Fri, 18 Mar 2011 08:24:06 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 608CAE0458;
	Fri, 18 Mar 2011 08:23:57 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 2040DE0458
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2011 08:23:57 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 8C9091B40C2
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2011 08:23:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id C71FB8006E
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Mar 2011 08:23:55 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <82bbb0c5d2b1e51a9da785af9680e72676dd8fa6.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/
X-VCS-Repository: proj/gnome
X-VCS-Files: x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.23.1-fix-annotations.patch x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1-r1.ebuild x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.1.ebuild
X-VCS-Directories: x11-libs/gdk-pixbuf/ x11-libs/gdk-pixbuf/files/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 82bbb0c5d2b1e51a9da785af9680e72676dd8fa6
Date: Fri, 18 Mar 2011 08:23:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 681b0a18c4e3fd06bfd90db678c8d985

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=3Dproj/gnome.git;a=3D=
commit;h=3D82bbb0c5

x11-libs/gdk-pixbuf: fix introspection annotations

---
 .../files/gdk-pixbuf-2.23.1-fix-annotations.patch  |   39 ++++++++++++++=
++++++
 ...f-2.23.1.ebuild =3D> 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 annotati=
ons
+
+https://bugzilla.gnome.org/show_bug.cgi?id=3D639515
+---
+ 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=3D1): name of options to set, %=
NULL-terminated
++ * @option_values: (array zero-terminated=3D1): values for named option=
s
+  * @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=3D1): name of options to set, %=
NULL-terminated
++ * @option_values: (array zero-terminated=3D1): values for named option=
s
+  * @error: (allow-none): return location for error, or %NULL
+  *
+  * Saves pixbuf to a new buffer in format @type, which is currently "jp=
eg",
+--=20
+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
=20
+	epatch "${FILESDIR}/${PN}-2.23.1-fix-annotations.patch"
+
 	elibtoolize
 	eautoreconf
 }