From nobody Mon Mar 17 07:56:06 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGS2v1Zb6z5qBjx; Mon, 17 Mar 2025 07:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGS2v0jVkz3cPK; Mon, 17 Mar 2025 07:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742198167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usyqHh0a2TUOzxNjcc7n8L4O7B1L+K0++mYPaqTIQN4=; b=lLkY5akaoie0uBWwRL1BFh6CpfQ0n1OabeVGMgWokeTkruwoHI3z1twdwkkw1C9IQWP9GR Cjsr0oRTxFbcFHcjvKjz3PVmQgZ49RN+M9syviOhQn1/aW0y8Vp+S6QEjfLdPDNo4TNcWb 2zRYvdVbuPBCZ9Na094vyioTz9Jx/xeFeEjTrvcwitr/UJotuvZAK/TGxtU1LUQlZYQCYk XnFrDtFKcnCAQLaDYmH7yeO/B29lgIDeFC4CeKZQ/c5/kfD768SnQue/S3DULCUUwTqmow /ivzo3+MtLSK1m3VroPkXB/UtDA3uw3dbXSfTcGhRqNP/tQgEOjbMWnV1kifng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742198167; a=rsa-sha256; cv=none; b=R5YWE8DLtr686G+0st9qTTTqRCwQ6IgMQNHQB28RNObH2NNVdybK8SP2wGXhqZ1hczsB+U fnhp+XcadTC6Ftp4W6SX6huXirKODLjoLBJd3KEftRBEC/kKKpKd3N6ZnKIOB/1SvLy+30 lZw7N0ICFIKH1h4LG5E0SVhiy4sSnF1KC3Jet/EZN42ij9yoW1Hfy6fzWQ7hkWyMTWIZNR 6nYWFcKJI5hlPvwZ/G1gSi2LzhPnT1R7C3YJgHlgxW+74nBSreUTzeGLJO9QBExMbBwXkq uaaLoCQewLVx8evqYkin0+abuK4G++Xd5V0709thJyyydXkGX3gciVcOOdLKrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742198167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usyqHh0a2TUOzxNjcc7n8L4O7B1L+K0++mYPaqTIQN4=; b=RX78yVx5c0kahqaqcsRByn2OXHnZMfI86+F2Qqh83lVzrdlQ2BTyEqcsIBm0ucMlicfjyB 835mvBrIzwEHvct9I95rcb/EYahpoNsn8bMqVAzxnnesyAlsqny6KhvFhVH1D5tnvc+Qnv Gx0Lt7gMMmzJOzI584ruJtiwLL38IjLa91jZNHGNZ+IpVeo3Uq2+j+m60msgg/P5MxWCR3 bXDolyC1tQXveCNe2cDt9BipxK35S5gF1/CWj7np9JUCpHJi86O2Fe8mNKIGK1mZlC7QOc w2la/T8TqlQh3pR6CSI6trtsvjIctKkmDDfIvZ4gP23TdYez9soq6fgTizNJMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGS2v0F16zfSY; Mon, 17 Mar 2025 07:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52H7u65V016722; Mon, 17 Mar 2025 07:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52H7u6Ig016719; Mon, 17 Mar 2025 07:56:06 GMT (envelope-from git) Date: Mon, 17 Mar 2025 07:56:06 GMT Message-Id: <202503170756.52H7u6Ig016719@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 173f9f7eca40 - main - deskutils/xdg-desktop-portal: Restore a patch fixing Flatpak detection List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 173f9f7eca400826af660f7dce8ae1817cc7e19b Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=173f9f7eca400826af660f7dce8ae1817cc7e19b commit 173f9f7eca400826af660f7dce8ae1817cc7e19b Author: Gleb Popov AuthorDate: 2025-03-17 07:55:15 +0000 Commit: Gleb Popov CommitDate: 2025-03-17 07:56:00 +0000 deskutils/xdg-desktop-portal: Restore a patch fixing Flatpak detection PR: 285458 Reported by: Thibault Payet --- 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 #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;