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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9450B138359 for ; Fri, 13 Nov 2020 21:04:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0394E0825; Fri, 13 Nov 2020 21:04:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 857DFE0822 for ; Fri, 13 Nov 2020 21:04:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6C323410CB for ; Fri, 13 Nov 2020 21:04:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24F4B44C for ; Fri, 13 Nov 2020 21:04:27 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1605301452.1288241272bb563ed94e18d7003d8e9463903d62.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/files/, gui-wm/wayfire/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/wayfire/Manifest gui-wm/wayfire/files/wayfire-session gui-wm/wayfire/files/wayfire-session.desktop gui-wm/wayfire/wayfire-0.6.0.ebuild gui-wm/wayfire/wayfire-9999.ebuild X-VCS-Directories: gui-wm/wayfire/files/ gui-wm/wayfire/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 1288241272bb563ed94e18d7003d8e9463903d62 X-VCS-Branch: master Date: Fri, 13 Nov 2020 21:04:27 +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: 74e74d98-4d32-49f2-ad40-45c6cbeafa20 X-Archives-Hash: cad5e4402893ae2b1969d73120ce4709 commit: 1288241272bb563ed94e18d7003d8e9463903d62 Author: Aisha Tammy aisha cc> AuthorDate: Tue Nov 10 20:31:43 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:04:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12882412 gui-wm/wayfire: version bump to 0.6.0 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Aaron Bauman gentoo.org> gui-wm/wayfire/Manifest | 1 + gui-wm/wayfire/files/wayfire-session | 17 +++++++++++++++++ gui-wm/wayfire/files/wayfire-session.desktop | 7 +++++++ .../{wayfire-9999.ebuild => wayfire-0.6.0.ebuild} | 10 ++++++++-- gui-wm/wayfire/wayfire-9999.ebuild | 10 ++++++++-- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 66ae5e3cf95..f705f3f3043 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1 +1,2 @@ DIST wayfire-0.5.0.tar.xz 670680 BLAKE2B 6a1555669352dd1303f7472db4fbb8ada6173c09825f4e999a2862787bd5bf31e070e9e12110249b9407d8c380235f4a9d3c5be6b23defe36094822526eed6ef SHA512 9c2d116a5d6e77e37b0e4eef26624d43d6ab3a80e56e19a2de1fdd28a2a522c24b9e346eb4529848f3b2c3668460a51f428a0c196286ec8300e4823250eae811 +DIST wayfire-0.6.0.tar.xz 701084 BLAKE2B 3ee0274c706aaa4690e9eb9617d2f272dd1e6573529c40b43d3fd05e79a4ddceef8dec34a7d2363aff8603fb3fd7490c4d2e79e67bff825a3bb68cc8090ad301 SHA512 dc6b5378dc51352ab41ac3c5713e73f341caa2a119a91826818b0a7cde629e63ce855a4376b5c60b468717336dda4806fb1195d534cd7ab2e5d6285c8075102e diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session new file mode 100644 index 00000000000..8267ea0e11f --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-session @@ -0,0 +1,17 @@ +#!/bin/bash + +# output to syslog and stderr +# with PID and syslog identity 'wayfire' +exec 1> >(logger --id=$$ --stderr --tag wayfire) 2>&1 + +# if undefined, or empty, set to freedesktop specification defaults +[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS="/usr/local/share:/usr/share" + +# freedesktop specifications mandate that the definition +# of XDG_SESSION_TYPE should be respected +export XDG_SESSION_TYPE=wayland +export GDK_BACKEND=wayland +export QT_QPA_PLATFORM=wayland +export MOZ_ENABLE_WAYLAND=1 + +exec @EPREFIX@/usr/bin/wayfire "$@" diff --git a/gui-wm/wayfire/files/wayfire-session.desktop b/gui-wm/wayfire/files/wayfire-session.desktop new file mode 100644 index 00000000000..1088c4e0b79 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-session.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Wayfire Session +Comment=wayfire session with proper env vars +Exec=@EPREFIX@/usr/bin/wayfire-session $* +TryExec=@EPREFIX@/usr/bin/wayfire-session +Type=Application +DesktopNames=Wayfire diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-0.6.0.ebuild similarity index 83% copy from gui-wm/wayfire/wayfire-9999.ebuild copy to gui-wm/wayfire/wayfire-0.6.0.ebuild index f2df4accbaa..96f551ce51c 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-0.6.0.ebuild @@ -36,9 +36,9 @@ DEPEND=" X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) - system-wfconfig? ( >=gui-libs/wf-config-${PV} ) + system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) + system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -55,6 +55,10 @@ BDEPEND=" " src_configure() { + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) @@ -67,11 +71,13 @@ src_configure() { src_install() { default meson_src_install + dobin "${T}"/wayfire-session einstalldocs insinto "/usr/share/wayland-sessions/" insopts -m644 doins wayfire.desktop + doins "${T}"/wayfire-session.desktop dodoc wayfire.ini diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild index f2df4accbaa..96f551ce51c 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -36,9 +36,9 @@ DEPEND=" X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman gles? ( media-libs/libglvnd[X?] ) - system-wfconfig? ( >=gui-libs/wf-config-${PV} ) + system-wfconfig? ( >=gui-libs/wf-config-${PV%.*} ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) + system-wlroots? ( >=gui-libs/wlroots-0.12.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -55,6 +55,10 @@ BDEPEND=" " src_configure() { + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die + sed -e "s:@EPREFIX@:${EPREFIX}:" \ + "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) @@ -67,11 +71,13 @@ src_configure() { src_install() { default meson_src_install + dobin "${T}"/wayfire-session einstalldocs insinto "/usr/share/wayland-sessions/" insopts -m644 doins wayfire.desktop + doins "${T}"/wayfire-session.desktop dodoc wayfire.ini