GNU logs - #73520, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#73520] [PATCH 0/2] Potential fix for the latest xdg-desktop-portal
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 27 Sep 2024 21:33:01 +0000
Resent-Message-ID: <handler.73520.B.172747276714779 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 73520 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Fri, 27 Sep 2024 23:17:16 +0400
Message-ID: <cover.1727461684.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::432;
 envelope-from=rodion.goritskov@HIDDEN; helo=mail-wr1-x432.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

Hello!

The problem with the xdg-desktop-portal is due to the configuration changes introduced in this commit [1].
Now it relies on using the configuration file to decide which xdg-desktop-portal implementation to use. However, as Guix uses XDG_DESKTOP_PORTAL_DIR to specify the portal (not the xdg-portal-configuration) directory, the newest xdg-desktop-portal skip configuration search at all [2].
If we patch the process of configuration search a little bit - just to continue searching in case the XDG_DESKTOP_PORTAL_DIR is specified, but doesn't contain any {*}-portals.conf files (our case), we will have the right configuration files (at least for KDE I have tested this changes on) to be read by xdg-desktop-portal according to priorities (XDG_DATA_DIRS in our case) [3] (so they could be even overridden in users' home directory).

It's a bit hacky, but works fine.

[1]: https://github.com/flatpak/xdg-desktop-portal/commit/939f0b0fcec6a42c1acdc397986547e9805359ff
[2]: https://github.com/flatpak/xdg-desktop-portal/blob/1b5a16932493324fa0f21cfb1c3f9c1d16cb6a19/src/portal-impl.c#L441
[3]: https://github.com/flatpak/xdg-desktop-portal/blob/main/doc/portals.conf.rst.in

Rodion Goritskov (2):
  gnu: xdg-desktop-portal-next: Fix configuration file search.
  gnu: xdg-desktop-portal: Update to 1.18.4.

 gnu/local.mk                                  |  1 +
 gnu/packages/freedesktop.scm                  | 77 ++++++-------------
 ...al-disable-configuration-search-exit.patch | 28 +++++++
 gnu/packages/telegram.scm                     |  2 +-
 4 files changed, 55 insertions(+), 53 deletions(-)
 create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch


base-commit: 9a141b5bd633227ea31776b9ce7ca40928de2442
-- 
2.46.0

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Rodion Goritskov <rodion.goritskov@HIDDEN>
Subject: bug#73520: Acknowledgement ([PATCH 0/2] Potential fix for the
 latest xdg-desktop-portal)
Message-ID: <handler.73520.B.172747276714779.ack <at> debbugs.gnu.org>
References: <cover.1727461684.git.rodion.goritskov@HIDDEN>
X-Gnu-PR-Message: ack 73520
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 73520 <at> debbugs.gnu.org
Date: Fri, 27 Sep 2024 21:33:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 73520 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
73520: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73520
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to rodion.goritskov@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#73520] [PATCH 1/2] gnu: xdg-desktop-portal-next: Fix configuration file search.
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: rodion.goritskov@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sat, 28 Sep 2024 07:45:02 +0000
Resent-Message-ID: <handler.73520.B73520.17275094435664 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 73520 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>, Rodion Goritskov <rodion.goritskov@HIDDEN>
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Sat, 28 Sep 2024 11:41:34 +0400
Message-ID: <6c0a8919ba4ccd7dea35b27b9f6ed9a22c57882a.1727461684.git.rodion.goritskov@HIDDEN>
In-Reply-To: <cover.1727461684.git.rodion.goritskov@HIDDEN>
References: <cover.1727461684.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/local.mk: Add patch.
* gnu/packages/freedesktop.scm (xdg-desktop-portal-next): Add patch.
* gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch: New file

