summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch21
-rw-r--r--meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb (renamed from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb)9
2 files changed, 4 insertions, 26 deletions
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
deleted file mode 100644
index a3fb0f3eb..000000000
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Fixes errors found bt Clang
2
3| ../../ModemManager-1.6.4/src/mm-bearer-qmi.c:774:50: error: implicit conversion from enumeration type 'MMBearerStatus' to different enumeration type 'MMBearerConnectionStatus' [-Werror,-Wenum-conversion]
4| MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self));
5| ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6| 1 error generated.
7
8
9Index: ModemManager-1.6.4/src/mm-bearer-qmi.c
10===================================================================
11--- ModemManager-1.6.4.orig/src/mm-bearer-qmi.c
12+++ ModemManager-1.6.4/src/mm-bearer-qmi.c
13@@ -771,7 +771,7 @@ packet_service_status_indication_cb (Qmi
14 &connection_status,
15 NULL,
16 NULL)) {
17- MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self));
18+ MMBearerConnectionStatus bearer_status = (MMBearerConnectionStatus)mm_base_bearer_get_status (MM_BASE_BEARER (self));
19
20 if (connection_status == QMI_WDS_CONNECTION_STATUS_DISCONNECTED &&
21 bearer_status != MM_BEARER_CONNECTION_STATUS_DISCONNECTED &&
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
index e60cd4b74..4f9400169 100644
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
@@ -11,11 +11,10 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion
11 11
12DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" 12DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native"
13 13
14SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ 14SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
15 file://enum-conversion.patch \ 15
16" 16SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f"
17SRC_URI[md5sum] = "06488186c7dd53f8104183b86f7a1568" 17SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745"
18SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668"
19 18
20S = "${WORKDIR}/ModemManager-${PV}" 19S = "${WORKDIR}/ModemManager-${PV}"
21 20