[gentoo-commits] repo/proj/guru:dev commit in: gui-wm/dwl/files/, gui-wm/dwl/

[Leonardo Hernandez]

commit:     d0d326c769e6c57edae44963851cee5d4d37f119
Author:     Leonardo Hernández Hernández <leohdz172 <AT> outlook <DOT> com>
AuthorDate: Thu Mar 31 16:10:30 2022 +0000
Commit:     Leonardo Hernandez <leohdz172 <AT> outlook <DOT> com>
CommitDate: Thu Mar 31 16:10:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0d326c7

gui-wm/dwl: update live ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> outlook.com>

 gui-wm/dwl/dwl-9999.ebuild             | 13 ++++++++-----
 gui-wm/dwl/files/enable-xwayland.patch | 22 ----------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index 53590e463..e70037611 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit savedconfig git-r3
+inherit savedconfig git-r3 flag-o-matic
 
 DESCRIPTION="dwm for Wayland"
 HOMEPAGE="https://github.com/djpohly/dwl"
@@ -32,13 +32,16 @@ BDEPEND="
 src_prepare() {
 	restore_config config.h
 
-	use X && eapply "${FILESDIR}"/enable-xwayland.patch
-
 	default
 }
 
+src_configure() {
+	use X && append-cflags $(test-flags-CC -DXWAYLAND)
+	append-cflags $(test-flags-CC -Wno-unused-result)
+}
+
 src_install() {
-	emake PREFIX="${ED}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	insinto /usr/share/wayland-sessions
 	doins "${FILESDIR}"/dwl.desktop

diff --git a/gui-wm/dwl/files/enable-xwayland.patch b/gui-wm/dwl/files/enable-xwayland.patch
deleted file mode 100644
index b70238550..000000000
--- a/gui-wm/dwl/files/enable-xwayland.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4c643fa8a1f1370fb3e21548fa7a2cad33cb4bec Mon Sep 17 00:00:00 2001
-From: Leonardo Hernandez Hernandez <leohdz172@×××××××.com>
-Date: Sun, 26 Sep 2021 19:12:42 -0500
-Subject: [PATCH] enable xwayland
-
----
- config.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.mk b/config.mk
-index cd4e821..9a886cc 100644
---- a/config.mk
-+++ b/config.mk
-@@ -5,4 +5,4 @@ PREFIX = /usr/local
- CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wdeclaration-after-statement
- 
- # Uncomment to build XWayland support
--#CFLAGS += -DXWAYLAND
-+CFLAGS += -DXWAYLAND
--- 
-2.32.0
-