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 ) id 1PtxqU-0001qV-Bk for garchives@archives.gentoo.org; Mon, 28 Feb 2011 07:48:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B871AE0444; Mon, 28 Feb 2011 07:48:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 73D88E0444 for ; Mon, 28 Feb 2011 07:48:33 +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 CDF241B4099 for ; Mon, 28 Feb 2011 07:48:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3BC798006E for ; Mon, 28 Feb 2011 07:48:32 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <8f065063968ba60c2e4fe5169e7dbed5b9733464.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-misc/networkmanager/files/networkmanager-more-gi-annotations.patch net-misc/networkmanager/networkmanager-9999.ebuild X-VCS-Directories: net-misc/networkmanager/ net-misc/networkmanager/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 8f065063968ba60c2e4fe5169e7dbed5b9733464 Date: Mon, 28 Feb 2011 07:48:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 26f9633b8f1183fd1f6ce25b5e3b1fbe commit: 8f065063968ba60c2e4fe5169e7dbed5b9733464 Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 28 07:32:47 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 28 07:34:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8f065063 net-misc/networkmanager: patch is no longer needed * https://bugzilla.gnome.org/show_bug.cgi?id=3D643011 --- .../files/networkmanager-more-gi-annotations.patch | 43 --------------= ------ net-misc/networkmanager/networkmanager-9999.ebuild | 3 - 2 files changed, 0 insertions(+), 46 deletions(-) diff --git a/net-misc/networkmanager/files/networkmanager-more-gi-annotat= ions.patch b/net-misc/networkmanager/files/networkmanager-more-gi-annotat= ions.patch deleted file mode 100644 index e6bac7d..0000000 --- a/net-misc/networkmanager/files/networkmanager-more-gi-annotations.pa= tch +++ /dev/null @@ -1,43 +0,0 @@ -From a420d59ea24a1eb82a7c1dc96e3cf5b38b0fd757 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Tue, 22 Feb 2011 23:34:41 +0100 -Subject: [PATCH] libnm-util: another introspection annotation - -nm_utils_ssid_to_utf8 has gchar* in the signature, but it accepts -an array of bytes, not a string. Fix with the appropriate -annotation. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D643011 ---- - libnm-util/nm-utils.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c -index 87c5d5f..c2134db 100644 ---- a/libnm-util/nm-utils.c -+++ b/libnm-util/nm-utils.c -@@ -304,7 +304,8 @@ nm_utils_deinit (void) -=20 - /** - * nm_utils_ssid_to_utf8: -- * @ssid: pointer to a buffer containing the SSID data -+ * @ssid: (array length=3Dlen) (element-type guint8): pointer to a buff= er -+ * containing the SSID data - * @len: length of the SSID data in @ssid - * - * WiFi SSIDs are byte arrays, they are _not_ strings. Thus, an SSID m= ay -@@ -330,9 +331,9 @@ nm_utils_deinit (void) - * Again, this function should be used for debugging and display purpos= es - * _only_. - * -- * Returns: an allocated string containing a UTF-8 representation of th= e -- * SSID, which must be freed by the caller using g_free(). Returns NUL= L -- * on errors. -+ * Returns: (transfer full): an allocated string containing a UTF-8 rep= resentation -+ * of the SSID, which must be freed by the caller using g_free(). Re= turns -+ * NULL on errors. - **/ - char * - nm_utils_ssid_to_utf8 (const char *ssid, guint32 len) ---=20 -1.7.4 \ No newline at end of file diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-mis= c/networkmanager/networkmanager-9999.ebuild index a058ad6..0cf3ed6 100644 --- a/net-misc/networkmanager/networkmanager-9999.ebuild +++ b/net-misc/networkmanager/networkmanager-9999.ebuild @@ -134,9 +134,6 @@ src_prepare() { # FIXME: does not apply #epatch "${FILESDIR}/${PN}-0.8.2-shared-connection.patch" =20 - # https://bugzilla.gnome.org/show_bug.cgi?id=3D643011 - epatch "${FILESDIR}/${PN}-more-gi-annotations.patch" - gnome2_src_prepare } =20