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 D3F8A158015 for ; Wed, 20 Dec 2023 23:23:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18BED2BC014; Wed, 20 Dec 2023 23:23:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id E6C512BC014 for ; Wed, 20 Dec 2023 23:23:27 +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 D853C3408DD for ; Wed, 20 Dec 2023 23:23:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4236E131D for ; Wed, 20 Dec 2023 23:23:25 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1703114540.903bedd11be81d905d492f6007e8820ecebcff5d.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/sway/, gui-wm/sway/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/sway/files/sway-portals.conf gui-wm/sway/sway-1.8.1-r1.ebuild gui-wm/sway/sway-9999.ebuild X-VCS-Directories: gui-wm/sway/ gui-wm/sway/files/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 903bedd11be81d905d492f6007e8820ecebcff5d X-VCS-Branch: master Date: Wed, 20 Dec 2023 23:23:25 +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: 1cc9b21d-83e7-4c5b-9912-2446decdb075 X-Archives-Hash: 5afc2dfb2ad4232fe3563136d4469e8b commit: 903bedd11be81d905d492f6007e8820ecebcff5d Author: Matthew Thode gentoo org> AuthorDate: Wed Dec 20 23:22:20 2023 +0000 Commit: Matthew Thode gentoo org> CommitDate: Wed Dec 20 23:22:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903bedd1 gui-wm/sway: add sway-portals config closes: https://bugs.gentoo.org/915703 Signed-off-by: Matthew Thode gentoo.org> gui-wm/sway/files/sway-portals.conf | 6 ++++++ .../sway/{sway-9999.ebuild => sway-1.8.1-r1.ebuild} | 21 ++++++++++++++++++++- gui-wm/sway/sway-9999.ebuild | 6 ++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/gui-wm/sway/files/sway-portals.conf b/gui-wm/sway/files/sway-portals.conf new file mode 100644 index 000000000000..aa046f63c4b1 --- /dev/null +++ b/gui-wm/sway/files/sway-portals.conf @@ -0,0 +1,6 @@ +[preferred] +# Use xdg-desktop-portal-gtk for every portal interface... +default=gtk +# ... except for the ScreenCast and Screenshot +org.freedesktop.impl.portal.ScreenCast=wlr +org.freedesktop.impl.portal.Screenshot=wlr diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-1.8.1-r1.ebuild similarity index 86% copy from gui-wm/sway/sway-9999.ebuild copy to gui-wm/sway/sway-1.8.1-r1.ebuild index 088475a36417..5a6cfa95a1ec 100644 --- a/gui-wm/sway/sway-9999.ebuild +++ b/gui-wm/sway/sway-1.8.1-r1.ebuild @@ -20,7 +20,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+man +swaybar +swaynag tray wallpapers X" +IUSE="grimshot +man +swaybar +swaynag tray wallpapers X" DEPEND=" >=dev-libs/json-c-0.13:0= @@ -56,6 +56,13 @@ else fi RDEPEND=" x11-misc/xkeyboard-config + grimshot? ( + app-misc/jq + gui-apps/grim + gui-apps/slurp + gui-apps/wl-clipboard + x11-libs/libnotify + ) ${DEPEND} " BDEPEND=" @@ -87,6 +94,18 @@ src_configure() { meson_src_configure } +src_install() { + meson_src_install + + if use grimshot; then + doman contrib/grimshot.1 + dobin contrib/grimshot + fi + + insinto /usr/share/xdg-desktop-portal/portals + doins "${FILESDIR}/sway-portals.conf" +} + pkg_postinst() { optfeature_header "There are several packages that may be useful with sway:" optfeature "wallpaper utility" gui-apps/swaybg diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild index 088475a36417..3e3ec1143eeb 100644 --- a/gui-wm/sway/sway-9999.ebuild +++ b/gui-wm/sway/sway-9999.ebuild @@ -87,6 +87,12 @@ src_configure() { meson_src_configure } +src_install() { + meson_src_install + insinto /usr/share/xdg-desktop-portal/portals + doins "${FILESDIR}/sway-portals.conf" +} + pkg_postinst() { optfeature_header "There are several packages that may be useful with sway:" optfeature "wallpaper utility" gui-apps/swaybg