commit: f8c2458342f6432f89815c9882dfe318263cc34d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 17:51:02 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 17:34:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c24583
gui-wm/dwl: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gui-wm/dwl/Manifest | 1 -
gui-wm/dwl/dwl-0.4-r1.ebuild | 81 ------------------------
gui-wm/dwl/files/dwl-0.4-do-not-use-libX11.patch | 60 ------------------
3 files changed, 142 deletions(-)
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index ed31116f0689..63f268c2d1ec 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,2 +1 @@
-DIST dwl-0.4.gh.tar.gz 54718 BLAKE2B
22aac990ed71bcb0be0e2ded7d335c3fb2ffa56d0185e4f15119f54d7dd28ce34c3d8888320f0d448d66c0dd829c036f22367706c4db1bd4a7e2db2dadf410fd
SHA512
8db7e4d9559f57232f9dedc1645458cf504c1d56af93bfe3930ab4734dfe898b0ef7b86c987ec908afa43473fab4bef424abd0036645461dbefeb6ac3e2d0c5f
DIST dwl-v0.5.tar.gz 57363 BLAKE2B
6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7
SHA512
7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8
diff --git a/gui-wm/dwl/dwl-0.4-r1.ebuild b/gui-wm/dwl/dwl-0.4-r1.ebuild
deleted file mode 100644
index 14e10e810266..000000000000
--- a/gui-wm/dwl/dwl-0.4-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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";
- inherit git-r3
-
- # 9999-r0: main (latest stable wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_SLOT="0/9999"
- ;;
- esac
-else
-
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz
-> ${P}.gh.tar.gz"
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl";
-
-LICENSE="CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="X"
-
-PATCHES=( "${FILESDIR}/${P}-do-not-use-libX11.patch" )
-
-RDEPEND="
- dev-libs/libinput:=
- dev-libs/wayland
- gui-libs/wlroots:${WLROOTS_SLOT}[libinput(+),X?]
- x11-libs/libxkbcommon
- X? (
- x11-libs/libxcb:=
- x11-libs/xcb-util-wm
- )
-"
-
-# uses <linux/input-event-codes.h>
-DEPEND="
- ${RDEPEND}
- sys-kernel/linux-headers
-"
-BDEPEND="
- dev-libs/wayland-protocols
- dev-util/wayland-scanner
- virtual/pkgconfig
-"
-
-src_prepare() {
- restore_config config.h
-
- default
-}
-
-src_compile() {
- emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \
- XWAYLAND="$(usev X -DXWAYLAND)" XLIBS="$(usev X "xcb
xcb-icccm")" dwl
-}
-
-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/files/dwl-0.4-do-not-use-libX11.patch
b/gui-wm/dwl/files/dwl-0.4-do-not-use-libX11.patch
deleted file mode 100644
index 65ef8a5b8186..000000000000
--- a/gui-wm/dwl/files/dwl-0.4-do-not-use-libX11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 1a1ca779c7d79747dea355d03db74cd1d73787c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
- <[email protected]>
-Date: Mon, 9 Oct 2023 21:35:49 -0600
-Subject: [PATCH] use <xcb/xcb.h> instead of <X11/Xlib.h>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Leonardo Hernández Hernández <[email protected]>
----
- dwl.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/dwl.c b/dwl.c
-index 19bb6ce..92a1d3e 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -54,7 +54,7 @@
- #include <xkbcommon/xkbcommon.h>
- #ifdef XWAYLAND
- #include <wlr/xwayland.h>
--#include <X11/Xlib.h>
-+#include <xcb/xcb.h>
- #include <xcb/xcb_icccm.h>
- #endif
-
-@@ -387,14 +387,14 @@ static struct wl_listener session_lock_mgr_destroy =
{.notify = destroysessionmg
- static void activatex11(struct wl_listener *listener, void *data);
- static void configurex11(struct wl_listener *listener, void *data);
- static void createnotifyx11(struct wl_listener *listener, void *data);
--static Atom getatom(xcb_connection_t *xc, const char *name);
-+static xcb_atom_t getatom(xcb_connection_t *xc, const char *name);
- static void sethints(struct wl_listener *listener, void *data);
- static void sigchld(int unused);
- static void xwaylandready(struct wl_listener *listener, void *data);
- static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};
- static struct wl_listener xwayland_ready = {.notify = xwaylandready};
- static struct wlr_xwayland *xwayland;
--static Atom netatom[NetLast];
-+static xcb_atom_t netatom[NetLast];
- #endif
-
- /* configuration, allows nested code to access above variables */
-@@ -2671,10 +2671,10 @@ createnotifyx11(struct wl_listener *listener, void
*data)
- LISTEN(&xsurface->events.request_fullscreen, &c->fullscreen,
fullscreennotify);
- }
-
--Atom
-+xcb_atom_t
- getatom(xcb_connection_t *xc, const char *name)
- {
-- Atom atom = 0;
-+ xcb_atom_t atom = 0;
- xcb_intern_atom_reply_t *reply;
- xcb_intern_atom_cookie_t cookie = xcb_intern_atom(xc, 0, strlen(name),
name);
- if ((reply = xcb_intern_atom_reply(xc, cookie, NULL)))
---
-2.42.0
-
