!4 update to 1.26.2

Merge pull request !4 from cuibb1/master
This commit is contained in:
openeuler-ci-bot 2020-07-31 09:09:25 +08:00 committed by Gitee
commit 81a9162359
5 changed files with 6 additions and 60 deletions

View File

@ -1,26 +0,0 @@
From f8c34b1f0f503a35a37bd5cd1f729955cf2fb262 Mon Sep 17 00:00:00 2001
From: xiaoweiwei <xiaoweiwei5@huawei.com>
Date: Tue, 14 Jan 2020 19:18:06 +0800
Subject: [PATCH] libqmi: add patch to modify build err
Signed-off-by: Buildteam <buildteam@openeuler.org>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index f299c70..4ba1ac3 100755
--- a/configure
+++ b/configure
@@ -12207,7 +12207,7 @@ $as_echo "$has_option" >&6; }
done
unset option
if test "x$set_more_warnings" = xerror; then
- CFLAGS="$CFLAGS -Werror"
+ CFLAGS="$CFLAGS"
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--
1.8.3.1

View File

@ -1,28 +0,0 @@
diff -uNrp a/src/qmicli/qmicli-dms.c b/src/qmicli/qmicli-dms.c
--- a/src/qmicli/qmicli-dms.c 2018-01-20 13:17:41.000000000 +0000
+++ b/src/qmicli/qmicli-dms.c 2018-12-16 18:06:11.907289475 +0000
@@ -2697,9 +2697,9 @@ static void
get_stored_image_result_free (GetStoredImageResult *result)
{
if (result) {
- g_clear_pointer (&result->modem_unique_id, (GDestroyNotify)g_array_unref);
+ g_clear_pointer (&result->modem_unique_id, g_array_unref);
g_free (result->modem_build_id);
- g_clear_pointer (&result->pri_unique_id, (GDestroyNotify)g_array_unref);
+ g_clear_pointer (&result->pri_unique_id, g_array_unref);
g_free (result->pri_build_id);
g_slice_free (GetStoredImageResult, result);
}
@@ -3161,10 +3161,10 @@ typedef struct {
static void
set_firmware_preference_context_clear (SetFirmwarePreferenceContext *firmware_preference_ctx)
{
- g_clear_pointer (&firmware_preference_ctx->modem_image_id.unique_id, (GDestroyNotify) g_array_unref);
+ g_clear_pointer (&firmware_preference_ctx->modem_image_id.unique_id, g_array_unref);
g_free (firmware_preference_ctx->modem_image_id.build_id);
- g_clear_pointer (&firmware_preference_ctx->pri_image_id.unique_id, (GDestroyNotify) g_array_unref);
+ g_clear_pointer (&firmware_preference_ctx->pri_image_id.unique_id, g_array_unref);
g_free (firmware_preference_ctx->pri_image_id.build_id);
}

Binary file not shown.

BIN
libqmi-1.26.2.tar.xz Normal file

Binary file not shown.

View File

@ -1,15 +1,12 @@
Name: libqmi
Version: 1.20.0
Release: 5
Version: 1.26.2
Release: 1
License: LGPLv2+ and GPLv2+
Summary: A glib-based library to use the Qualcomm MSM Interface (QMI) protocol
URL: http://freedesktop.org/software/libqmi
Source0: http://freedesktop.org/software/libqmi/libqmi-%{version}.tar.xz
Patch6000: bugfix-fix-glib-upgraded-to-propagate-propagate-propagate-in-propagate.patch
Patch6001: 0001-libqmi-add-patch-to-modify-build-err.patch
BuildRequires: glib2-devel >= 2.32.0 libgudev-devel >= 147 libmbim-devel >= 1.14.0 python2 >= 2.7 gtk-doc
BuildRequires: glib2-devel >= 2.32.0 libgudev-devel >= 147 libmbim-devel >= 1.14.0 python3 gtk-doc
Provides: libqmi-utils = %{version}-%{release}
Obsoletes: libqmi-utils < 1.20.0.4
@ -68,6 +65,9 @@ find %{buildroot}%{_datadir}/gtk-doc | xargs touch --reference configure.ac
%{_mandir}/man1/*
%changelog
* Tue Jul 28 2020 cuibaobao <cuibaobao1@huawei.com> - 1.26.2-1
- update to 1.26.2
* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.20.0-5
- Type:bugfix
- ID:NA