sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

connman-gnome 0.5: build from git 

All the local patches were applied upstream, so let's build straight from git to make that clear

(From OE-Core rev: 28246a275a0d7208f0361735685688803965648e)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Koen Kooi 2011-06-12 18:24:18 +02:00 committed by Richard Purdie
parent c69bbc06ac
commit 9017f19857
5 changed files with 4 additions and 4268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
View File

@ -1,19 +0,0 @@
Even if all services are not available, we still need to let user have
the ability to configure network, for example, online/offline, etc.
Therefore enable the callback menu even when status is unavailable.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
diff --git a/applet/status.c b/applet/status.c
index 13ec752..d817f22 100644
--- a/applet/status.c
+++ b/applet/status.c
@@ -231,8 +231,6 @@ void status_unavailable(void)
{
icon_animation_stop(animation);
- available = FALSE;
-
gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_notifier);
gtk_status_icon_set_tooltip(statusicon,
"Connection Manager daemon is not running");

4162
meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
View File

File diff suppressed because it is too large Load Diff

42
meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
View File

@ -1,42 +0,0 @@
diff -ruN connman-gnome-0.5-orig/po/POTFILES.in connman-gnome-0.5/po/POTFILES.in
--- connman-gnome-0.5-orig/po/POTFILES.in 2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/po/POTFILES.in 2010-12-17 10:27:17.000000000 +0800
@@ -4,4 +4,3 @@
properties/advanced.c
properties/ethernet.c
properties/wifi.c
-properties/connman-properties.desktop.in
diff -ruN connman-gnome-0.5-orig/properties/Makefile.am connman-gnome-0.5/properties/Makefile.am
--- connman-gnome-0.5-orig/properties/Makefile.am 2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/properties/Makefile.am 2010-12-17 10:27:09.000000000 +0800
@@ -17,16 +17,6 @@
INCLUDES = -I$(top_srcdir)/common
-desktopdir = $(datadir)/applications
-
-desktop_in_files = connman-properties.desktop.in
-
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(desktop_DATA)
-
-EXTRA_DIST = $(desktop_in_files)
-
MAINTAINERCLEANFILES = Makefile.in
diff -ruN connman-gnome-0.5-orig/properties/connman-properties.desktop.in connman-gnome-0.5/properties/connman-properties.desktop.in
--- connman-gnome-0.5-orig/properties/connman-properties.desktop.in 2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/properties/connman-properties.desktop.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Connection Management
-_Comment=Configure connection management
-Icon=stock_internet
-Exec=connman-properties
-Terminal=false
-Type=Application
-Categories=Settings;
-OnlyShowIn=GNOME;

36
meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
View File

@ -1,36 +0,0 @@
diff -ruN connman-gnome-0.5-orig/common/connman-dbus.h connman-gnome-0.5/common/connman-dbus.h
--- connman-gnome-0.5-orig/common/connman-dbus.h 2010-12-30 09:45:03.312043457 +0800
+++ connman-gnome-0.5/common/connman-dbus.h 2010-12-30 09:45:33.978499439 +0800
@@ -22,7 +22,7 @@
#include <dbus/dbus-glib.h>
#include <gtk/gtk.h>
-#define CONNMAN_SERVICE "org.moblin.connman"
+#define CONNMAN_SERVICE "net.connman"
#define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error"
#define CONNMAN_AGENT_INTERFACE CONNMAN_SERVICE ".Agent"
diff -ruN connman-gnome-0.5-orig/common/instance.c connman-gnome-0.5/common/instance.c
--- connman-gnome-0.5-orig/common/instance.c 2010-12-30 09:45:03.316085542 +0800
+++ connman-gnome-0.5/common/instance.c 2010-12-30 09:46:01.654479049 +0800
@@ -29,7 +29,7 @@
#include "instance.h"
-#define CONNMAN_SERVICE "org.moblin.connman"
+#define CONNMAN_SERVICE "net.connman"
#define CONNMAN_INSTANCE CONNMAN_SERVICE ".Instance"
static DBusGConnection *connection;
diff -ruN connman-gnome-0.5-orig/common/instance.xml connman-gnome-0.5/common/instance.xml
--- connman-gnome-0.5-orig/common/instance.xml 2010-12-30 09:45:03.312043457 +0800
+++ connman-gnome-0.5/common/instance.xml 2010-12-30 09:45:49.868372780 +0800
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/">
- <interface name="org.moblin.connman.Instance">
+ <interface name="net.connman.Instance">
<method name="Present">
</method>
</interface>

13
meta/recipes-connectivity/connman/connman-gnome_0.5.bb
View File

@ -6,17 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
DEPENDS = "gtk+ dbus"
PR = "r4"
PR = "r5"
RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy"
SRC_URI = "${KERNELORG_MIRROR}/linux/network/connman/connman-gnome-${PV}.tar.gz \
file://connman-gnome.patch \
file://remove-connman-property-desktop-file.patch \
file://service_name_update.patch \
file://applet_menu_popup_fix.patch"
SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"
SRCREV = "78d3c39db6f3f7977b466305110faa8ca5f74ec8"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git"
S = "${WORKDIR}/git"
inherit autotools gtk-icon-cache