From: Koen Kooi <koen@openembedded.org>
Date: Mon, 6 Dec 2010 20:16:16 +0000 (+0100)
Subject: modemmanager: add 0.4 with a patch to fix build against recent glib
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2372fad7c19fec7de4056d7d0b0511317ee8c5c;p=openembedded.git

modemmanager: add 0.4 with a patch to fix build against recent glib

Signed-off-by: Koen Kooi <koen@openembedded.org>
---

diff --git a/recipes/networkmanager/modemmanager/glibfix.diff b/recipes/networkmanager/modemmanager/glibfix.diff
new file mode 100644
index 0000000000..6f48bb34b9
--- /dev/null
+++ b/recipes/networkmanager/modemmanager/glibfix.diff
@@ -0,0 +1,41 @@
+From be28089dc4c1b07d9def45a3c763f432ae8322c4 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Mon, 09 Aug 2010 15:31:45 +0000
+Subject: build: fix build with glib >= 2.25.12 (bgo #626421)
+
+Work around an API break in glib.
+---
+diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c
+index 8685080..4e6f0cf 100644
+--- a/libqcdm/tests/test-qcdm.c
++++ b/libqcdm/tests/test-qcdm.c
+@@ -28,7 +28,11 @@ typedef struct {
+     gpointer com_data;
+ } TestData;
+ 
++#if GLIB_CHECK_VERSION(2,25,12)
++typedef GTestFixtureFunc TCFunc;
++#else
+ typedef void (*TCFunc)(void);
++#endif
+ 
+ #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)
+ 
+diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c
+index 92a7af8..74d2d94 100644
+--- a/src/tests/test-modem-helpers.c
++++ b/src/tests/test-modem-helpers.c
+@@ -791,7 +791,11 @@ test_data_free (TestData *data)
+ }
+ 
+ 
++#if GLIB_CHECK_VERSION(2,25,12)
++typedef GTestFixtureFunc TCFunc;
++#else
+ typedef void (*TCFunc)(void);
++#endif
+ 
+ #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)
+ 
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/networkmanager/modemmanager_0.4.bb b/recipes/networkmanager/modemmanager_0.4.bb
new file mode 100644
index 0000000000..bdaabf0a3d
--- /dev/null
+++ b/recipes/networkmanager/modemmanager_0.4.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Provides a unified high level API for communicating with (mobile broadband) modems"
+LICENSE = "GPLv2"
+DEPENDS = "udev dbus-glib policykit ppp"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.4/ModemManager-${PV}.tar.bz2;name=archive \
+           file://glibfix.diff \
+"
+SRC_URI[archive.md5sum] = "d4681f08e76cbb766522256144267ced"
+SRC_URI[archive.sha256sum] = "8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f"
+
+S = "${WORKDIR}/ModemManager-${PV}"
+
+inherit autotools
+
+FILES_${PN} += "${libdir}/ModemManager/*.so \
+                ${libdir}/pppd/*/*.so \
+                /lib/udev \
+                ${datadir}/dbus-1/ \
+                ${datadir}/icons/ \
+                ${datadir}/polkit-1 \
+"
+
+FILES_${PN}-dbg += "${libdir}/ModemManager/.debug \
+                    ${libdir}/pppd/*/.debug"
+
+FILES_${PN}-dev += "${libdir}/ModemManager/*a \
+                    ${libdir}/pppd/*/*a \
+"
+
+RRECOMMENDS_${PN} = "ppp"
+