Bump to 0.9.1.95; fixes bluetooth crashes and gsm modem unlocking.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 124 insertions, 1 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 9ec78f61c2fa..84d8b74c11ba 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.70 2011/10/29 06:35:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.71 2011/11/07 18:28:22 tetromino Exp $
+
+*nm-applet-0.9.1.95 (07 Nov 2011)
+
+  07 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +nm-applet-0.9.1.95.ebuild, +files/nm-applet-0.9.1.95-glib-2.31.patch:
+  Bump to 0.9.1.95; fixes bluetooth crashes and gsm modem unlocking.
 
 *nm-applet-0.9.1.90 (29 Oct 2011)
 
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch
new file mode 100644
index 000000000000..66b45427c4dd
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch
@@ -0,0 +1,64 @@
+From e06a4b0d2f96fd185ed6c85a07d4f2c8c0077fdd Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Thu, 3 Nov 2011 18:12:50 -0500
+Subject: [PATCH] trivial: fix compat with glib 2.31+
+
+g_value_get_char is deprecated.
+---
+ src/connection-editor/ce-page.c   |    7 ++++++-
+ src/gconf-helpers/gconf-helpers.c |    7 ++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
+index 25e2240..44fd952 100644
+--- a/src/connection-editor/ce-page.c
++++ b/src/connection-editor/ce-page.c
+@@ -35,6 +35,11 @@
+ #include "ce-page.h"
+ #include "nma-marshal.h"
+ 
++#if !GLIB_CHECK_VERSION(2,31,0)
++#define g_value_set_schar g_value_set_char
++#define g_value_get_schar g_value_get_char
++#endif
++
+ G_DEFINE_ABSTRACT_TYPE (CEPage, ce_page, G_TYPE_OBJECT)
+ 
+ enum {
+@@ -88,7 +93,7 @@ ce_get_property_default (NMSetting *setting, const char *property_name)
+ 	g_param_value_set_default (spec, &value);
+ 
+ 	if (G_VALUE_HOLDS_CHAR (&value))
+-		return (int) g_value_get_char (&value);
++		return (int) g_value_get_schar (&value);
+ 	else if (G_VALUE_HOLDS_INT (&value))
+ 		return g_value_get_int (&value);
+ 	else if (G_VALUE_HOLDS_INT64 (&value))
+diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
+index 2327c62..10c522d 100644
+--- a/src/gconf-helpers/gconf-helpers.c
++++ b/src/gconf-helpers/gconf-helpers.c
+@@ -54,6 +54,11 @@
+ #include "gconf-helpers.h"
+ #include "gconf-upgrade.h"
+ 
++#if !GLIB_CHECK_VERSION(2,31,0)
++#define g_value_set_schar g_value_set_char
++#define g_value_get_schar g_value_get_char
++#endif
++
+ #define S390_OPT_KEY_PREFIX "s390-opt-"
+ 
+ #define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH    (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
+@@ -2664,7 +2669,7 @@ copy_one_setting_value_to_gconf (NMSetting *setting,
+ 	} else if (type == G_TYPE_CHAR) {
+ 		nm_gconf_set_int_helper (info->client, info->dir,
+ 							key, setting_name,
+-							g_value_get_char (value));
++							g_value_get_schar (value));
+ 	} else if (type == DBUS_TYPE_G_UCHAR_ARRAY) {
+ 		GByteArray *ba_val = (GByteArray *) g_value_get_boxed (value);
+ 
+-- 
+1.7.7.2
+
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild
new file mode 100644
index 000000000000..eb1b0af96221
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild,v 1.1 2011/11/07 18:28:22 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bluetooth"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=dev-libs/dbus-glib-0.88
+	>=gnome-base/gconf-2.20:2
+	>=gnome-base/gnome-keyring-2.20
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-2.91.4:3
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-${PV}
+	net-misc/mobile-broadband-provider-info
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		--with-gtkver=3
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		$(use_with bluetooth)"
+}
+
+src_prepare() {
+	# Fix building with glib-2.31, will be in next release
+	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+	gnome2_src_prepare
+}