From 83c16b08fa75fca09a3a909d77190f12b30ee5be Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 7 Nov 2025 15:23:47 -0700 Subject: [PATCH] glib: enable dbus auth --- recipes/libs/glib/redox.patch | 81 +++++++++++++---------------------- 1 file changed, 30 insertions(+), 51 deletions(-) diff --git a/recipes/libs/glib/redox.patch b/recipes/libs/glib/redox.patch index 18024068e..640d67ab7 100644 --- a/recipes/libs/glib/redox.patch +++ b/recipes/libs/glib/redox.patch @@ -1,6 +1,18 @@ -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/glocalfile.c source/gio/glocalfile.c ---- glib-2.82.5/gio/glocalfile.c 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/glocalfile.c 2025-09-08 15:00:09.240010601 -0600 +diff -ruwN source-old/gio/gcredentialsprivate.h source/gio/gcredentialsprivate.h +--- source-old/gio/gcredentialsprivate.h 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/gcredentialsprivate.h 2025-11-07 15:23:11.471806927 -0700 +@@ -104,7 +104,7 @@ + */ + #undef G_CREDENTIALS_HAS_PID + +-#ifdef __linux__ ++#if defined(__linux__) + #define G_CREDENTIALS_SUPPORTED 1 + #define G_CREDENTIALS_USE_LINUX_UCRED 1 + #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_LINUX_UCRED +diff -ruwN source-old/gio/glocalfile.c source/gio/glocalfile.c +--- source-old/gio/glocalfile.c 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/glocalfile.c 2025-11-07 15:23:11.472066975 -0700 @@ -77,6 +77,10 @@ #include "glib-private.h" @@ -12,9 +24,9 @@ diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/glocalfile.c source/gio/gloca #ifdef G_OS_WIN32 #include #include -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gnetworking.h.in source/gio/gnetworking.h.in ---- glib-2.82.5/gio/gnetworking.h.in 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/gnetworking.h.in 2025-04-21 14:36:14.671018625 -0600 +diff -ruwN source-old/gio/gnetworking.h.in source/gio/gnetworking.h.in +--- source-old/gio/gnetworking.h.in 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/gnetworking.h.in 2025-11-07 15:23:11.472335068 -0700 @@ -40,13 +40,17 @@ #include #include @@ -33,42 +45,9 @@ diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gnetworking.h.in source/gio/g @NAMESER_COMPAT_INCLUDE@ #ifndef __GI_SCANNER__ -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gsocket.c source/gio/gsocket.c ---- glib-2.82.5/gio/gsocket.c 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/gsocket.c 2025-06-16 09:52:49.595949295 -0600 -@@ -487,6 +487,7 @@ - if (!g_socket_get_option (socket, SOL_SOCKET, SO_TYPE, &value, NULL)) - { - errsv = get_socket_errno (); -+ fprintf(stderr, "%s:%d\n", __FILE__, __LINE__); - goto err; - } - -@@ -513,6 +514,7 @@ - if (getsockname (fd, &address.sa, &addrlen) != 0) - { - errsv = get_socket_errno (); -+ fprintf(stderr, "%s:%d\n", __FILE__, __LINE__); - goto err; - } - -@@ -531,11 +533,13 @@ - if (!g_socket_get_option (socket, SOL_SOCKET, SO_DOMAIN, &family, NULL)) - { - errsv = get_socket_errno (); -+ fprintf(stderr, "%s:%d\n", __FILE__, __LINE__); - goto err; - } - #else - /* This will translate to G_IO_ERROR_FAILED on either unix or windows */ - errsv = -1; -+ fprintf(stderr, "%s:%d\n", __FILE__, __LINE__); - goto err; - #endif - } -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gthreadedresolver.c source/gio/gthreadedresolver.c ---- glib-2.82.5/gio/gthreadedresolver.c 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/gthreadedresolver.c 2025-04-21 14:36:14.672018626 -0600 +diff -ruwN source-old/gio/gthreadedresolver.c source/gio/gthreadedresolver.c +--- source-old/gio/gthreadedresolver.c 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/gthreadedresolver.c 2025-11-07 15:23:11.472497183 -0700 @@ -579,8 +579,26 @@ return g_task_propagate_pointer (G_TASK (result), error); } @@ -109,9 +88,9 @@ diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gthreadedresolver.c source/gi len = res_nquery (&res, rrname, C_IN, rrtype, answer->data, answer->len); #else len = res_query (rrname, C_IN, rrtype, answer->data, answer->len); -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gunixmounts.c source/gio/gunixmounts.c ---- glib-2.82.5/gio/gunixmounts.c 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/gunixmounts.c 2025-04-21 14:36:14.672018626 -0600 +diff -ruwN source-old/gio/gunixmounts.c source/gio/gunixmounts.c +--- source-old/gio/gunixmounts.c 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/gunixmounts.c 2025-11-07 15:23:11.472785674 -0700 @@ -1135,6 +1135,37 @@ return NULL; } @@ -179,9 +158,9 @@ diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/gunixmounts.c source/gio/guni *n_points_out = 0; return NULL; } -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/meson.build source/gio/meson.build ---- glib-2.82.5/gio/meson.build 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/meson.build 2025-04-21 14:36:14.672018626 -0600 +diff -ruwN source-old/gio/meson.build source/gio/meson.build +--- source-old/gio/meson.build 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/meson.build 2025-11-07 15:23:11.473092821 -0700 @@ -18,7 +18,7 @@ gnetworking_h_nameser_compat_include = '' @@ -200,9 +179,9 @@ diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/meson.build source/gio/meson. # res_query() res_query_test = '''#include int main (int argc, char ** argv) { -diff -ruwN '--exclude=subprojects' glib-2.82.5/gio/xdgmime/xdgmimecache.c source/gio/xdgmime/xdgmimecache.c ---- glib-2.82.5/gio/xdgmime/xdgmimecache.c 2025-02-20 06:08:16.000000000 -0700 -+++ source/gio/xdgmime/xdgmimecache.c 2025-04-21 14:36:14.673018628 -0600 +diff -ruwN source-old/gio/xdgmime/xdgmimecache.c source/gio/xdgmime/xdgmimecache.c +--- source-old/gio/xdgmime/xdgmimecache.c 2025-02-20 06:08:16.000000000 -0700 ++++ source/gio/xdgmime/xdgmimecache.c 2025-11-07 15:23:11.473286865 -0700 @@ -22,7 +22,7 @@ #include #include