From a3e385741ce00aa304df38006253a2dd44b85ded Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Sun, 17 Sep 2023 11:00:05 +0200 Subject: [PATCH] Add gnome-portals.conf --- gnome-session-add-gnome-portals-conf.patch | 42 ++++++++++++++++++++++ gnome-session.spec | 4 +++ 2 files changed, 46 insertions(+) create mode 100644 gnome-session-add-gnome-portals-conf.patch diff --git a/gnome-session-add-gnome-portals-conf.patch b/gnome-session-add-gnome-portals-conf.patch new file mode 100644 index 0000000..1deee9c --- /dev/null +++ b/gnome-session-add-gnome-portals-conf.patch @@ -0,0 +1,42 @@ +From 353a43f81877d23b347c04c30e7ebc861f39c468 Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Tue, 22 Aug 2023 18:20:36 -0300 +Subject: [PATCH] data: Add gnome-portals.conf + +Now that xdg-desktop-portal handles portal implementations using +a well-defined config file, let's ship the GNOME blend of portals +in gnome-portals.conf. Install it under datadir/xdg-desktop-portal, +which usually would resolve to /usr/share/xdg-desktop-portal. + +Closes: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/114 +--- + data/gnome-portals.conf | 4 ++++ + data/meson.build | 5 +++++ + 2 files changed, 9 insertions(+) + create mode 100644 data/gnome-portals.conf + +diff --git a/data/gnome-portals.conf b/data/gnome-portals.conf +new file mode 100644 +index 00000000..198e6445 +--- /dev/null ++++ b/data/gnome-portals.conf +@@ -0,0 +1,4 @@ ++[preferred] ++default=gnome;gtk; ++org.freedesktop.impl.portal.Access=gnome-shell;gtk; ++org.freedesktop.impl.portal.Secret=gnome-keyring; +diff --git a/data/meson.build b/data/meson.build +index f6d264f8..f37924b8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -195,3 +195,8 @@ install_data( + data, + install_dir: session_pkgdatadir + ) ++ ++install_data( ++ 'gnome-portals.conf', ++ install_dir: session_datadir / 'xdg-desktop-portal', ++) +-- +GitLab diff --git a/gnome-session.spec b/gnome-session.spec index 907ac6b..e229b7b 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -28,6 +28,9 @@ Patch: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch # https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/96 Patch: 0001-main-Fix-crash-if-gnome-session-is-started-more-than.patch +# https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/95 +Patch: gnome-session-add-gnome-portals-conf.patch + BuildRequires: meson BuildRequires: gcc BuildRequires: pkgconfig(egl) @@ -127,6 +130,7 @@ Desktop file to add GNOME on wayland to display manager session menu. %{_libexecdir}/gnome-session-failed %{_mandir}/man1/gnome-session*1.* %{_datadir}/gnome-session/ +%{_datadir}/xdg-desktop-portal/gnome-portals.conf %{_datadir}/doc/gnome-session/dbus/gnome-session.html %{_datadir}/GConf/gsettings/gnome-session.convert %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml