Control: tags 908016 + patch
Control: tags 908016 + pending
Dear maintainer,
I've prepared an NMU for libqmi (versioned as 1.20.0-1.1) and uploaded
it to DELAYED/15. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru libqmi-1.20.0/debian/changelog libqmi-1.20.0/debian/changelog
--- libqmi-1.20.0/debian/changelog 2018-03-01 16:39:11.000000000 +0200
+++ libqmi-1.20.0/debian/changelog 2018-09-22 22:05:32.000000000 +0300
@@ -1,3 +1,11 @@
+libqmi (1.20.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with glib 2.58,
+ thanks to Juhani Numminen. (Closes: #908016)
+
+ -- Adrian Bunk <[email protected]> Sat, 22 Sep 2018 22:05:32 +0300
+
libqmi (1.20.0-1) unstable; urgency=medium
* New upstream version 1.20.0. (Closes: #887975)
diff -Nru libqmi-1.20.0/debian/patches/0001-qmicli-remove-implicity-casts-to-GDestroyNotify-in-g.patch libqmi-1.20.0/debian/patches/0001-qmicli-remove-implicity-casts-to-GDestroyNotify-in-g.patch
--- libqmi-1.20.0/debian/patches/0001-qmicli-remove-implicity-casts-to-GDestroyNotify-in-g.patch 1970-01-01 02:00:00.000000000 +0200
+++ libqmi-1.20.0/debian/patches/0001-qmicli-remove-implicity-casts-to-GDestroyNotify-in-g.patch 2018-09-22 22:05:06.000000000 +0300
@@ -0,0 +1,47 @@
+From 89bb9f6c18243b9e01386683566bd0bf2825566c Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <[email protected]>
+Date: Wed, 18 Jul 2018 22:05:52 +0200
+Subject: qmicli: remove implicity casts to GDestroyNotify in g_clear_pointer()
+
+GLib is being upgraded to propagate type information in
+g_clear_pointer, e.g. so that the using a wrong free/unref method
+triggers a warning during build.
+
+Reported by: Michael Catanzaro <[email protected]>
+https://gitlab.gnome.org/GNOME/glib/issues/1425#note_269299
+---
+ src/qmicli/qmicli-dms.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qmicli/qmicli-dms.c b/src/qmicli/qmicli-dms.c
+index 2b98a99..7143c55 100644
+--- a/src/qmicli/qmicli-dms.c
++++ b/src/qmicli/qmicli-dms.c
+@@ -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);
+ }
+
+--
+2.11.0
+
diff -Nru libqmi-1.20.0/debian/patches/series libqmi-1.20.0/debian/patches/series
--- libqmi-1.20.0/debian/patches/series 2018-02-24 21:41:20.000000000 +0200
+++ libqmi-1.20.0/debian/patches/series 2018-09-22 22:05:30.000000000 +0300
@@ -0,0 +1 @@
+0001-qmicli-remove-implicity-casts-to-GDestroyNotify-in-g.patch
