Don't autostart in KDE (bug #394379, thanks to Marc Schiffbauer for reporting). Also, show connection editor in all non-KDE desktop environments. Drop old.

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

4 files changed, 56 insertions, 69 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 68b0d870bfd0..193b863c006b 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,15 @@
 # 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.73 2011/11/20 10:11:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.74 2011/12/14 07:40:04 tetromino Exp $
+
+*nm-applet-0.9.2.0-r1 (14 Dec 2011)
+
+  14 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -nm-applet-0.9.1.95.ebuild, -files/nm-applet-0.9.1.95-glib-2.31.patch,
+  +nm-applet-0.9.2.0-r1.ebuild, +files/nm-applet-0.9.2.0-not-show-in-kde.patch:
+  Don't autostart in KDE (bug #394379, thanks to Marc Schiffbauer for
+  reporting). Also, show connection editor in all non-KDE desktop environments.
+  Drop old.
 
   20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> nm-applet-0.8.4.ebuild:
   ppc stable wrt #369901
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
deleted file mode 100644
index 66b45427c4dd..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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/files/nm-applet-0.9.2.0-not-show-in-kde.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.2.0-not-show-in-kde.patch
new file mode 100644
index 000000000000..db22964a122b
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.2.0-not-show-in-kde.patch
@@ -0,0 +1,41 @@
+From 7f2466edf036721844ddfd91eea3dfb0ead8e7d7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 14 Dec 2011 02:05:21 -0500
+Subject: [PATCH] Add NotShowIn=KDE to .desktop files
+
+We do not want to autostart nm-applet in KDE, it has native tools for
+network configuration. But we still want to auto-start in other DEs like
+XFCE, and if we auto-start there, then we should show the connection
+editor there.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660046
+---
+ nm-applet.desktop.in            |    1 +
+ nm-connection-editor.desktop.in |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/nm-applet.desktop.in b/nm-applet.desktop.in
+index 4eb669a..0cda7e1 100644
+--- a/nm-applet.desktop.in
++++ b/nm-applet.desktop.in
+@@ -6,6 +6,7 @@ Exec=nm-applet
+ Terminal=false
+ Type=Application
+ NoDisplay=true
++NotShowIn=KDE;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=NetworkManager
+ X-GNOME-Bugzilla-Component=general
+diff --git a/nm-connection-editor.desktop.in b/nm-connection-editor.desktop.in
+index 664200e..b3e469f 100644
+--- a/nm-connection-editor.desktop.in
++++ b/nm-connection-editor.desktop.in
+@@ -10,4 +10,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=NetworkManager
+ X-GNOME-Bugzilla-Component=general
+ Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
+-OnlyShowIn=GNOME;
++NotShowIn=KDE;
+-- 
+1.7.8
+
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.2.0-r1.ebuild
index eb1b0af96221..369e5e97dd9a 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.2.0-r1.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.2.0-r1.ebuild,v 1.1 2011/12/14 07:40:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
@@ -47,7 +47,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix building with glib-2.31, will be in next release
-	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+	# bug #394379, https://bugzilla.gnome.org/show_bug.cgi?id=660046
+	epatch "${FILESDIR}/${PN}-0.9.2.0-not-show-in-kde.patch"
+
 	gnome2_src_prepare
 }