modemmanager: upgrade to 1.7.991

This version has a ublox plugin for expanded modem support. The underlying issue
that enum-conversion.patch fixes appears to already have been fixed upstream, so
we can drop the patch.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Martin Kelly 2018-05-08 12:31:40 -07:00 committed by Armin Kuster
parent 92337bcbdd
commit f79a1bf458
2 changed files with 4 additions and 26 deletions

View File

@ -1,21 +0,0 @@
Fixes errors found bt Clang
| ../../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]
| MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self));
| ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| 1 error generated.
Index: ModemManager-1.6.4/src/mm-bearer-qmi.c
===================================================================
--- ModemManager-1.6.4.orig/src/mm-bearer-qmi.c
+++ ModemManager-1.6.4/src/mm-bearer-qmi.c
@@ -771,7 +771,7 @@ packet_service_status_indication_cb (Qmi
&connection_status,
NULL,
NULL)) {
- MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self));
+ MMBearerConnectionStatus bearer_status = (MMBearerConnectionStatus)mm_base_bearer_get_status (MM_BASE_BEARER (self));
if (connection_status == QMI_WDS_CONNECTION_STATUS_DISCONNECTED &&
bearer_status != MM_BEARER_CONNECTION_STATUS_DISCONNECTED &&

View File

@ -11,11 +11,10 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion
DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native"
SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \
file://enum-conversion.patch \
"
SRC_URI[md5sum] = "06488186c7dd53f8104183b86f7a1568"
SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668"
SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f"
SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745"
S = "${WORKDIR}/ModemManager-${PV}"