[gentoo-commits] proj/gnome:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/

[Nirbheek Chauhan]

commit:     8f065063968ba60c2e4fe5169e7dbed5b9733464
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 07:32:47 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 07:34:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8f065063

net-misc/networkmanager: patch is no longer needed

* https://bugzilla.gnome.org/show_bug.cgi?id=643011

---
 .../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-annotations.patch b/net-misc/networkmanager/files/networkmanager-more-gi-annotations.patch
deleted file mode 100644
index e6bac7d..0000000
--- a/net-misc/networkmanager/files/networkmanager-more-gi-annotations.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a420d59ea24a1eb82a7c1dc96e3cf5b38b0fd757 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@×××××××××.org>
-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=643011
----
- 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)
- 
- /**
-  * nm_utils_ssid_to_utf8:
-- * @ssid: pointer to a buffer containing the SSID data
-+ * @ssid: (array length=len) (element-type guint8): pointer to a buffer
-+ *   containing the SSID data
-  * @len: length of the SSID data in @ssid
-  *
-  * WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
-@@ -330,9 +331,9 @@ nm_utils_deinit (void)
-  * Again, this function should be used for debugging and display purposes
-  * _only_.
-  *
-- * Returns: an allocated string containing a UTF-8 representation of the
-- * SSID, which must be freed by the caller using g_free().  Returns NULL
-- * on errors.
-+ * Returns: (transfer full): an allocated string containing a UTF-8 representation
-+ *   of the SSID, which must be freed by the caller using g_free().  Returns
-+ *   NULL on errors.
-  **/
- char *
- nm_utils_ssid_to_utf8 (const char *ssid, guint32 len)
--- 
-1.7.4
\ No newline at end of file

diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/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"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=643011
-	epatch "${FILESDIR}/${PN}-more-gi-annotations.patch"
-
 	gnome2_src_prepare
 }