From f3f6e2bbc0beeed3d3dc8e82f1044659cbfd2125 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 15 Jun 2015 11:57:42 +0200 Subject: network-manager-applet: update to 1.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit note that 1.x only supports gtk3 Signed-off-by: Andreas Müller --- ...port-for-AP-mode-setting-for-wifi-sharing.patch | 128 +++++++++++++++++++++ ...ses-and-properties-which-are-not-supporte.patch | 41 ------- ...port-for-AP-mode-setting-for-wifi-sharing.patch | 128 --------------------- ...for-network-sharing-if-device-supports-it.patch | 48 ++++++++ ...for-network-sharing-if-device-supports-it.patch | 48 -------- .../network-manager-applet_0.9.8.10.bb | 46 -------- .../network-manager-applet_1.0.2.bb | 40 +++++++ 7 files changed, 216 insertions(+), 263 deletions(-) create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-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 new file mode 100644 index 0000000000..d0506b2e8e --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch @@ -0,0 +1,128 @@ +From d789ef88a8806887bf1160bfa5d3d9eb47b6216c Mon Sep 17 00:00:00 2001 +From: "Marius B. Kotsbak" +Date: Mon, 11 Aug 2014 22:11:52 +0200 +Subject: [PATCH] Add support for AP mode setting for wifi sharing. + +Upstream-Status: Pending [1] + +[1] https://bugzilla.gnome.org/show_bug.cgi?id=734589 +--- + src/connection-editor/ce-page-wifi.ui | 3 +++ + src/connection-editor/page-wifi.c | 46 ++++++++++++++++++++--------------- + 2 files changed, 30 insertions(+), 19 deletions(-) + +diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui +index e2e544b..b8b27c1 100644 +--- a/src/connection-editor/ce-page-wifi.ui ++++ b/src/connection-editor/ce-page-wifi.ui +@@ -50,6 +50,9 @@ + + Ad-hoc + ++ ++ Shared AP ++ + + + +diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c +index d0a5617..17db2fa 100644 +--- a/src/connection-editor/page-wifi.c ++++ b/src/connection-editor/page-wifi.c +@@ -59,6 +59,12 @@ typedef struct { + gboolean disposed; + } CEPageWifiPrivate; + ++enum { ++ WIFI_MODE_INFRASTRUCTURE, ++ WIFI_MODE_ADHOC, ++ WIFI_MODE_AP ++}; ++ + static void + wifi_private_init (CEPageWifi *self) + { +@@ -244,22 +250,16 @@ mode_combo_changed_cb (GtkComboBox *combo, + CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); + CEPage *parent = CE_PAGE (self); + GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label; +- gboolean adhoc; ++ gint wifi_mode; ++ gboolean shared_wifi; + +- switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) { +- case 1: /* adhoc */ +- adhoc = TRUE; +- break; +- default: /* infrastructure */ +- adhoc = FALSE; +- break; +- } ++ wifi_mode = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + + widget_band_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_band_label")); + widget_chan_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_channel_label")); + widget_bssid_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_bssid_label")); + +- if (adhoc) { ++ if (WIFI_MODE_ADHOC == wifi_mode || WIFI_MODE_AP == wifi_mode) { + /* For Ad-Hoc show Band and Channel */ + gtk_widget_show (widget_band_label); + gtk_widget_show (GTK_WIDGET (priv->band)); +@@ -283,12 +283,13 @@ mode_combo_changed_cb (GtkComboBox *combo, + gtk_widget_show (GTK_WIDGET (priv->bssid)); + } + +- gtk_widget_set_sensitive (widget_band_label, adhoc); +- gtk_widget_set_sensitive (GTK_WIDGET (priv->band), adhoc); +- gtk_widget_set_sensitive (widget_chan_label, adhoc); +- gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), adhoc); +- gtk_widget_set_sensitive (widget_bssid_label, !adhoc); +- gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !adhoc); ++ shared_wifi = wifi_mode != WIFI_MODE_INFRASTRUCTURE; ++ gtk_widget_set_sensitive (widget_band_label, shared_wifi); ++ gtk_widget_set_sensitive (GTK_WIDGET (priv->band), shared_wifi); ++ gtk_widget_set_sensitive (widget_chan_label, shared_wifi); ++ gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), shared_wifi); ++ gtk_widget_set_sensitive (widget_bssid_label, !shared_wifi); ++ gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !shared_wifi); + + ce_page_changed (CE_PAGE (self)); + } +@@ -348,9 +349,12 @@ populate_ui (CEPageWifi *self) + g_byte_array_free (ssid, TRUE); + + /* Default to Infrastructure */ +- gtk_combo_box_set_active (priv->mode, 0); ++ gtk_combo_box_set_active (priv->mode, WIFI_MODE_INFRASTRUCTURE); + if (mode && !strcmp (mode, "adhoc")) +- gtk_combo_box_set_active (priv->mode, 1); ++ gtk_combo_box_set_active (priv->mode, WIFI_MODE_ADHOC); ++ else if (mode && !strcmp (mode, "ap")) ++ gtk_combo_box_set_active (priv->mode, WIFI_MODE_AP); ++ + mode_combo_changed_cb (priv->mode, self); + g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self); + g_free (mode); +@@ -510,14 +514,18 @@ ui_to_setting (CEPageWifi *self) + GByteArray *bssid = NULL; + GByteArray *device_mac = NULL; + GByteArray *cloned_mac = NULL; ++ gint wifi_mode; + const char *mode; + const char *band; + GtkWidget *entry; + + ssid = ce_page_wifi_get_ssid (self); + +- if (gtk_combo_box_get_active (priv->mode) == 1) ++ wifi_mode = gtk_combo_box_get_active (priv->mode); ++ if (WIFI_MODE_ADHOC == wifi_mode) + mode = "adhoc"; ++ else if (WIFI_MODE_AP == wifi_mode) ++ mode = "ap"; + else + mode = "infrastructure"; + +-- +1.9.1 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?= -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 ---- - 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 @@ - - True - False -- 26 -- 12 - dependent_vpn_model - - -@@ -59,7 +57,6 @@ - True - True - False -- 12 - True - 0 - True --- -1.8.3.1 - 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/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch deleted file mode 100644 index d0506b2e8e..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch +++ /dev/null @@ -1,128 +0,0 @@ -From d789ef88a8806887bf1160bfa5d3d9eb47b6216c Mon Sep 17 00:00:00 2001 -From: "Marius B. Kotsbak" -Date: Mon, 11 Aug 2014 22:11:52 +0200 -Subject: [PATCH] Add support for AP mode setting for wifi sharing. - -Upstream-Status: Pending [1] - -[1] https://bugzilla.gnome.org/show_bug.cgi?id=734589 ---- - src/connection-editor/ce-page-wifi.ui | 3 +++ - src/connection-editor/page-wifi.c | 46 ++++++++++++++++++++--------------- - 2 files changed, 30 insertions(+), 19 deletions(-) - -diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui -index e2e544b..b8b27c1 100644 ---- a/src/connection-editor/ce-page-wifi.ui -+++ b/src/connection-editor/ce-page-wifi.ui -@@ -50,6 +50,9 @@ - - Ad-hoc - -+ -+ Shared AP -+ - - - -diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c -index d0a5617..17db2fa 100644 ---- a/src/connection-editor/page-wifi.c -+++ b/src/connection-editor/page-wifi.c -@@ -59,6 +59,12 @@ typedef struct { - gboolean disposed; - } CEPageWifiPrivate; - -+enum { -+ WIFI_MODE_INFRASTRUCTURE, -+ WIFI_MODE_ADHOC, -+ WIFI_MODE_AP -+}; -+ - static void - wifi_private_init (CEPageWifi *self) - { -@@ -244,22 +250,16 @@ mode_combo_changed_cb (GtkComboBox *combo, - CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); - CEPage *parent = CE_PAGE (self); - GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label; -- gboolean adhoc; -+ gint wifi_mode; -+ gboolean shared_wifi; - -- switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) { -- case 1: /* adhoc */ -- adhoc = TRUE; -- break; -- default: /* infrastructure */ -- adhoc = FALSE; -- break; -- } -+ wifi_mode = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); - - widget_band_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_band_label")); - widget_chan_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_channel_label")); - widget_bssid_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_bssid_label")); - -- if (adhoc) { -+ if (WIFI_MODE_ADHOC == wifi_mode || WIFI_MODE_AP == wifi_mode) { - /* For Ad-Hoc show Band and Channel */ - gtk_widget_show (widget_band_label); - gtk_widget_show (GTK_WIDGET (priv->band)); -@@ -283,12 +283,13 @@ mode_combo_changed_cb (GtkComboBox *combo, - gtk_widget_show (GTK_WIDGET (priv->bssid)); - } - -- gtk_widget_set_sensitive (widget_band_label, adhoc); -- gtk_widget_set_sensitive (GTK_WIDGET (priv->band), adhoc); -- gtk_widget_set_sensitive (widget_chan_label, adhoc); -- gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), adhoc); -- gtk_widget_set_sensitive (widget_bssid_label, !adhoc); -- gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !adhoc); -+ shared_wifi = wifi_mode != WIFI_MODE_INFRASTRUCTURE; -+ gtk_widget_set_sensitive (widget_band_label, shared_wifi); -+ gtk_widget_set_sensitive (GTK_WIDGET (priv->band), shared_wifi); -+ gtk_widget_set_sensitive (widget_chan_label, shared_wifi); -+ gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), shared_wifi); -+ gtk_widget_set_sensitive (widget_bssid_label, !shared_wifi); -+ gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !shared_wifi); - - ce_page_changed (CE_PAGE (self)); - } -@@ -348,9 +349,12 @@ populate_ui (CEPageWifi *self) - g_byte_array_free (ssid, TRUE); - - /* Default to Infrastructure */ -- gtk_combo_box_set_active (priv->mode, 0); -+ gtk_combo_box_set_active (priv->mode, WIFI_MODE_INFRASTRUCTURE); - if (mode && !strcmp (mode, "adhoc")) -- gtk_combo_box_set_active (priv->mode, 1); -+ gtk_combo_box_set_active (priv->mode, WIFI_MODE_ADHOC); -+ else if (mode && !strcmp (mode, "ap")) -+ gtk_combo_box_set_active (priv->mode, WIFI_MODE_AP); -+ - mode_combo_changed_cb (priv->mode, self); - g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self); - g_free (mode); -@@ -510,14 +514,18 @@ ui_to_setting (CEPageWifi *self) - GByteArray *bssid = NULL; - GByteArray *device_mac = NULL; - GByteArray *cloned_mac = NULL; -+ gint wifi_mode; - const char *mode; - const char *band; - GtkWidget *entry; - - ssid = ce_page_wifi_get_ssid (self); - -- if (gtk_combo_box_get_active (priv->mode) == 1) -+ wifi_mode = gtk_combo_box_get_active (priv->mode); -+ if (WIFI_MODE_ADHOC == wifi_mode) - mode = "adhoc"; -+ else if (WIFI_MODE_AP == wifi_mode) -+ mode = "ap"; - else - mode = "infrastructure"; - --- -1.9.1 diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-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 new file mode 100644 index 0000000000..4e3d7e2da1 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch @@ -0,0 +1,48 @@ +From 7343b16113e378d04e40012abfe5bd96ca776968 Mon Sep 17 00:00:00 2001 +From: "Marius B. Kotsbak" +Date: Tue, 12 Aug 2014 11:15:20 +0200 +Subject: [PATCH 2/2] Use AP mode for network sharing if device supports it. + +Logic taken from similar functionality in gnome-control-center. + +Upstream-Status: Backport [1] + +[1] https://bug734589.bugzilla-attachments.gnome.org/attachment.cgi?id=283165 +--- + src/libnm-gtk/nm-wifi-dialog.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c +index 3532caa..ca72c96 100644 +--- a/src/libnm-gtk/nm-wifi-dialog.c ++++ b/src/libnm-gtk/nm-wifi-dialog.c +@@ -1226,10 +1226,26 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self, + s_wireless = (NMSettingWireless *) nm_setting_wireless_new (); + g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, validate_dialog_ssid (self), NULL); + ++ /* Fill device */ ++ if (device) { ++ combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo")); ++ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter); ++ gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, device, -1); ++ g_object_unref (*device); ++ } ++ + if (priv->operation == OP_CREATE_ADHOC) { + NMSettingIP4Config *s_ip4; + +- g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL); ++ const char *mode; ++ ++ /* Use real AP mode if the device supports it */ ++ if (device && nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (*device)) & NM_WIFI_DEVICE_CAP_AP) ++ mode = NM_SETTING_WIRELESS_MODE_AP; ++ else ++ mode = NM_SETTING_WIRELESS_MODE_ADHOC; ++ ++ g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, mode, NULL); + + s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); + g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL); +-- +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/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch deleted file mode 100644 index e2156463dd..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7343b16113e378d04e40012abfe5bd96ca776968 Mon Sep 17 00:00:00 2001 -From: "Marius B. Kotsbak" -Date: Tue, 12 Aug 2014 11:15:20 +0200 -Subject: [PATCH 2/2] Use AP mode for network sharing if device supports it. - -Logic taken from similar functionality in gnome-control-center. - -Upstream-Status: Backport [1] - -[1] https://bug734589.bugzilla-attachments.gnome.org/attachment.cgi?id=283165 ---- - src/libnm-gtk/nm-wifi-dialog.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c -index 3532caa..ca72c96 100644 ---- a/src/libnm-gtk/nm-wifi-dialog.c -+++ b/src/libnm-gtk/nm-wifi-dialog.c -@@ -1226,10 +1226,26 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self, - s_wireless = (NMSettingWireless *) nm_setting_wireless_new (); - g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, validate_dialog_ssid (self), NULL); - -+ /* Fill device */ -+ if (device) { -+ combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo")); -+ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter); -+ gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, device, -1); -+ g_object_unref (*device); -+ } -+ - if (priv->adhoc_create) { - NMSettingIP4Config *s_ip4; - -- g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL); -+ const char *mode; -+ -+ /* Use real AP mode if the device supports it */ -+ if (device && nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (*device)) & NM_WIFI_DEVICE_CAP_AP) -+ mode = NM_SETTING_WIRELESS_MODE_AP; -+ else -+ mode = NM_SETTING_WIRELESS_MODE_ADHOC; -+ -+ g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, mode, NULL); - - s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); - g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL); --- -1.8.3.1 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_0.9.8.10.bb deleted file mode 100644 index 72c9ae6ccd..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb +++ /dev/null @@ -1,46 +0,0 @@ -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" - -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 \ -" - -PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1,--without-modem-manager-1,modemmanager" -PACKAGECONFIG ??= "" - -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s:-Werror::g $i - done -} - -RDEPENDS_${PN} =+ "networkmanager" -RRECOMMENDS_${PN} =+ "gnome-keyring" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnm-gtk/wifi.ui \ -" - -FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so" -FILES_${PN}-dev += "${libdir}/gnome-bluetooth/plugins/libnma.la" -FILES_${PN}-staticdev += "${libdir}/gnome-bluetooth/plugins/libnma.a" -FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb new file mode 100644 index 0000000000..210b5b2b0c --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb @@ -0,0 +1,40 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +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-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" +PACKAGECONFIG ??= "" + +do_configure_append() { + # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror + for i in $(find ${B} -name "Makefile") ; do + sed -i -e s:-Werror::g $i + done +} + +RDEPENDS_${PN} =+ "networkmanager" +RRECOMMENDS_${PN} =+ "gnome-keyring" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnm-gtk/wifi.ui \ +" + +FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so" +FILES_${PN}-dev += "${libdir}/gnome-bluetooth/plugins/libnma.la" +FILES_${PN}-staticdev += "${libdir}/gnome-bluetooth/plugins/libnma.a" +FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" -- cgit 1.2.3-korg