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

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

[Anna Vyalkova]

commit:     8f2d32a64feee96b8dd76ca787533364df381dd8
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun 26 00:46:22 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sat Jun 26 00:49:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8f2d32a6

gui-wm/dwl: savedconfig and use flag for Xwayland

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 gui-wm/dwl/dwl-0.2.1.ebuild  | 45 +++++++++++++++++++++++++++++++++++++-------
 gui-wm/dwl/files/dwl.desktop |  7 +++++++
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/gui-wm/dwl/dwl-0.2.1.ebuild b/gui-wm/dwl/dwl-0.2.1.ebuild
index fbd1f9833..285f36ac7 100644
--- a/gui-wm/dwl/dwl-0.2.1.ebuild
+++ b/gui-wm/dwl/dwl-0.2.1.ebuild
@@ -3,18 +3,49 @@
 
 EAPI=7
 
+inherit flag-o-matic savedconfig toolchain-funcs
+
 DESCRIPTION="dwm for Wayland"
 HOMEPAGE="https://github.com/djpohly/dwl"
-SRC_URI="https://github.com/djpohly/dwl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="CC0-1.0 GPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libinput
+	dev-libs/wayland
+	gui-libs/wlroots[X(-)?]
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
 
-DEPEND="gui-libs/wlroots
-dev-libs/wayland-protocols"
-RDEPEND="${DEPEND}"
+src_prepare() {
+	default
+
+	restore_config config.h
+}
+
+src_configure() {
+	use X && append-cppflags -DXWAYLAND
+	tc-export CC
+}
 
 src_install() {
-	emake PREFIX="${D}"/usr install
+	emake PREFIX="${ED}/usr" install
+
+	insinto /usr/share/wayland-sessions
+	doins "${FILESDIR}"/dwl.desktop
+
+	einstalldocs
+
+	save_config config.h
 }

diff --git a/gui-wm/dwl/files/dwl.desktop b/gui-wm/dwl/files/dwl.desktop
new file mode 100644
index 000000000..343f5d4cd
--- /dev/null
+++ b/gui-wm/dwl/files/dwl.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=dwl
+Comment=dwm for Wayland
+Exec=/usr/bin/dwl
+TryExec=dwl
+Icon=
+Type=Application

[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@outlook.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
-

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

[Simon van der Maas]

commit:     4d49bc35a8ba636556dacee3d2a62036d378aa70
Author:     Simon van der Maas <svdm-gentoo <AT> protonmail <DOT> com>
AuthorDate: Thu Feb 18 10:13:49 2021 +0000
Commit:     Simon van der Maas <svdm-gentoo <AT> protonmail <DOT> com>
CommitDate: Thu Feb 18 10:13:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d49bc35

gui-wm/dwl: fixed ebuild

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Simon van der Maas <svdm-gentoo <AT> protonmail.com>

 gui-wm/dwl/dwl-0.2.ebuild             |  4 +++-
 gui-wm/dwl/files/dwl-0.2-prefix.patch | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/gui-wm/dwl/dwl-0.2.ebuild b/gui-wm/dwl/dwl-0.2.ebuild
index 415e0dd7..fbd1f983 100644
--- a/gui-wm/dwl/dwl-0.2.ebuild
+++ b/gui-wm/dwl/dwl-0.2.ebuild
@@ -15,4 +15,6 @@ DEPEND="gui-libs/wlroots
 dev-libs/wayland-protocols"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-prefix.patch" )
+src_install() {
+	emake PREFIX="${D}"/usr install
+}

diff --git a/gui-wm/dwl/files/dwl-0.2-prefix.patch b/gui-wm/dwl/files/dwl-0.2-prefix.patch
deleted file mode 100644
index 3020247b..00000000
--- a/gui-wm/dwl/files/dwl-0.2-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/config.mk b/config.mk
-index cd4e821..bdb2687 100644
---- a/config.mk
-+++ b/config.mk
-@@ -1,5 +1,5 @@
- # paths
--PREFIX = /usr/local
-+PREFIX = /var/tmp/portage/gui-wm/dwl-0.2/image
-
- # Default compile flags (overridable by environment)
- CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wdeclaration-after-statement

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

[Simon van der Maas]

commit:     a5b31d75c3d3626447ae670d4bd3902ae3167c28
Author:     Simon van der Maas <svdm-gentoo <AT> protonmail <DOT> com>
AuthorDate: Wed Feb 17 17:25:52 2021 +0000
Commit:     Simon van der Maas <svdm-gentoo <AT> protonmail <DOT> com>
CommitDate: Wed Feb 17 17:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5b31d75

gui-wm/dwl: new package

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Simon van der Maas <svdm-gentoo <AT> protonmail.com>

 gui-wm/dwl/Manifest                   |  1 +
 gui-wm/dwl/dwl-0.2.ebuild             | 22 ++++++++++++++++++++++
 gui-wm/dwl/files/dwl-0.2-prefix.patch | 11 +++++++++++
 gui-wm/dwl/metadata.xml               |  8 ++++++++
 4 files changed, 42 insertions(+)

diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
new file mode 100644
index 00000000..a446975c
--- /dev/null
+++ b/gui-wm/dwl/Manifest
@@ -0,0 +1 @@
+DIST dwl-0.2.tar.gz 49105 BLAKE2B c9fc48b1018c46f5a7923dda615ac2bfc3d4ba7ccc588253f02343aa411be61e791093a4ee4938257dd13a4d0e69425ca10ba524dc6e081cb977ee89d0b4165f SHA512 f7903c58ff95f947ac7d5706cf140ff72abcc33c9b8c5b16baa4e548e72aee4f6f0b2cbd95204cc25d000f6a5533c5d8009ad443b1fd95e18c06cda8050ff743

diff --git a/gui-wm/dwl/dwl-0.2.ebuild b/gui-wm/dwl/dwl-0.2.ebuild
new file mode 100644
index 00000000..1e332d95
--- /dev/null
+++ b/gui-wm/dwl/dwl-0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dwm for Wayland"
+HOMEPAGE="https://github.com/djpohly/dwl"
+SRC_URI="https://github.com/djpohly/dwl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="gui-libs/wlroots
+dev-libs/wayland-protocols"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-prefix.patch"
+	eapply_user
+}

diff --git a/gui-wm/dwl/files/dwl-0.2-prefix.patch b/gui-wm/dwl/files/dwl-0.2-prefix.patch
new file mode 100644
index 00000000..3020247b
--- /dev/null
+++ b/gui-wm/dwl/files/dwl-0.2-prefix.patch
@@ -0,0 +1,11 @@
+diff --git a/config.mk b/config.mk
+index cd4e821..bdb2687 100644
+--- a/config.mk
++++ b/config.mk
+@@ -1,5 +1,5 @@
+ # paths
+-PREFIX = /usr/local
++PREFIX = /var/tmp/portage/gui-wm/dwl-0.2/image
+
+ # Default compile flags (overridable by environment)
+ CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wdeclaration-after-statement

diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml
new file mode 100644
index 00000000..ad8cead2
--- /dev/null
+++ b/gui-wm/dwl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>svdm-gentoo@protonmail.com</email>
+        <name>Simon van der Maas</name>
+    </maintainer>
+</pkgmetadata>