From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDAE8158041 for ; Sat, 9 Mar 2024 09:58:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E255E29D4; Sat, 9 Mar 2024 09:58:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56AC6E29D4 for ; Sat, 9 Mar 2024 09:58:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CEB633C4EE for ; Sat, 9 Mar 2024 09:58:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 582491108 for ; Sat, 9 Mar 2024 09:58:04 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1709978242.780a34ac50aedf131ad9840e910d026eab4ca256.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/ X-VCS-Repository: repo/gentoo X-VCS-Files: xfce-base/xfce4-session/xfce4-session-4.18.3-r1.ebuild xfce-base/xfce4-session/xfce4-session-4.18.3.ebuild xfce-base/xfce4-session/xfce4-session-4.19.1-r1.ebuild xfce-base/xfce4-session/xfce4-session-4.19.1.ebuild X-VCS-Directories: xfce-base/xfce4-session/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 780a34ac50aedf131ad9840e910d026eab4ca256 X-VCS-Branch: master Date: Sat, 9 Mar 2024 09:58:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 03a03797-bdb8-4302-a589-b372f42c68e3 X-Archives-Hash: d0b6f5c4ea0b9748a579c32baa102018 commit: 780a34ac50aedf131ad9840e910d026eab4ca256 Author: Michał Górny gentoo org> AuthorDate: Sat Mar 9 09:32:04 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 9 09:57:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780a34ac xfce-base/xfce4-session: Install xdg-desktop-portal file Closes: https://bugs.gentoo.org/915708 Signed-off-by: Michał Górny gentoo.org> ...ession-4.18.3.ebuild => xfce4-session-4.18.3-r1.ebuild} | 14 +++++++++++++- ...ession-4.19.1.ebuild => xfce4-session-4.19.1-r1.ebuild} | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.3.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.3-r1.ebuild similarity index 76% rename from xfce-base/xfce4-session/xfce4-session-4.18.3.ebuild rename to xfce-base/xfce4-session/xfce4-session-4.18.3-r1.ebuild index 6c91ba8afe5f..0d8fcab79d15 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.18.3.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -66,6 +66,18 @@ src_install() { startxfce4 EOF dosym Xfce4 /etc/X11/Sessions/Xfce + + if [[ -f ${ED}/usr/share/xdg-desktop-portal/xfce-portals.conf ]]; then + die "Please remove the xfce-portals.conf hack" + fi + insinto /usr/share/xdg-desktop-portal + # https://gitlab.xfce.org/xfce/xfce4-session/-/blob/master/xfce4-session/xfce-portals.conf + newins - xfce-portals.conf <<-EOF + [preferred] + default=gtk; + org.freedesktop.impl.portal.Wallpaper=xapp;gtk; + org.freedesktop.impl.portal.Screenshot=xapp;gtk; + EOF } pkg_postinst() { diff --git a/xfce-base/xfce4-session/xfce4-session-4.19.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.19.1-r1.ebuild similarity index 76% rename from xfce-base/xfce4-session/xfce4-session-4.19.1.ebuild rename to xfce-base/xfce4-session/xfce4-session-4.19.1-r1.ebuild index 85ee23d89717..563047e907f0 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.19.1.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.19.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -65,6 +65,18 @@ src_install() { startxfce4 EOF dosym Xfce4 /etc/X11/Sessions/Xfce + + if [[ -f ${ED}/usr/share/xdg-desktop-portal/xfce-portals.conf ]]; then + die "Please remove the xfce-portals.conf hack" + fi + insinto /usr/share/xdg-desktop-portal + # https://gitlab.xfce.org/xfce/xfce4-session/-/blob/master/xfce4-session/xfce-portals.conf + newins - xfce-portals.conf <<-EOF + [preferred] + default=gtk; + org.freedesktop.impl.portal.Wallpaper=xapp;gtk; + org.freedesktop.impl.portal.Screenshot=xapp;gtk; + EOF } pkg_postinst() {