diff options
author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2012-10-04 12:45:36 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-10 09:47:33 +0200 |
commit | e1768d6b35707538f0d24331d0c6c243a3654104 (patch) | |
tree | dc082d37b21e250cba29196f9dc1dc378e96102e | |
parent | f2136b93ef102be38f9b5ab8c79ecd8f44ff35b3 (diff) | |
download | meta-openembedded-e1768d6b35707538f0d24331d0c6c243a3654104.tar.gz |
modemmanager: do not include glib private headers
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch | 94 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb | 6 |
2 files changed, 99 insertions, 1 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch b/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch new file mode 100644 index 000000000..71dffc026 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From 28f64090dfa15097587bbea69209df10b8ab8593 Mon Sep 17 00:00:00 2001 | ||
2 | From: Aleksander Morgado <aleksander@lanedo.com> | ||
3 | Date: Mon, 24 Oct 2011 19:09:11 +0000 | ||
4 | Subject: core: don't include private headers from glib | ||
5 | |||
6 | The "glib/gtypes.h" is now considered private, and only "glib.h" should be | ||
7 | included directly. | ||
8 | --- | ||
9 | diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h | ||
10 | index 5d5f13f..cec5dc3 100644 | ||
11 | --- a/src/mm-at-serial-port.h | ||
12 | +++ b/src/mm-at-serial-port.h | ||
13 | @@ -18,7 +18,6 @@ | ||
14 | #define MM_AT_SERIAL_PORT_H | ||
15 | |||
16 | #include <glib.h> | ||
17 | -#include <glib/gtypes.h> | ||
18 | #include <glib-object.h> | ||
19 | |||
20 | #include "mm-serial-port.h" | ||
21 | diff --git a/src/mm-manager.h b/src/mm-manager.h | ||
22 | index 1c98458..c6a64bd 100644 | ||
23 | --- a/src/mm-manager.h | ||
24 | +++ b/src/mm-manager.h | ||
25 | @@ -17,7 +17,6 @@ | ||
26 | #ifndef MM_MANAGER_H | ||
27 | #define MM_MANAGER_H | ||
28 | |||
29 | -#include <glib/gtypes.h> | ||
30 | #include <glib-object.h> | ||
31 | #include <dbus/dbus-glib.h> | ||
32 | #include "mm-modem.h" | ||
33 | diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h | ||
34 | index 933aae1..be11af6 100644 | ||
35 | --- a/src/mm-modem-base.h | ||
36 | +++ b/src/mm-modem-base.h | ||
37 | @@ -18,7 +18,6 @@ | ||
38 | #define MM_MODEM_BASE_H | ||
39 | |||
40 | #include <glib.h> | ||
41 | -#include <glib/gtypes.h> | ||
42 | #include <glib-object.h> | ||
43 | |||
44 | #include "mm-port.h" | ||
45 | diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h | ||
46 | index 4b0932c..5b049a4 100644 | ||
47 | --- a/src/mm-plugin-base.h | ||
48 | +++ b/src/mm-plugin-base.h | ||
49 | @@ -17,7 +17,6 @@ | ||
50 | #define MM_PLUGIN_BASE_H | ||
51 | |||
52 | #include <glib.h> | ||
53 | -#include <glib/gtypes.h> | ||
54 | #include <glib-object.h> | ||
55 | |||
56 | #define G_UDEV_API_IS_SUBJECT_TO_CHANGE | ||
57 | diff --git a/src/mm-port.h b/src/mm-port.h | ||
58 | index 4bcffd4..df935db 100644 | ||
59 | --- a/src/mm-port.h | ||
60 | +++ b/src/mm-port.h | ||
61 | @@ -17,7 +17,6 @@ | ||
62 | #define MM_PORT_H | ||
63 | |||
64 | #include <glib.h> | ||
65 | -#include <glib/gtypes.h> | ||
66 | #include <glib-object.h> | ||
67 | |||
68 | typedef enum { | ||
69 | diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h | ||
70 | index 2786ee8..605016d 100644 | ||
71 | --- a/src/mm-qcdm-serial-port.h | ||
72 | +++ b/src/mm-qcdm-serial-port.h | ||
73 | @@ -18,7 +18,6 @@ | ||
74 | #define MM_QCDM_SERIAL_PORT_H | ||
75 | |||
76 | #include <glib.h> | ||
77 | -#include <glib/gtypes.h> | ||
78 | #include <glib-object.h> | ||
79 | |||
80 | #include "mm-serial-port.h" | ||
81 | diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h | ||
82 | index eb12cbb..9450926 100644 | ||
83 | --- a/src/mm-serial-port.h | ||
84 | +++ b/src/mm-serial-port.h | ||
85 | @@ -18,7 +18,6 @@ | ||
86 | #define MM_SERIAL_PORT_H | ||
87 | |||
88 | #include <glib.h> | ||
89 | -#include <glib/gtypes.h> | ||
90 | #include <glib-object.h> | ||
91 | |||
92 | #include "mm-port.h" | ||
93 | -- | ||
94 | cgit v0.9.0.2-2-gbebe | ||
diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb index 29c25750b..55e083a85 100644 --- a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb +++ b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb | |||
@@ -3,9 +3,13 @@ DEPENDS = "ppp udev glib-2.0" | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
5 | 5 | ||
6 | PR = "r1" | ||
7 | |||
6 | inherit gnome gettext | 8 | inherit gnome gettext |
7 | 9 | ||
8 | SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.bz2" | 10 | SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.bz2 \ |
11 | file://dont-include-private-glib-headers.patch" | ||
12 | |||
9 | SRC_URI[md5sum] = "cd04109506e88bf4c4cd3e7ce0034c08" | 13 | SRC_URI[md5sum] = "cd04109506e88bf4c4cd3e7ce0034c08" |
10 | SRC_URI[sha256sum] = "108de70537b1193634883fa6b3642b130a23f4c04d901cb15caeceb486af6152" | 14 | SRC_URI[sha256sum] = "108de70537b1193634883fa6b3642b130a23f4c04d901cb15caeceb486af6152" |
11 | 15 | ||