From 032017e5181ec8575f5820179953a97e547a2e5f40fb7126a60db027411127bb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 15 Sep 2019 07:35:46 +0000 Subject: [PATCH] Accepting request 730979 from GNOME:Next New upstream release OBS-URL: https://build.opensuse.org/request/show/730979 OBS-URL: https://build.opensuse.org/package/show/network/libmbim?expand=0&rev=41 --- libmbim-1.18.2.tar.xz | 3 - libmbim-1.20.0.tar.xz | 3 + libmbim-fix-build-commits.patch | 124 -------------------------------- libmbim.changes | 20 ++++++ libmbim.spec | 6 +- 5 files changed, 24 insertions(+), 132 deletions(-) delete mode 100644 libmbim-1.18.2.tar.xz create mode 100644 libmbim-1.20.0.tar.xz delete mode 100644 libmbim-fix-build-commits.patch diff --git a/libmbim-1.18.2.tar.xz b/libmbim-1.18.2.tar.xz deleted file mode 100644 index baf4470..0000000 --- a/libmbim-1.18.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7723f2ca2286c5286ffba7331cb4520099982e55355a7af6f45bdce6b5d39268 -size 473592 diff --git a/libmbim-1.20.0.tar.xz b/libmbim-1.20.0.tar.xz new file mode 100644 index 0000000..eff4d59 --- /dev/null +++ b/libmbim-1.20.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cf7c6c7aa9e962a589f61bff2766035b61792ef961131a21fcbbe043f91a866 +size 476852 diff --git a/libmbim-fix-build-commits.patch b/libmbim-fix-build-commits.patch deleted file mode 100644 index f16d47e..0000000 --- a/libmbim-fix-build-commits.patch +++ /dev/null @@ -1,124 +0,0 @@ -From e7a327fafd75f9d020b0de7539fb072cef059b9a Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Tue, 2 Jul 2019 13:57:38 +0200 -Subject: [PATCH] build: define GLIB_VERSION_MAX_ALLOWED and disable - deprecation warnings - ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 26898ca..f0798bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,9 +67,12 @@ AC_SUBST(MBIM_GLIB_LT_AGE) - dnl Required dependency versions - GLIB_MIN_VERSION=2.36 - -+GLIB_BUILD_SYMBOLS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36 -DGLIB_DISABLE_DEPRECATION_WARNINGS" -+ - dnl General dependencies for common - PKG_CHECK_MODULES(MBIM_COMMON, - glib-2.0 >= $GLIB_MIN_VERSION) -+MBIM_COMMON_CFLAGS="$MBIM_COMMON_CFLAGS $GLIB_BUILD_SYMBOLS" - AC_SUBST(MBIM_COMMON_CFLAGS) - AC_SUBST(MBIM_COMMON_LIBS) - -@@ -79,6 +82,7 @@ PKG_CHECK_MODULES(LIBMBIM_GLIB, - gobject-2.0 - gio-2.0 - gio-unix-2.0) -+LIBMBIM_GLIB_CFLAGS="$LIBMBIM_GLIB_CFLAGS $GLIB_BUILD_SYMBOLS" - AC_SUBST(LIBMBIM_GLIB_CFLAGS) - AC_SUBST(LIBMBIM_GLIB_LIBS) - -@@ -87,6 +91,7 @@ PKG_CHECK_MODULES(MBIMCLI, - glib-2.0 >= $GLIB_MIN_VERSION - gobject-2.0 - gio-2.0) -+MBIMCLI_CFLAGS="$MBIMCLI_CFLAGS $GLIB_BUILD_SYMBOLS" - AC_SUBST(MBIMCLI_CFLAGS) - AC_SUBST(MBIMCLI_LIBS) - -@@ -95,6 +100,7 @@ PKG_CHECK_MODULES(MBIMPROXY, - glib-2.0 >= $GLIB_MIN_VERSION - gobject-2.0 - gio-2.0) -+MBIMPROXY_CFLAGS="$MBIMPROXY_CFLAGS $GLIB_BUILD_SYMBOLS" - AC_SUBST(MBIMPROXY_CFLAGS) - AC_SUBST(MBIMPROXY_LIBS) - --- -2.22.0 - - -From 07f4f8fa3f53e93a8988a6a2f3e5179c334b7f2f Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Tue, 23 Jul 2019 13:24:03 +0200 -Subject: [PATCH] libmbim,uuid: fix build with -Werror=type-limits - - mbim-uuid.c: In function 'mbim_uuid_from_service': - mbim-uuid.c:400:5: error: comparison of unsigned expression >= 0 is always true [-Werror=type-limits] - mbim-uuid.c: In function 'mbim_uuid_from_context_type': - mbim-uuid.c:594:5: error: comparison of unsigned expression >= 0 is always true [-Werror=type-limits] ---- - src/libmbim-glib/mbim-uuid.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/libmbim-glib/mbim-uuid.c b/src/libmbim-glib/mbim-uuid.c -index a7066e5..63fa221 100644 ---- a/src/libmbim-glib/mbim-uuid.c -+++ b/src/libmbim-glib/mbim-uuid.c -@@ -397,10 +397,7 @@ mbim_uuid_from_service (MbimService service) - { - GList *l; - -- g_return_val_if_fail (service >= MBIM_SERVICE_INVALID && -- (service < MBIM_SERVICE_LAST || -- mbim_service_id_is_custom (service)), -- &uuid_invalid); -+ g_return_val_if_fail (service < MBIM_SERVICE_LAST || mbim_service_id_is_custom (service), &uuid_invalid); - - switch (service) { - case MBIM_SERVICE_INVALID: -@@ -591,8 +588,7 @@ static const MbimUuid uuid_context_type_local = { - const MbimUuid * - mbim_uuid_from_context_type (MbimContextType context_type) - { -- g_return_val_if_fail (context_type >= MBIM_CONTEXT_TYPE_INVALID && context_type <= MBIM_CONTEXT_TYPE_LOCAL, -- &uuid_invalid); -+ g_return_val_if_fail (context_type <= MBIM_CONTEXT_TYPE_LOCAL, &uuid_invalid); - - switch (context_type) { - case MBIM_CONTEXT_TYPE_INVALID: --- -2.22.0 - - -From 47cf7e1aebb3d0ccd95c0e88a30df68bf6dfc0f4 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Tue, 23 Jul 2019 13:41:52 +0200 -Subject: [PATCH] libmbim,cid: fix build with -Werror=type-limits - - mbim-cid.c: In function 'mbim_cid_get_printable': - mbim-cid.c:360:5: error: comparison of unsigned expression >= 0 is always true [-Werror=type-limits] ---- - src/libmbim-glib/mbim-cid.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libmbim-glib/mbim-cid.c b/src/libmbim-glib/mbim-cid.c -index 82ab61e..53e32c1 100644 ---- a/src/libmbim-glib/mbim-cid.c -+++ b/src/libmbim-glib/mbim-cid.c -@@ -357,7 +357,6 @@ mbim_cid_get_printable (MbimService service, - /* CID = 0 is never a valid command */ - g_return_val_if_fail (cid > 0, NULL); - /* Known service required */ -- g_return_val_if_fail (service >= MBIM_SERVICE_INVALID, NULL); - g_return_val_if_fail (service < MBIM_SERVICE_LAST, NULL); - - switch (service) { --- -2.22.0 - diff --git a/libmbim.changes b/libmbim.changes index 7433712..daee81c 100644 --- a/libmbim.changes +++ b/libmbim.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Sep 14 13:31:28 UTC 2019 - Bjørn Lie + +- Update to version 1.20.0: + + Build updated with several fixes: + - Explicitly define max allowed GLib version. + - Fix issues with -Werror=type-limits. + - Made compiler warning options compatible with clang. + + mbim-proxy: + - Fixed client subscription to service indications using + wildcard. + - Fixed client subscription update logic when services/cids are + being removed. + - New '--empty-timeout=[SECS}' option to specify the empty + lifetime duration. + - New '--no-exit' option to avoid the proxy from exiting. + + Several other minor improvements and fixes. +- Drop libmbim-fix-build-commits.patch: Fixed upstream. Follwing + this, drop libtool BuildRequires and autoreconf call. + ------------------------------------------------------------------- Mon Sep 2 22:48:36 UTC 2019 - Bjørn Lie diff --git a/libmbim.spec b/libmbim.spec index e883d4c..bfef76d 100644 --- a/libmbim.spec +++ b/libmbim.spec @@ -18,17 +18,14 @@ Name: libmbim -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: Mobile Broadband Interface Model (MBIM) protocol License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Productivity/Networking/System URL: https://www.freedesktop.org/wiki/Software/libmbim/ Source: https://www.freedesktop.org/software/libmbim/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM libmbim-fix-build-commits.patch -- Fix build with new glib2 -Patch0: libmbim-fix-build-commits.patch -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: pkgconfig(gio-2.0) @@ -77,7 +74,6 @@ This package contain de bash completion command for mbimcli tools. %build # Do not rely on env for choosing python sed -i "s|env python|python3|g" build-aux/mbim-codegen/* -autoreconf -fiv %configure \ --with-udev \ --disable-static \