diff mbox series

[meta-oe,2/2] xdg-dbus-proxy: fix issue with glibc >= 2.43

Message ID 20260328004025.592494-2-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-oe,1/2] flatpak: update 1.17.2 -> 1.17.3 | expand

Commit Message

Markus Volk March 28, 2026, 12:40 a.m. UTC 
Add a backport patch to fix an issue with glibc >= 2.43

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...b9f68664166badfdfaa7e69efcedf750f1e3.patch | 33 +++++++++++++++++++
 .../xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb    |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
new file mode 100644
index 0000000000..5ae21b5989
--- /dev/null
+++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
@@ -0,0 +1,33 @@ 
+From 99f9b9f68664166badfdfaa7e69efcedf750f1e3 Mon Sep 17 00:00:00 2001
+From: Brahmajit Das <listout@listout.xyz>
+Date: Wed, 4 Mar 2026 06:27:54 +0530
+Subject: [PATCH] dbus-proxy: fix build with glibc >= 2.43
+
+memchr() returns const void * when passed const input, but the result
+was assigned to guchar *. This triggers
+-Wincompatible-pointer-types-discards-qualifiers when building with
+clang and -Werror.
+
+Make the pointer const to preserve const correctness.
+
+Closes: https://github.com/flatpak/xdg-dbus-proxy/issues/70
+Signed-off-by: Brahmajit Das <listout@listout.xyz>
+
+Upstream-Status: Backport [https://github.com/flatpak/xdg-dbus-proxy/commit/99f9b9f68664166badfdfaa7e69efcedf750f1e3]
+---
+ dbus-proxy.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dbus-proxy.c b/dbus-proxy.c
+index 53d5c01..b32df34 100644
+--- a/dbus-proxy.c
++++ b/dbus-proxy.c
+@@ -133,7 +133,7 @@ add_args (GBytes    *bytes,
+ {
+   gsize data_len, remainder_len;
+   const guchar *data = g_bytes_get_data (bytes, &data_len);
+-  guchar *s;
++  const guchar *s;
+   const guchar *remainder;
+ 
+   remainder = data;
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
index 28773163c5..617d29bd84 100644
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
+++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
@@ -13,6 +13,7 @@  inherit meson pkgconfig ptest-gnome
 
 SRC_URI = " \
     git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main \
+    file://99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch \
     file://run-ptest \
     "