Change-Id: Idd637f5613e7d1403fc3a0feeff53a7931e68fc6
---
 gnu/local.mk                                  |  1 +
 gnu/packages/freedesktop.scm                  |  5 ++--
 ...al-disable-configuration-search-exit.patch | 28 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c2027f9eeb..dc08ff2b82 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2311,6 +2311,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch		\
   %D%/packages/patches/x265-arm-flags.patch			\
   %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\
+  %D%/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch\
   %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
   %D%/packages/patches/xen-docs-use-predictable-ordering.patch	\
   %D%/packages/patches/xen-remove-config.gz-timestamp.patch	\
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 23ed788689..73bd5c8a3d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3086,8 +3086,9 @@ (define-public xdg-desktop-portal-next
        (sha256
         (base32
          "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
-       ;; Disable portal tests since they try to use fuse.
-       (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch"))))
+       (patches (search-patches
+                 "xdg-desktop-portal-disable-portal-tests.patch"
+                 "xdg-desktop-portal-disable-configuration-search-exit.patch"))))
     (build-system meson-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments xdg-desktop-portal)
diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch b/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch
new file mode 100644
index 0000000000..4cb77de806
--- /dev/null
+++ b/gnu/packages/patches/xdg-desktop-portal-disable-configuration-search-exit.patch
@@ -0,0 +1,28 @@
+From 37003d1f99246c88cbe7cf2f83616642e0fdf3fb Mon Sep 17 00:00:00 2001
+From: Rodion Goritskov <rodion.goritskov@HIDDEN>
+Date: Fri, 27 Sep 2024 00:44:07 +0400
+Subject: [PATCH] portal-impl: Check if there are any configuration files in XDG_DESKTOP_PORTAL_DIR before exiting configuration search
+
+---
+ src/portal-impl.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/portal-impl.c b/src/portal-impl.c
+index 8c1fd53..8708409 100644
+--- a/src/portal-impl.c
++++ b/src/portal-impl.c
+@@ -438,9 +438,8 @@ load_portal_configuration (gboolean opt_verbose)
+ 
+   if (portal_dir != NULL)
+     {
+-      load_config_directory (portal_dir, desktops, opt_verbose);
+-      /* All other config directories are ignored when this is set */
+-      return;
++      if (load_config_directory (portal_dir, desktops, opt_verbose))
++	return;
+     }
+ 
+   /* $XDG_CONFIG_HOME/xdg-desktop-portal/(DESKTOP-)portals.conf */
+-- 
+2.46.0
+
-- 
2.46.0

Message sent to rodion.goritskov@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#73520] [PATCH 2/2] gnu: xdg-desktop-portal: Update to 1.18.4.
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: rodion.goritskov@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sat, 28 Sep 2024 07:45:02 +0000
Resent-Message-ID: <handler.73520.B73520.17275094505684 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 73520 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>, Rodion Goritskov <rodion.goritskov@HIDDEN>
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Sat, 28 Sep 2024 11:41:35 +0400
Message-ID: <4d6858377ab01fff649eb70b92e01cafe4b42ab0.1727461684.git.rodion.goritskov@HIDDEN>
In-Reply-To: <cover.1727461684.git.rodion.goritskov@HIDDEN>
References: <cover.1727461684.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4.
* gnu/packages/telegram.scm (telegram-desktop): Change native-input to xdg-desktop-portal.

Change-Id: I25ac64ce62f994e1e2cffbdbd8e8a7779a6b9658
---
 gnu/packages/freedesktop.scm | 78 ++++++++++++------------------------
 gnu/packages/telegram.scm    |  2 +-
 2 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 73bd5c8a3d..f86c611c57 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3012,7 +3012,7 @@ (define-public libportal
 (define-public xdg-desktop-portal
   (package
     (name "xdg-desktop-portal")
-    (version "1.16.0")
+    (version "1.18.4")
     (source
      (origin
        (method url-fetch)
@@ -3021,30 +3021,34 @@ (define-public xdg-desktop-portal
              version "/xdg-desktop-portal-" version ".tar.xz"))
        (sha256
         (base32
-         "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav"))))
-    (build-system gnu-build-system)
+         "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
+       (patches (search-patches
+                 "xdg-desktop-portal-disable-portal-tests.patch"
+                 "xdg-desktop-portal-disable-configuration-search-exit.patch"))))
+    (build-system meson-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("glib:bin" ,glib "bin")
-       ("which" ,which)
-       ("gettext" ,gettext-minimal)))
+     (list pkg-config
+           `(,glib "bin")
+           gettext-minimal
+           python
+           python-dbusmock
+           python-pytest
+           python-pytest-xdist))
     (inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf)
-       ("glib" ,glib)
-       ("flatpak" ,flatpak)
-       ("fontconfig" ,fontconfig)
-       ("json-glib" ,json-glib)
-       ("libportal" ,libportal)
-       ("dbus" ,dbus)
-       ("geoclue" ,geoclue)
-       ("pipewire" ,pipewire)
-       ("fuse" ,fuse)))
+     (list bubblewrap
+           gdk-pixbuf
+           glib
+           flatpak
+           fontconfig
+           json-glib
+           libportal
+           dbus
+           geoclue
+           pipewire
+           fuse))
     (arguments
      `(#:configure-flags
-       (list "--with-systemd=no")
+       (list "-Dsystemd=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'po-chmod
@@ -3073,38 +3077,6 @@ (define-public xdg-desktop-portal
 and others.")
     (license license:lgpl2.1+)))
 
-(define-public xdg-desktop-portal-next
-  (package
-    (inherit xdg-desktop-portal)
-    (version "1.18.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/flatpak/xdg-desktop-portal/releases/download/"
-             version "/xdg-desktop-portal-" version ".tar.xz"))
-       (sha256
-        (base32
-         "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
-       (patches (search-patches
-                 "xdg-desktop-portal-disable-portal-tests.patch"
-                 "xdg-desktop-portal-disable-configuration-search-exit.patch"))))
-    (build-system meson-build-system)
-    (arguments
-     (substitute-keyword-arguments (package-arguments xdg-desktop-portal)
-       ((#:configure-flags _ ''())
-        #~(list "-Dsystemd=disabled"))))
-    (native-inputs
-     (list pkg-config
-           `(,glib "bin")
-           gettext-minimal
-           python
-           python-dbusmock
-           python-pytest
-           python-pytest-xdist))
-    (inputs (modify-inputs (package-inputs xdg-desktop-portal)
-              (prepend bubblewrap)))))
-
 (define-public xdg-desktop-portal-gtk
   (package
     (name "xdg-desktop-portal-gtk")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index cfcd92fcbc..c0b2122bf5 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -537,7 +537,7 @@ (define-public telegram-desktop
            `(,gtk+ "bin")
            pkg-config
            python-wrapper
-           xdg-desktop-portal-next))
+           xdg-desktop-portal))
     (inputs
      (list abseil-cpp-cxxstd17
            alsa-lib
-- 
2.46.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#73520] [PATCH 0/2] Potential fix for the latest xdg-desktop-portal
References: <cover.1727461684.git.rodion.goritskov@HIDDEN>
In-Reply-To: <cover.1727461684.git.rodion.goritskov@HIDDEN>
Resent-From: John Kehayias <john.kehayias@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 17 Jan 2025 06:44:02 +0000
Resent-Message-ID: <handler.73520.B73520.173709619027904 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 73520
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Rodion Goritskov <rodion.goritskov@HIDDEN>
Cc: 73520 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by 73520-submit <at> debbugs.gnu.org id=B73520.173709619027904
          (code B ref 73520); Fri, 17 Jan 2025 06:44:02 +0000
Received: (at 73520) by debbugs.gnu.org; 17 Jan 2025 06:43:10 +0000
Received: from localhost ([127.0.0.1]:35769 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tYg4T-0007Fw-Ia
	for submit <at> debbugs.gnu.org; Fri, 17 Jan 2025 01:43:10 -0500
Received: from mail-40134.protonmail.ch ([185.70.40.134]:36985)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <john.kehayias@HIDDEN>)
 id 1tYg4Q-0007FG-63
 for 73520 <at> debbugs.gnu.org; Fri, 17 Jan 2025 01:43:08 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
 s=protonmail3; t=1737096179; x=1737355379;
 bh=UeXCAElVne+8KE4ddzGKUCHDq3zwSOAo1FMkNX0r9fE=;
 h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
 Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector:
 List-Unsubscribe:List-Unsubscribe-Post;
 b=U/wauI/8+Ba5XGG4vKcBclqUoasWY+ioubHc4xsYAMg7IWFFiZAvJfB0ZDAuxgKvW
 OqdcnAp4JuuIBHtQmHK1qleUauyM275LjDXs7bgRC/NCAwUVe8HsM4/rzTk2By2yTG
 biNJDH2jkTELGy8PM8s8W+e1NhdsEWHNYbTbgxJwxYyEoPYI74kuMmzGfZfgON25VV
 Lt/+QAl7foPKNLfFSJxmJ/vVWoE+/9FbpPo2JmY6X4D7ZPQ35pdLOcymc9zVRE/K6h
 nWc4t5UOH58Dkha5QBObdSBtnk2AXHxCuEBkngbwvlF78ZdCE6N6vJVvQBewu+Dgqw
 4AyNoSRLesGeA==
Date: Fri, 17 Jan 2025 06:42:54 +0000
From: John Kehayias <john.kehayias@HIDDEN>
Message-ID: <87ikqe3pqv.fsf@HIDDEN>
Feedback-ID: 7805494:user:proton
X-Pm-Message-ID: c855bcc8dcc894d446f19cac5e2e68de5b1d966f
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi,

CC'ing Maxim from 73403 though maybe we should include some Gnome-team
people? Though the actual xdg-desktop-portal stuff is pretty general and
doesn't fall under any particular team.

On Fri, Sep 27, 2024 at 11:17 PM, Rodion Goritskov wrote:

> Hello!
>
> The problem with the xdg-desktop-portal is due to the configuration
> changes introduced in this commit [1].

By problem, do you mean (or also mean) what was reported as breaking in
Gnome in <https://issues.guix.gnu.org/73403#2>? Have been able to test
that this patch fixes that issue?

> Now it relies on using the configuration file to decide which xdg-desktop=
-portal implementation to use. However, as Guix uses XDG_DESKTOP_PORTAL_DIR=
 to specify the portal (not the xdg-portal-configuration) directory, the ne=
west xdg-desktop-portal skip configuration search at all [2].
> If we patch the process of configuration search a little bit - just to co=
ntinue searching in case the XDG_DESKTOP_PORTAL_DIR is specified, but doesn=
't contain any {*}-portals.conf files (our case), we will have the right co=
nfiguration files (at least for KDE I have tested this changes on) to be re=
ad by xdg-desktop-portal according to priorities (XDG_DATA_DIRS in our case=
) [3] (so they could be even overridden in users' home directory).
>

Thanks for the details! I haven't had a chance to look at this carefully
yet. Has this been reported upstream? Is this something that should be
fixed there or is this too particular to a Guix system?

> It's a bit hacky, but works fine.
>

Works is the important part to start :)

> [1]: https://github.com/flatpak/xdg-desktop-portal/commit/939f0b0fcec6a42=
c1acdc397986547e9805359ff
> [2]: https://github.com/flatpak/xdg-desktop-portal/blob/1b5a16932493324fa=
0f21cfb1c3f9c1d16cb6a19/src/portal-impl.c#L441
> [3]: https://github.com/flatpak/xdg-desktop-portal/blob/main/doc/portals.=
conf.rst.in
>
> Rodion Goritskov (2):
>   gnu: xdg-desktop-portal-next: Fix configuration file search.
>   gnu: xdg-desktop-portal: Update to 1.18.4.
>
>  gnu/local.mk                                  |  1 +
>  gnu/packages/freedesktop.scm                  | 77 ++++++-------------
>  ...al-disable-configuration-search-exit.patch | 28 +++++++
>  gnu/packages/telegram.scm                     |  2 +-
>  4 files changed, 55 insertions(+), 53 deletions(-)
>  create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-confi=
guration-search-exit.patch
>
>
> base-commit: 9a141b5bd633227ea31776b9ce7ca40928de2442

Thanks!
John

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#73520] [PATCH 0/2] Potential fix for the latest xdg-desktop-portal
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 19 Jan 2025 12:28:02 +0000
Resent-Message-ID: <handler.73520.B73520.17372896653249 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 73520
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: John Kehayias <john.kehayias@HIDDEN>
Cc: 73520 <at> debbugs.gnu.org, Rodion Goritskov <rodion.goritskov@HIDDEN>
Received: via spool by 73520-submit <at> debbugs.gnu.org id=B73520.17372896653249
          (code B ref 73520); Sun, 19 Jan 2025 12:28:02 +0000
Received: (at 73520) by debbugs.gnu.org; 19 Jan 2025 12:27:45 +0000
Received: from localhost ([127.0.0.1]:45176 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tZUP3-0000qK-0r
	for submit <at> debbugs.gnu.org; Sun, 19 Jan 2025 07:27:45 -0500
Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:52508)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
 id 1tZUOz-0000q4-VJ
 for 73520 <at> debbugs.gnu.org; Sun, 19 Jan 2025 07:27:42 -0500
Received: by mail-pl1-x632.google.com with SMTP id
 d9443c01a7336-21661be2c2dso65808515ad.1
 for <73520 <at> debbugs.gnu.org>; Sun, 19 Jan 2025 04:27:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1737289655; x=1737894455; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=6wXUl8HsRV64Hc5ImTc+ppgKDzdjiqLW081JHaDIsCo=;
 b=PBou7h3i+/L6or5X5OTF5MyhPqRaWSC8EtveeTED8sZI53i+tgUGCHApOtuCQJQFXs
 /+mRA12/rnvRuRDUd940h0WholQBoyKsaUd5nMTSSbFCOvASEeSAfJWjHdca509BcPZn
 M0JCGQosEGMgudNDIERLNMlTQ4bD7MIOsBJcevhL6XSBY8jZkSlX1QwMQwQPg1/UC+P9
 fRQNSn6A5PHOqCVFB5/NNbrg1l6buYTxkaGE4tYQzZ8f+8xlNoQWY64dkCUl4TFH0qSR
 WBY4FmRtWwXJ3O3lVapBkc298tXL2mAy6AGLgaYxmfvTNLZUrIZtfquTeN39WYwy2yrE
 g3zg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1737289655; x=1737894455;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=6wXUl8HsRV64Hc5ImTc+ppgKDzdjiqLW081JHaDIsCo=;
 b=qi7h9ZHiMW9TBcQHaPocs7jt4U6q5M1CRXlLnd5fifSRLTQImke2xPFZZYzvJEWtwB
 EIrXmArxscA1oPWj+Nbd3NbLVobrdSFAuwLrmp6ZG89o2FXYIBKD/H8agZqaSnm2l0xS
 XBgl1SByQq0AebG9qeU9a7Csj5M56cnDzuRJbCfuRVUUqSaqcyd0xKboZgXgsh1fBCB9
 Js6ZctGSrAh0WqlqXvbOmDrRdHSuFMePfKe0ex/l6ub3a0KUbM/RAXvnXjANG92GaThO
 Gfb9QAGKD5xM+Ug9uof4dUyUvX3Q9MK5wBls/ktTlH1Ai0oezhab3tYE6lJ5xvUgHaN5
 cBCg==
X-Forwarded-Encrypted: i=1;
 AJvYcCUJkZnv5YYol9wzpqVRXW08ypecnWdbnVqchD7Gt94Z13M/Wok+AeDyB3aA/COcYdQMJiI1jQ==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YxajH2STwvkOZf/9U/SQ1/NLmxNfeg4D3WWUdcIJKvS7jUzq9Op
 zcn1pS4taFZuQqKl0Z2ZteSSHrmJUKv29MT7R+UIQ2oRTi74Rs/REflYbk9WLOg=
X-Gm-Gg: ASbGnctG2NvQV1wVQ49I7keSRXj693/lc1STPan4o8/Vi81oGt87MnSm7aIA+f9OEpF
 0+CSBYomfTM6mLOr6WXR/xEoBSlFTUJImbeKsPns3I4ZE3qkgn8nJHKoBtORL1xWdOmLGgjwisT
 b0VGQBbVWaI+rUpV+OsRZcnlbS0KfkI5L4e36gbcj2gIPerEd4Al+82Xo4lJSN85pLaVhGaMaSe
 8RdH7yR11LonFwZahJLzW8Ygmc5vUBr0TGbDQre13hlyVwUt8mrlaBkgIB1VTPWqSE=
X-Google-Smtp-Source: AGHT+IHrO+cKkdEPx4CDmqNqdFF4YiSz+F5g/xt0eEZpJRDGXLLEvd3cESsNDoepAk26t7SAmdJ6Eg==
X-Received: by 2002:a05:6a00:4086:b0:71e:e4f:3e58 with SMTP id
 d2e1a72fcca58-72dafb55a35mr12645585b3a.17.1737289654771; 
 Sun, 19 Jan 2025 04:27:34 -0800 (PST)
Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89])
 by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-72dab7f0efcsm5299372b3a.18.2025.01.19.04.27.32
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sun, 19 Jan 2025 04:27:34 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <87ikqe3pqv.fsf@HIDDEN> (John Kehayias's message of "Fri, 
 17 Jan 2025 06:42:54 +0000")
References: <87ikqe3pqv.fsf@HIDDEN>
Date: Sun, 19 Jan 2025 21:27:23 +0900
Message-ID: <87v7ub6las.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Rodion (and John!),

John Kehayias <john.kehayias@HIDDEN> writes:

[...]

>> Hello!
>>
>> The problem with the xdg-desktop-portal is due to the configuration
>> changes introduced in this commit [1].
>
> By problem, do you mean (or also mean) what was reported as breaking in
> Gnome in <https://issues.guix.gnu.org/73403#2>? Have been able to test
> that this patch fixes that issue?

I'm not Rodion, but I assume that's what they meant!

>> Now it relies on using the configuration file to decide which
>> xdg-desktop-portal implementation to use. However, as Guix uses
>> XDG_DESKTOP_PORTAL_DIR to specify the portal (not the
>> xdg-portal-configuration) directory, the newest xdg-desktop-portal
>> skip configuration search at all [2].
>> If we patch the process of configuration search a little bit - just
>> to continue searching in case the XDG_DESKTOP_PORTAL_DIR is
>> specified, but doesn't contain any {*}-portals.conf files (our
>> case), we will have the right configuration files (at least for KDE
>> I have tested this changes on) to be read by xdg-desktop-portal
>> according to priorities (XDG_DATA_DIRS in our case) [3] (so they
>> could be even overridden in users' home directory).
>>
>
> Thanks for the details! I haven't had a chance to look at this carefully
> yet. Has this been reported upstream? Is this something that should be
> fixed there or is this too particular to a Guix system?

Is it expected that XDG_DESKTOP_PORTAL_DIR as set by Guix can lack a
any *-portals.conf files?  That seems odd.

If there's a good reason for that to happen (a valid use case), then an
issue should be opened upstream to start some conversation about this
change of behavior and the best way it should be addressed.

-- 
Thanks,
Maxim

Last modified: Sun, 19 Jan 2025 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.