From 6ce7c841bd1b7fa3e53e805f9200210fc548d29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Sun, 24 Sep 2023 19:31:50 -0600 Subject: [PATCH] gui-wm/dwl: fix nonexistent ${S} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and install desktop file (only for 0.4) Signed-off-by: Leonardo Hernández Hernández Closes: https://github.com/gentoo/gentoo/pull/33043 Signed-off-by: Sam James --- gui-wm/dwl/dwl-0.4.ebuild | 7 ++++++- gui-wm/dwl/dwl-9999-r1.ebuild | 4 +++- gui-wm/dwl/dwl-9999.ebuild | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gui-wm/dwl/dwl-0.4.ebuild b/gui-wm/dwl/dwl-0.4.ebuild index a80953766ba4b..8a5fd16b0c321 100644 --- a/gui-wm/dwl/dwl-0.4.ebuild +++ b/gui-wm/dwl/dwl-0.4.ebuild @@ -5,6 +5,7 @@ EAPI=8 inherit savedconfig toolchain-funcs +MY_P="${PN}-v${PV}" WLROOTS_SLOT="0/16" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/djpohly/dwl" @@ -22,7 +23,8 @@ if [[ ${PV} == *9999* ]]; then ;; esac else - SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~x86" fi @@ -70,5 +72,8 @@ src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install dodoc README.md + insinto /usr/share/wayland-session + doins "${FILESDIR}/dwl.desktop" + save_config config.h } diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild index 9e7a7bdcfaf35..f093811e7e8a5 100644 --- a/gui-wm/dwl/dwl-9999-r1.ebuild +++ b/gui-wm/dwl/dwl-9999-r1.ebuild @@ -5,6 +5,7 @@ EAPI=8 inherit savedconfig toolchain-funcs +MY_P="${PN}-v${PV}" WLROOTS_SLOT="0/16" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/djpohly/dwl" @@ -22,7 +23,8 @@ if [[ ${PV} == *9999* ]]; then ;; esac else - SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~x86" fi diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild index a80953766ba4b..6bb47768ea963 100644 --- a/gui-wm/dwl/dwl-9999.ebuild +++ b/gui-wm/dwl/dwl-9999.ebuild @@ -5,6 +5,7 @@ EAPI=8 inherit savedconfig toolchain-funcs +MY_P="${PN}-v${PV}" WLROOTS_SLOT="0/16" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/djpohly/dwl" @@ -22,7 +23,8 @@ if [[ ${PV} == *9999* ]]; then ;; esac else - SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~x86" fi