diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-06-15 11:57:42 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-16 21:09:04 +0200 |
commit | f3f6e2bbc0beeed3d3dc8e82f1044659cbfd2125 (patch) | |
tree | 61e8285eef48c25ae580803b493d79234b3a3f37 /meta-gnome/recipes-connectivity | |
parent | dd9d09945da519fa67a5da61b48c4ddd534f078a (diff) | |
download | meta-openembedded-contrib-f3f6e2bbc0beeed3d3dc8e82f1044659cbfd2125.tar.gz |
network-manager-applet: update to 1.0.2
note that 1.x only supports gtk3
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-gnome/recipes-connectivity')
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch (renamed from meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch) | 0 | ||||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch | 41 | ||||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch (renamed from meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch) | 2 | ||||
-rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb (renamed from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb) | 16 |
4 files changed, 6 insertions, 53 deletions
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch index d0506b2e8e..d0506b2e8e 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch 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 deleted file mode 100644 index 4bd0e4ffa3..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c7d75ce38fa392c04c39a75e7b7e068666a7b1e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -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 - -unsupported classes caused nm-connection editor to crash - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - 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 b05f0df..049432b 100644 ---- a/src/connection-editor/ce-page-general.ui -+++ b/src/connection-editor/ce-page-general.ui -@@ -37,8 +37,6 @@ - <object class="GtkComboBox" id="dependent_vpn_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="margin_left">26</property> -- <property name="margin_bottom">12</property> - <property name="model">dependent_vpn_model</property> - <child> - <object class="GtkCellRendererText" id="renderer1"/> -@@ -59,7 +57,6 @@ - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> -- <property name="margin_bottom">12</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> --- -1.8.3.1 - diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch index e2156463dd..4e3d7e2da1 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch @@ -28,7 +28,7 @@ index 3532caa..ca72c96 100644 + g_object_unref (*device); + } + - if (priv->adhoc_create) { + if (priv->operation == OP_CREATE_ADHOC) { NMSettingIP4Config *s_ip4; - g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL); diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb index 72c9ae6ccd..210b5b2b0c 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb @@ -2,24 +2,18 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes" +DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes" inherit gnomebase gsettings gtk-icon-cache GNOME_COMPRESS_TYPE = "xz" SRC_URI += " \ - file://0001-remove-classes-and-properties-which-are-not-supporte.patch \ - file://0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \ - file://0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \ -" -SRC_URI[archive.md5sum] = "5148348c139229c6a753f815f3f11e1c" -SRC_URI[archive.sha256sum] = "46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb" - -# GTK2.x mode -EXTRA_OECONF += " \ - --with-gtkver=2 \ + file://0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \ + file://0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \ " +SRC_URI[archive.md5sum] = "5b2a8baa6b038b3e55e5444ff321e80d" +SRC_URI[archive.sha256sum] = "760af85b43fa5bcf74b96f899a6d4c1d5e9445e5eb63088c49e5164bbf88d9a9" PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth" PACKAGECONFIG[modemmanager] = "--with-modem-manager-1,--without-modem-manager-1,modemmanager" |