From 2fc71b1f80defeb6a021320dd8ac1cdbcb2b4b09 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 20 Mar 2024 19:04:32 +0000
Subject: [PATCH] Fix missing declaration for g_fdwalk_set_cloexec() with GLib
 2.80.x

With older GLib, it's provided by libglnx, but with newer GLib, we need
to include the correct header.

Fixes: 7b1cd206 "Replace flatpak_close_fds_workaround() with g_fdwalk_set_cloexec()"
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 common/flatpak-bwrap.c                | 1 +
 portal/flatpak-portal.c               | 1 +
 system-helper/flatpak-system-helper.c | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/common/flatpak-bwrap.c b/common/flatpak-bwrap.c
index 9c4acb1401..f7e8b10e65 100644
--- a/common/flatpak-bwrap.c
+++ b/common/flatpak-bwrap.c
@@ -34,6 +34,7 @@
 
 #include <glib/gi18n-lib.h>
 
+#include <glib-unix.h>
 #include <gio/gio.h>
 #include "libglnx.h"
 
diff --git a/portal/flatpak-portal.c b/portal/flatpak-portal.c
index f2895f25d8..1c53852085 100644
--- a/portal/flatpak-portal.c
+++ b/portal/flatpak-portal.c
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include <glib-unix.h>
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index d42d9d0d74..a58ab2c604 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -34,6 +34,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <glib-unix.h>
+
 #include "flatpak-dbus-generated.h"
 #include "flatpak-dir-private.h"
 #include "flatpak-error.h"