git: 173f9f7eca40 - main - deskutils/xdg-desktop-portal: Restore a patch fixing Flatpak detection
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 17 Mar 2025 07:56:06 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=173f9f7eca400826af660f7dce8ae1817cc7e19b
commit 173f9f7eca400826af660f7dce8ae1817cc7e19b
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-03-17 07:55:15 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-03-17 07:56:00 +0000
deskutils/xdg-desktop-portal: Restore a patch fixing Flatpak detection
PR: 285458
Reported by: Thibault Payet <monwarez@mailoo.org>
---
deskutils/xdg-desktop-portal/Makefile | 1 +
.../xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile
index fa06f8744bc2..885660ef4111 100644
--- a/deskutils/xdg-desktop-portal/Makefile
+++ b/deskutils/xdg-desktop-portal/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xdg-desktop-portal
PORTVERSION= 1.20.0
+PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= arrowd@FreeBSD.org
diff --git a/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c b/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c
index 9004dbe7be85..87b1b0af66f4 100644
--- a/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c
+++ b/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c
@@ -8,3 +8,14 @@
#ifdef HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif
+@@ -643,6 +644,10 @@ open_flatpak_info (int pid,
+ open_flatpak_info (int pid,
+ GError **error)
+ {
++ g_set_error (error, XDP_APP_INFO_ERROR, XDP_APP_INFO_ERROR_WRONG_APP_KIND,
++ "Certainly not a flatpak");
++ return -1;
++
+ g_autofree char *root_path = NULL;
+ g_autofd int root_fd = -1;
+ g_autofd int info_fd = -1;