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

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 131 insertions, 5 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/Manifest b/gnome-extra/nm-applet/Manifest
index 3638bc01c9db..2025d9d4318c 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA256
 
 AUX nm-applet-0.8.2-libnotify-0.7.patch 1111 RMD160 3a63b65cf30848b60e681ee05d63f645d8276e6a SHA1 059346b94cda77bbe2ce97c2ba90a9fe8ba54c1e SHA256 542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d
+AUX nm-applet-0.9.1.95-glib-2.31.patch 2161 RMD160 ac9efac0ab37028650407014096236d456dff9fb SHA1 d96ae8a9a725a702ffea2299690d90c90516ffe0 SHA256 0b2388b0396b23f23188776f5ff2a0374a4a0b41e7dd754896c34b72f610185b
 DIST network-manager-applet-0.8.4.tar.bz2 1153760 RMD160 eeafc3b5653ddb778317d4b2283dbc5ac9173d9d SHA1 a5af2f6920a356848d5f3578376b57d956648b81 SHA256 552bd805aa09261ff7bac6e599551439b93c26bd563a2bba6d04f1af77c434a9
 DIST network-manager-applet-0.8.tar.bz2 978462 RMD160 764d7ebf7a716a795539fdc34f0545e3134311c0 SHA1 51f684396e034064568d356f0d961aa71af574dd SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
 DIST network-manager-applet-0.9.0.tar.xz 1060440 RMD160 a4c4c9c4b72c12a51e27f1df325886357b5426d7 SHA1 34b507ba506a6132faaa927f7ff487beb61c06df SHA256 0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24
 DIST network-manager-applet-0.9.1.90.tar.xz 1069312 RMD160 e05236d5cc0b8603bc8d1e0d52bd6e925ad311a5 SHA1 20699135eda0ebe2a440d3d96347f37fc87ad47a SHA256 e98d285cc75a331557551900ebd815c24cb3132027f981823af4fb76ec368d95
+DIST network-manager-applet-0.9.1.95.tar.xz 1076556 RMD160 f23d74cdba9f9c882c17a724a0df9e281a4fa575 SHA1 040b18cbd96c84111d281cb03bcc86036636206e SHA256 6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc
 EBUILD nm-applet-0.8.4.ebuild 1090 RMD160 ebcc4f01b8a3171a154526a10221414cb8297364 SHA1 87bb90f403caa7b803edd5fbd2861ede1426af9d SHA256 4e93e9f7c5f5923657d86d0afcfed4adf0d8d396919e10fab0fdb4e10a4bbf92
 EBUILD nm-applet-0.8.ebuild 1403 RMD160 726eeed317f1d27a5db5cb74f5168e0482cf61bd SHA1 fb02ef8ab0e0a2144526b36a325baa3195156a5f SHA256 a3e13d1cd0f9e9c550ebbd798600e9773609d8ae917c994ce99159e4063217e9
 EBUILD nm-applet-0.9.0.ebuild 1112 RMD160 c12e3df6e298c4cdb337e1a2bb80d32070365679 SHA1 3a92e96a6a6b17f797460762956fa00db3f2bb35 SHA256 aefd1d590ecd8e4484b4815769b711d02242c4001fdc283fd3ad148689e453ec
 EBUILD nm-applet-0.9.1.90.ebuild 1136 RMD160 2b624e6d33bb4fe401e03387cc3ca887d736e852 SHA1 f79c565ed0709aa3a8dd26f2f46a19b00a0155b2 SHA256 f2f5c30abc3a9f51a4fce7f9551c6a88971b4280e7e7063c783c5fd598710d65
-MISC ChangeLog 12364 RMD160 712ca0d771746aea54ba8bb5f14807a14ffa0009 SHA1 6e15bb8db8d4a76c69c5261a674871b8ea84ec8d SHA256 1aeeaaa72add9e2c7336131c4c937f56244dbe5794a7be98af8085df8ec87d81
+EBUILD nm-applet-0.9.1.95.ebuild 1274 RMD160 c4f52df9fb79ef286a01904bbc8e0b13b19c1e10 SHA1 c8bdacee3d4603ca433e85360dd36430b742740d SHA256 1fd5c45a2b1e8edeb72cf463d683541d83dd4f140e13ad127ffa70c5aacced41
+MISC ChangeLog 12601 RMD160 5a052401ad7ad0d6d61e0ce405a3079539ceea38 SHA1 5f7d2c417d85acf466b85da4d51bd1dc6c618a91 SHA256 14af7392a52e6512fe783cf795a36fbc313108a79d522dd4d4f91b1ef907b88a
 MISC metadata.xml 517 RMD160 400e7c255754bcee547640d99b532aab79610120 SHA1 98c3f5e20fa145a8f16217350ba5f6b254d594f4 SHA256 4349695172dc69f311ffe37b6370714b5feb38cd2fc11cd7adeabe0c3d21e0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6rnsoACgkQdjK8w9WeBnBdXwD/UMkqzScVENSmR51YTpRoeEDd
-bk46eLzJRrk7KCJJJ20A/im+ziejx3kWLtwbMtvvNrL7e8vDId3tcTRyn9c2M5HY
-=JXfx
+iF4EAREIAAYFAk64I0sACgkQdjK8w9WeBnAk7AEAocwaYb0H96euv+ZRwekI6xQx
+BOAW28veWgqxF1tSOcIBAIOTt8aHuoXF1Oh5GLOHhvVwZ1EM2sQjKmBP0MYrMvrk
+=AC3p
 -----END PGP SIGNATURE-----
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
+}