aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-01-05 08:10:55 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-01-05 09:29:38 +0100
commitd7fd75b65b64005b8bf1c7acdcb51825bc56dcc0 (patch)
tree4b82c6f0aa0dfafc1b58677d4b7f99060a391413
parentdfcd2e6ded10a34c8ab1fe5c84291c4fae562156 (diff)
downloadopenembedded-d7fd75b65b64005b8bf1c7acdcb51825bc56dcc0.tar.gz
iliwi: add patch to build it with newer vala
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/openmoko-3rdparty/iliwi/new.vala.patch59
-rw-r--r--recipes/openmoko-3rdparty/iliwi_git.bb5
2 files changed, 62 insertions, 2 deletions
diff --git a/recipes/openmoko-3rdparty/iliwi/new.vala.patch b/recipes/openmoko-3rdparty/iliwi/new.vala.patch
new file mode 100644
index 0000000000..43d18eb5a2
--- /dev/null
+++ b/recipes/openmoko-3rdparty/iliwi/new.vala.patch
@@ -0,0 +1,59 @@
+From patchwork Mon Jan 3 16:17:07 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [Shr-Devel] Fix code to compile against new vala version
+Date: Mon, 03 Jan 2011 15:17:07 -0000
+From: Pau Espin Pedrol <pespin.shar@gmail.com>
+X-Patchwork-Id: 838
+
+---
+ src/wifi.vala | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+
+diff --git a/src/wifi.vala b/src/wifi.vala
+index 5460bb1..9995f16 100644
+--- a/src/wifi.vala
++++ b/src/wifi.vala
+@@ -25,11 +25,11 @@ namespace iliwi {
+ public signal void status_change();
+ public signal void network_list_change();
+
+- unowned Thread thread;
++ unowned Thread<void*> thread;
+
+ public Wifi() {
+ try {
+- thread = Thread.create(WifiThread.run_thread, true);
++ thread = Thread.create<void*>(WifiThread.run_thread, true);
+ } catch(Error e) {
+ critical("Couldn't start wifi-thread!");
+ }
+@@ -270,7 +270,7 @@ namespace iliwi {
+ }
+ }
+ public static void connect_to_network(Network network) {
+- disconnect();
++ disconnectt();
+ wifi.set_new_status("connecting..");
+ connect_network = network;
+ network.set_new_status(NetworkStatus.CONNECTING);
+@@ -317,7 +317,7 @@ namespace iliwi {
+ }
+ status = NetworkStatus.CONNECT;
+ }
+- private static void disconnect() {
++ private static void disconnectt() {
+ status = NetworkStatus.UNCONNECTED;
+ try {
+ Process.spawn_sync(null, {Environment.find_program_in_path("killall"),"wpa_supplicant"}, null, GLib.SpawnFlags.STDERR_TO_DEV_NULL, null);
+@@ -372,7 +372,7 @@ namespace iliwi {
+ networks = new HashMap<string,Network>(str_hash,str_equal);
+ visible_networks = new ArrayList<Network>();
+ status = NetworkStatus.UNCONNECTED;
+- disconnect();
++ disconnectt();
+ load_preferred_networks();
+ scan();
+ }
diff --git a/recipes/openmoko-3rdparty/iliwi_git.bb b/recipes/openmoko-3rdparty/iliwi_git.bb
index bcda6324e0..fd023844d6 100644
--- a/recipes/openmoko-3rdparty/iliwi_git.bb
+++ b/recipes/openmoko-3rdparty/iliwi_git.bb
@@ -8,9 +8,10 @@ RDEPENDS_${PN} = "wireless-tools wpa-supplicant"
SRCREV = "5be2b301033418fb9a33759047274b676034f096"
PV = "0.0.1+gitr${SRCPV}"
-PR = "r8"
+PR = "r9"
-SRC_URI = "git://github.com/Ebbe/Iliwi.git;protocol=http;branch=master"
+SRC_URI = "git://github.com/Ebbe/Iliwi.git;protocol=http;branch=master \
+ file://new.vala.patch"
S = "${WORKDIR}/git"
inherit autotools vala