summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-connectivity
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
commit1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch)
treea21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-gnome/recipes-connectivity
downloadmeta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-gnome/recipes-connectivity')
-rw-r--r--meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch41
-rw-r--r--meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch128
-rw-r--r--meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch48
-rw-r--r--meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb45
-rw-r--r--meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch32
-rw-r--r--meta-gnome/recipes-connectivity/obex/obexd_0.48.bb24
6 files changed, 318 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..4bd0e4ffa
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
@@ -0,0 +1,41 @@
1From c7d75ce38fa392c04c39a75e7b7e068666a7b1e7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 8 Apr 2014 15:22:54 +0200
4Subject: [PATCH] remove classes and properties which are not supported by gtk+
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9unsupported classes caused nm-connection editor to crash
10
11Upstream-Status: Inappropriate [configuration]
12
13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
14---
15 src/connection-editor/ce-page-general.ui | 3 ---
16 1 file changed, 3 deletions(-)
17
18diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
19index b05f0df..049432b 100644
20--- a/src/connection-editor/ce-page-general.ui
21+++ b/src/connection-editor/ce-page-general.ui
22@@ -37,8 +37,6 @@
23 <object class="GtkComboBox" id="dependent_vpn_combo">
24 <property name="visible">True</property>
25 <property name="can_focus">False</property>
26- <property name="margin_left">26</property>
27- <property name="margin_bottom">12</property>
28 <property name="model">dependent_vpn_model</property>
29 <child>
30 <object class="GtkCellRendererText" id="renderer1"/>
31@@ -59,7 +57,6 @@
32 <property name="visible">True</property>
33 <property name="can_focus">True</property>
34 <property name="receives_default">False</property>
35- <property name="margin_bottom">12</property>
36 <property name="use_underline">True</property>
37 <property name="xalign">0</property>
38 <property name="draw_indicator">True</property>
39--
401.8.3.1
41
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
new file mode 100644
index 000000000..d0506b2e8
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch
@@ -0,0 +1,128 @@
1From d789ef88a8806887bf1160bfa5d3d9eb47b6216c Mon Sep 17 00:00:00 2001
2From: "Marius B. Kotsbak" <marius@kotsbak.com>
3Date: Mon, 11 Aug 2014 22:11:52 +0200
4Subject: [PATCH] Add support for AP mode setting for wifi sharing.
5
6Upstream-Status: Pending [1]
7
8[1] https://bugzilla.gnome.org/show_bug.cgi?id=734589
9---
10 src/connection-editor/ce-page-wifi.ui | 3 +++
11 src/connection-editor/page-wifi.c | 46 ++++++++++++++++++++---------------
12 2 files changed, 30 insertions(+), 19 deletions(-)
13
14diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui
15index e2e544b..b8b27c1 100644
16--- a/src/connection-editor/ce-page-wifi.ui
17+++ b/src/connection-editor/ce-page-wifi.ui
18@@ -50,6 +50,9 @@
19 <row>
20 <col id="0" translatable="yes">Ad-hoc</col>
21 </row>
22+ <row>
23+ <col id="0" translatable="yes">Shared AP</col>
24+ </row>
25 </data>
26 </object>
27 <object class="GtkTable" id="WifiPage">
28diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
29index d0a5617..17db2fa 100644
30--- a/src/connection-editor/page-wifi.c
31+++ b/src/connection-editor/page-wifi.c
32@@ -59,6 +59,12 @@ typedef struct {
33 gboolean disposed;
34 } CEPageWifiPrivate;
35
36+enum {
37+ WIFI_MODE_INFRASTRUCTURE,
38+ WIFI_MODE_ADHOC,
39+ WIFI_MODE_AP
40+};
41+
42 static void
43 wifi_private_init (CEPageWifi *self)
44 {
45@@ -244,22 +250,16 @@ mode_combo_changed_cb (GtkComboBox *combo,
46 CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self);
47 CEPage *parent = CE_PAGE (self);
48 GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label;
49- gboolean adhoc;
50+ gint wifi_mode;
51+ gboolean shared_wifi;
52
53- switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) {
54- case 1: /* adhoc */
55- adhoc = TRUE;
56- break;
57- default: /* infrastructure */
58- adhoc = FALSE;
59- break;
60- }
61+ wifi_mode = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
62
63 widget_band_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_band_label"));
64 widget_chan_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_channel_label"));
65 widget_bssid_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_bssid_label"));
66
67- if (adhoc) {
68+ if (WIFI_MODE_ADHOC == wifi_mode || WIFI_MODE_AP == wifi_mode) {
69 /* For Ad-Hoc show Band and Channel */
70 gtk_widget_show (widget_band_label);
71 gtk_widget_show (GTK_WIDGET (priv->band));
72@@ -283,12 +283,13 @@ mode_combo_changed_cb (GtkComboBox *combo,
73 gtk_widget_show (GTK_WIDGET (priv->bssid));
74 }
75
76- gtk_widget_set_sensitive (widget_band_label, adhoc);
77- gtk_widget_set_sensitive (GTK_WIDGET (priv->band), adhoc);
78- gtk_widget_set_sensitive (widget_chan_label, adhoc);
79- gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), adhoc);
80- gtk_widget_set_sensitive (widget_bssid_label, !adhoc);
81- gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !adhoc);
82+ shared_wifi = wifi_mode != WIFI_MODE_INFRASTRUCTURE;
83+ gtk_widget_set_sensitive (widget_band_label, shared_wifi);
84+ gtk_widget_set_sensitive (GTK_WIDGET (priv->band), shared_wifi);
85+ gtk_widget_set_sensitive (widget_chan_label, shared_wifi);
86+ gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), shared_wifi);
87+ gtk_widget_set_sensitive (widget_bssid_label, !shared_wifi);
88+ gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !shared_wifi);
89
90 ce_page_changed (CE_PAGE (self));
91 }
92@@ -348,9 +349,12 @@ populate_ui (CEPageWifi *self)
93 g_byte_array_free (ssid, TRUE);
94
95 /* Default to Infrastructure */
96- gtk_combo_box_set_active (priv->mode, 0);
97+ gtk_combo_box_set_active (priv->mode, WIFI_MODE_INFRASTRUCTURE);
98 if (mode && !strcmp (mode, "adhoc"))
99- gtk_combo_box_set_active (priv->mode, 1);
100+ gtk_combo_box_set_active (priv->mode, WIFI_MODE_ADHOC);
101+ else if (mode && !strcmp (mode, "ap"))
102+ gtk_combo_box_set_active (priv->mode, WIFI_MODE_AP);
103+
104 mode_combo_changed_cb (priv->mode, self);
105 g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self);
106 g_free (mode);
107@@ -510,14 +514,18 @@ ui_to_setting (CEPageWifi *self)
108 GByteArray *bssid = NULL;
109 GByteArray *device_mac = NULL;
110 GByteArray *cloned_mac = NULL;
111+ gint wifi_mode;
112 const char *mode;
113 const char *band;
114 GtkWidget *entry;
115
116 ssid = ce_page_wifi_get_ssid (self);
117
118- if (gtk_combo_box_get_active (priv->mode) == 1)
119+ wifi_mode = gtk_combo_box_get_active (priv->mode);
120+ if (WIFI_MODE_ADHOC == wifi_mode)
121 mode = "adhoc";
122+ else if (WIFI_MODE_AP == wifi_mode)
123+ mode = "ap";
124 else
125 mode = "infrastructure";
126
127--
1281.9.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
new file mode 100644
index 000000000..e2156463d
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
@@ -0,0 +1,48 @@
1From 7343b16113e378d04e40012abfe5bd96ca776968 Mon Sep 17 00:00:00 2001
2From: "Marius B. Kotsbak" <marius@kotsbak.com>
3Date: Tue, 12 Aug 2014 11:15:20 +0200
4Subject: [PATCH 2/2] Use AP mode for network sharing if device supports it.
5
6Logic taken from similar functionality in gnome-control-center.
7
8Upstream-Status: Backport [1]
9
10[1] https://bug734589.bugzilla-attachments.gnome.org/attachment.cgi?id=283165
11---
12 src/libnm-gtk/nm-wifi-dialog.c | 18 +++++++++++++++++-
13 1 file changed, 17 insertions(+), 1 deletion(-)
14
15diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
16index 3532caa..ca72c96 100644
17--- a/src/libnm-gtk/nm-wifi-dialog.c
18+++ b/src/libnm-gtk/nm-wifi-dialog.c
19@@ -1226,10 +1226,26 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
20 s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
21 g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, validate_dialog_ssid (self), NULL);
22
23+ /* Fill device */
24+ if (device) {
25+ combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo"));
26+ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
27+ gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, device, -1);
28+ g_object_unref (*device);
29+ }
30+
31 if (priv->adhoc_create) {
32 NMSettingIP4Config *s_ip4;
33
34- g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL);
35+ const char *mode;
36+
37+ /* Use real AP mode if the device supports it */
38+ if (device && nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (*device)) & NM_WIFI_DEVICE_CAP_AP)
39+ mode = NM_SETTING_WIRELESS_MODE_AP;
40+ else
41+ mode = NM_SETTING_WIRELESS_MODE_ADHOC;
42+
43+ g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, mode, NULL);
44
45 s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
46 g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL);
47--
481.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
new file mode 100644
index 000000000..663c38cbe
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
@@ -0,0 +1,45 @@
1SUMMARY = "GTK+ applet for NetworkManager"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4
5DEPENDS = "polkit-gnome libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes"
6
7inherit gnomebase gtk-icon-cache
8
9GNOME_COMPRESS_TYPE = "xz"
10
11SRC_URI += " \
12 file://0001-remove-classes-and-properties-which-are-not-supporte.patch \
13 file://0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \
14 file://0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \
15"
16SRC_URI[archive.md5sum] = "5148348c139229c6a753f815f3f11e1c"
17SRC_URI[archive.sha256sum] = "46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb"
18
19# GTK2.x mode
20EXTRA_OECONF += " \
21 --with-gtkver=2 \
22"
23
24PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth"
25PACKAGECONFIG ??= ""
26
27do_configure_append() {
28 # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
29 for i in $(find ${B} -name "Makefile") ; do
30 sed -i -e s:-Werror::g $i
31 done
32}
33
34RDEPENDS_${PN} =+ "networkmanager"
35RRECOMMENDS_${PN} =+ "gnome-keyring"
36
37FILES_${PN} += " \
38 ${datadir}/nm-applet/ \
39 ${datadir}/libnm-gtk/wifi.ui \
40"
41
42FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so"
43FILES_${PN}-dev += "${libdir}/gnome-bluetooth/plugins/libnma.la"
44FILES_${PN}-staticdev += "${libdir}/gnome-bluetooth/plugins/libnma.a"
45FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
diff --git a/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
new file mode 100644
index 000000000..2009dcd22
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
@@ -0,0 +1,32 @@
1include unistd.h to get ssize_t definitions
2
3Fixes errors like
4
5| In file included from plugins/mas.c:36:0:
6| ./src/obex.h:39:1: error: unknown type name 'ssize_t'
7| ./src/obex.h:49:1: error: unknown type name 'ssize_t'
8| ./src/obex.h:50:1: error: unknown type name 'ssize_t'
9| In file included from plugins/mas.c:38:0:
10| ./src/mimetype.h:36:2: error: expected specifier-qualifier-list before 'ssize_t'
11| In file included from plugins/mas.c:39:0:
12| plugins/filesystem.h:24:1: error: unknown type name 'ssize_t'
13| plugins/mas.c:550:1: error: unknown type name 'ssize_t'
14| plugins/mas.c:557:1: error: unknown type name 'ssize_t'
15| plugins/mas.c: In function 'any_read':
16| plugins/mas.c:560:2: error: unknown type name 'ssize_t'
17
18Upstream-Status: Pending
19
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21Index: obexd-0.44/plugins/mas.c
22===================================================================
23--- obexd-0.44.orig/plugins/mas.c 2012-01-11 14:53:53.000000000 -0800
24+++ obexd-0.44/plugins/mas.c 2013-01-08 12:51:12.681882174 -0800
25@@ -29,6 +29,7 @@
26 #include <glib.h>
27 #include <fcntl.h>
28 #include <inttypes.h>
29+#include <unistd.h>
30
31 #include "obexd.h"
32 #include "plugin.h"
diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
new file mode 100644
index 000000000..f28f77b8c
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -0,0 +1,24 @@
1SUMMARY = "OBEX Server and Client"
2# obexd was integrated into bluez5
3DEPENDS = "glib-2.0 dbus bluez4 libical"
4RCONFLICTS_${PN} = "bluez5"
5
6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
8
9
10SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \
11 file://ssize_t_definition.patch \
12"
13SRC_URI[md5sum] = "d03cf9bad2983243837f4f6d76ef14a6"
14SRC_URI[sha256sum] = "eaa9d8d9542700e6750918d72a3ce00f8cf3a2771d3e2516efd1be5a05f78582"
15
16inherit autotools-brokensep pkgconfig
17
18PACKAGES =+ "obex-client obex-plugins"
19
20FILES_${PN} += "${datadir}/dbus-1/services/${PN}.service"
21FILES_obex-client = "${libexecdir}/obex-client \
22 ${datadir}/dbus-1/services/obex-client.service"
23# currently the plugins are empty
24FILES_obex-plugins = "${libdir}/obex/plugins"