network-manager-applet: update to 0.9.8.10

* add libsecret to DEPENDS
* remove libglade from DEPENDS
* wireless (nm-signal-*.png) icons were updated upstream
* inherit gnomebase instead of gnome
* make bluetooth PACKAGECONFIG - disabled by default

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

7 files changed, 15 insertions, 48 deletions

diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
index b8ba181f5..4bd0e4ffa 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
@@ -1,8 +1,7 @@
-From 023b17f53d888dfb45981b141ce4dc151ab140f0 Mon Sep 17 00:00:00 2001
+From c7d75ce38fa392c04c39a75e7b7e068666a7b1e7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 4 Apr 2013 20:23:00 +0200
-Subject: [PATCH] remove classes and properties which are not supported by
- gtk+
+Date: Tue, 8 Apr 2014 15:22:54 +0200
+Subject: [PATCH] remove classes and properties which are not supported by gtk+
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,12 +12,11 @@ Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/connection-editor/ce-page-general.ui      |    7 +------
- src/connection-editor/nm-connection-editor.ui |    2 +-
- 2 files changed, 2 insertions(+), 7 deletions(-)
+ src/connection-editor/ce-page-general.ui | 3 ---
+ 1 file changed, 3 deletions(-)
 
 diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
-index f505c14..a3e8d2b 100644
+index b05f0df..049432b 100644
 --- a/src/connection-editor/ce-page-general.ui
 +++ b/src/connection-editor/ce-page-general.ui
 @@ -37,8 +37,6 @@
@@ -38,32 +36,6 @@ index f505c14..a3e8d2b 100644
          <property name="use_underline">True</property>
          <property name="xalign">0</property>
          <property name="draw_indicator">True</property>
-@@ -86,11 +83,9 @@
-       </packing>
-     </child>
-     <child>
--      <object class="GtkBox" id="box2">
-+      <object class="GtkVBox" id="box2">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
--        <property name="valign">start</property>
--        <property name="vexpand">True</property>
-         <property name="spacing">6</property>
-         <child>
-           <object class="GtkLabel" id="firewall_zone_label">
-diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui
-index 74ee266..6f1e166 100644
---- a/src/connection-editor/nm-connection-editor.ui
-+++ b/src/connection-editor/nm-connection-editor.ui
-@@ -11,7 +11,7 @@
-     <property name="icon_name">preferences-system-network</property>
-     <property name="type_hint">dialog</property>
-     <child internal-child="vbox">
--      <object class="GtkBox" id="dialog-vbox2">
-+      <object class="GtkVBox" id="dialog-vbox2">
-         <property name="visible">True</property>
-         <property name="can_focus">False</property>
-         <property name="orientation">vertical</property>
 -- 
-1.7.6.5
+1.8.3.1
 
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png
deleted file mode 100644
index 836e723a2..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png
+++ /dev/null
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png
deleted file mode 100644
index def2da969..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png
+++ /dev/null
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png
deleted file mode 100644
index 362960b8e..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png
+++ /dev/null
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png
deleted file mode 100644
index 1add41dcb..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png
+++ /dev/null
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png
deleted file mode 100644
index 6b509e804..000000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png
+++ /dev/null
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
index 95c680278..e3c76638c 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
@@ -2,27 +2,26 @@ SUMMARY = "GTK+ applet for NetworkManager"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PNBLACKLIST[network-manager-applet] = "BROKEN: depends on broken networkmanager"
+DEPENDS = "polkit-gnome libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes"
 
-DEPENDS = "gnome-bluetooth polkit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring libgnome-keyring iso-codes"
-
-inherit gnome gtk-icon-cache
+inherit gnomebase gtk-icon-cache
 
 GNOME_COMPRESS_TYPE = "xz"
 
 SRC_URI += " \
     file://0001-remove-classes-and-properties-which-are-not-supporte.patch \
-    file://images/* \
 "
-SRC_URI[archive.md5sum] = "531ce56c51ec86c5d2dc4cbe58649583"
-SRC_URI[archive.sha256sum] = "1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590"
+SRC_URI[archive.md5sum] = "5148348c139229c6a753f815f3f11e1c"
+SRC_URI[archive.sha256sum] = "46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb"
 
 # GTK2.x mode
 EXTRA_OECONF += " \
     --with-gtkver=2 \
-    --with-bluetooth=yes \
 "
 
+PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth"
+PACKAGECONFIG ??= ""
+
 do_configure_append() {
     rm config.log
     # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
@@ -31,12 +30,8 @@ do_configure_append() {
     done
 }
 
-do_install_append() {
-    install -m 0644 ${WORKDIR}/icons/* ${D}/usr/share/icons/hicolor/22x22/apps/
-}
-
 RDEPENDS_${PN} =+ "networkmanager"
-RRECOMMENDS_${PN} =+ "gnome-bluetooth gnome-keyring"
+RRECOMMENDS_${PN} =+ "gnome-keyring"
 
 FILES_${PN} += " \
     ${datadir}/nm-applet/ \