diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-04-25 16:16:02 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-27 11:49:47 +0200 |
commit | 47ad5b8d9eeeb0dcfbe1ccf232d12ccf4d25bd84 (patch) | |
tree | 88ec08fe16a1d672daaf62b69db6988adcfb6a7b /meta-gnome/recipes-connectivity/network-manager-applet | |
parent | 597fe7945b250dd05b3435744c55c4213909a179 (diff) | |
download | meta-openembedded-47ad5b8d9eeeb0dcfbe1ccf232d12ccf4d25bd84.tar.gz |
network-manager-applet: update to 0.9.8.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-connectivity/network-manager-applet')
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch | 69 | ||||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png | bin | 0 -> 494 bytes | |||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png | bin | 0 -> 413 bytes | |||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png | bin | 0 -> 500 bytes | |||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png | bin | 0 -> 496 bytes | |||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png | bin | 0 -> 474 bytes | |||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb | 48 |
7 files changed, 117 insertions, 0 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 new file mode 100644 index 000000000..b8ba181f5 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From 023b17f53d888dfb45981b141ce4dc151ab140f0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 4 Apr 2013 20:23:00 +0200 | ||
4 | Subject: [PATCH] remove classes and properties which are not supported by | ||
5 | gtk+ | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | unsupported classes caused nm-connection editor to crash | ||
11 | |||
12 | Upstream-Status: Inappropriate [configuration] | ||
13 | |||
14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
15 | --- | ||
16 | src/connection-editor/ce-page-general.ui | 7 +------ | ||
17 | src/connection-editor/nm-connection-editor.ui | 2 +- | ||
18 | 2 files changed, 2 insertions(+), 7 deletions(-) | ||
19 | |||
20 | diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui | ||
21 | index f505c14..a3e8d2b 100644 | ||
22 | --- a/src/connection-editor/ce-page-general.ui | ||
23 | +++ b/src/connection-editor/ce-page-general.ui | ||
24 | @@ -37,8 +37,6 @@ | ||
25 | <object class="GtkComboBox" id="dependent_vpn_combo"> | ||
26 | <property name="visible">True</property> | ||
27 | <property name="can_focus">False</property> | ||
28 | - <property name="margin_left">26</property> | ||
29 | - <property name="margin_bottom">12</property> | ||
30 | <property name="model">dependent_vpn_model</property> | ||
31 | <child> | ||
32 | <object class="GtkCellRendererText" id="renderer1"/> | ||
33 | @@ -59,7 +57,6 @@ | ||
34 | <property name="visible">True</property> | ||
35 | <property name="can_focus">True</property> | ||
36 | <property name="receives_default">False</property> | ||
37 | - <property name="margin_bottom">12</property> | ||
38 | <property name="use_underline">True</property> | ||
39 | <property name="xalign">0</property> | ||
40 | <property name="draw_indicator">True</property> | ||
41 | @@ -86,11 +83,9 @@ | ||
42 | </packing> | ||
43 | </child> | ||
44 | <child> | ||
45 | - <object class="GtkBox" id="box2"> | ||
46 | + <object class="GtkVBox" id="box2"> | ||
47 | <property name="visible">True</property> | ||
48 | <property name="can_focus">False</property> | ||
49 | - <property name="valign">start</property> | ||
50 | - <property name="vexpand">True</property> | ||
51 | <property name="spacing">6</property> | ||
52 | <child> | ||
53 | <object class="GtkLabel" id="firewall_zone_label"> | ||
54 | diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui | ||
55 | index 74ee266..6f1e166 100644 | ||
56 | --- a/src/connection-editor/nm-connection-editor.ui | ||
57 | +++ b/src/connection-editor/nm-connection-editor.ui | ||
58 | @@ -11,7 +11,7 @@ | ||
59 | <property name="icon_name">preferences-system-network</property> | ||
60 | <property name="type_hint">dialog</property> | ||
61 | <child internal-child="vbox"> | ||
62 | - <object class="GtkBox" id="dialog-vbox2"> | ||
63 | + <object class="GtkVBox" id="dialog-vbox2"> | ||
64 | <property name="visible">True</property> | ||
65 | <property name="can_focus">False</property> | ||
66 | <property name="orientation">vertical</property> | ||
67 | -- | ||
68 | 1.7.6.5 | ||
69 | |||
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 new file mode 100644 index 000000000..836e723a2 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png | |||
Binary files differ | |||
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 new file mode 100644 index 000000000..def2da969 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png | |||
Binary files differ | |||
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 new file mode 100644 index 000000000..362960b8e --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png | |||
Binary files differ | |||
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 new file mode 100644 index 000000000..1add41dcb --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png | |||
Binary files differ | |||
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 new file mode 100644 index 000000000..6b509e804 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png | |||
Binary files differ | |||
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.0.bb new file mode 100644 index 000000000..7dca91c14 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb | |||
@@ -0,0 +1,48 @@ | |||
1 | DESCRIPTION = "GTK+ applet for NetworkManager" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | DEPENDS = "gnome-bluetooth polkit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring libgnome-keyring iso-codes" | ||
6 | |||
7 | inherit gnome gtk-icon-cache | ||
8 | |||
9 | GNOME_COMPRESS_TYPE = "xz" | ||
10 | |||
11 | SRC_URI += " \ | ||
12 | file://0001-remove-classes-and-properties-which-are-not-supporte.patch \ | ||
13 | file://images/* \ | ||
14 | " | ||
15 | SRC_URI[archive.md5sum] = "531ce56c51ec86c5d2dc4cbe58649583" | ||
16 | SRC_URI[archive.sha256sum] = "1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590" | ||
17 | |||
18 | # GTK2.x mode | ||
19 | EXTRA_OECONF += " \ | ||
20 | --with-gtkver=2 \ | ||
21 | --with-bluetooth=yes \ | ||
22 | " | ||
23 | |||
24 | do_configure_append() { | ||
25 | rm config.log | ||
26 | # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror | ||
27 | for i in $(find ${S} -name "Makefile") ; do | ||
28 | sed -i -e s:-Werror::g $i | ||
29 | done | ||
30 | } | ||
31 | |||
32 | do_install_append() { | ||
33 | install -m 0644 ${WORKDIR}/icons/* ${D}/usr/share/icons/hicolor/22x22/apps/ | ||
34 | } | ||
35 | |||
36 | RDEPENDS_${PN} =+ "networkmanager" | ||
37 | RRECOMMENDS_${PN} =+ "gnome-bluetooth gnome-keyring" | ||
38 | |||
39 | FILES_${PN} += " \ | ||
40 | ${datadir}/nm-applet/ \ | ||
41 | ${datadir}/libnm-gtk/wifi.ui \ | ||
42 | " | ||
43 | |||
44 | FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so" | ||
45 | FILES_${PN}-dev += "${libdir}/gnome-bluetooth/plugins/libnma.la" | ||
46 | FILES_${PN}-staticdev += "${libdir}/gnome-bluetooth/plugins/libnma.a" | ||
47 | FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" | ||
48 | |||