[Pkg-telepathy-maintainers] Bug#1075560: telepathy-haze: diff for NMU version 0.8.1-0.2

[Andres Salomon]

Control: tags 1075560 + patch
Control: tags 1075560 + pending

Dear maintainer,

I've prepared an NMU for telepathy-haze (versioned as 0.8.1-0.2) and
uploaded it (without delay, since it's RC and the bug is over a year
old).

Regards,
Andres

diffstat for telepathy-haze-0.8.1 telepathy-haze-0.8.1

 changelog           |    7 ++++++
 patches/gcc14.patch |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/series      |    1 
 3 files changed, 64 insertions(+)

diff -Nru telepathy-haze-0.8.1/debian/changelog telepathy-haze-0.8.1/debian/changelog
--- telepathy-haze-0.8.1/debian/changelog       2022-11-30 20:12:31.000000000 +0000
+++ telepathy-haze-0.8.1/debian/changelog       2025-11-20 06:59:40.000000000 +0000
@@ -1,3 +1,10 @@
+telepathy-haze (0.8.1-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Fix FTBFS with GCC 14. (Closes: #1075560)
+
+ -- Andres Salomon <dilinger at debian.org>  Thu, 20 Nov 2025 06:59:40 +0000
+
 telepathy-haze (0.8.1-0.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru telepathy-haze-0.8.1/debian/patches/gcc14.patch telepathy-haze-0.8.1/debian/patches/gcc14.patch
--- telepathy-haze-0.8.1/debian/patches/gcc14.patch     1970-01-01 00:00:00.000000000 +0000
+++ telepathy-haze-0.8.1/debian/patches/gcc14.patch     2025-11-20 06:59:02.000000000 +0000
@@ -0,0 +1,56 @@
+author: Andres Salomon <dilinger at debian.org>
+
+Work around gcc 14 scope issue; FTBFS due to 'errno' being exposed
+and messing up the callback type definition:
+
+Submitted upstream @
+https://github.com/TelepathyIM/telepathy-haze/pull/4
+
+--- a/src/media-backend.c
++++ b/src/media-backend.c
+@@ -531,7 +531,7 @@ haze_media_backend_ready (TpSvcMediaSess
+ 
+ static void
+ haze_media_backend_error (TpSvcMediaSessionHandler *iface,
+-                          guint errno,
++                          guint err_no,
+                           const gchar *message,
+                           DBusGMethodInvocation *context)
+ {
+@@ -561,7 +561,7 @@ haze_media_backend_error (TpSvcMediaSess
+     }
+ 
+   DEBUG ("Media.SessionHandler::Error called, error %u (%s) -- "
+-      "emitting error on each stream", errno, message);
++      "emitting error on each stream", err_no, message);
+ 
+   purple_media_end (priv->media, NULL, NULL);
+ 
+@@ -579,7 +579,7 @@ haze_media_backend_error (TpSvcMediaSess
+     {
+       HazeMediaStream *stream = g_ptr_array_index (tmp, i);
+ 
+-      haze_media_stream_error (stream, errno, message, NULL);
++      haze_media_stream_error (stream, err_no, message, NULL);
+     }
+ 
+   g_ptr_array_free (tmp, TRUE);
+--- a/src/media-stream.c
++++ b/src/media-stream.c
+@@ -849,14 +849,14 @@ haze_media_stream_error (HazeMediaStream
+  */
+ static void
+ haze_media_stream_error_async (TpSvcMediaStreamHandler *iface,
+-                               guint errno,
++                               guint err_no,
+                                const gchar *message,
+                                DBusGMethodInvocation *context)
+ {
+   HazeMediaStream *self = HAZE_MEDIA_STREAM (iface);
+   GError *error = NULL;
+ 
+-  if (haze_media_stream_error (self, errno, message, &error))
++  if (haze_media_stream_error (self, err_no, message, &error))
+     {
+       tp_svc_media_stream_handler_return_from_error (context);
+     }
diff -Nru telepathy-haze-0.8.1/debian/patches/series telepathy-haze-0.8.1/debian/patches/series
--- telepathy-haze-0.8.1/debian/patches/series  1970-01-01 00:00:00.000000000 +0000
+++ telepathy-haze-0.8.1/debian/patches/series  2025-11-20 06:59:02.000000000 +0000
@@ -0,0 +1 @@
+gcc14.patch