gentoo auto-resync : 14:10:2023 - 17:40:19

3 files changed, 64 insertions, 1 deletions

diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index 1d3127d8bcc9..4d1151322827 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,6 +1,7 @@
+AUX dwl-0.4-do-not-use-libX11.patch 2152 BLAKE2B 70f99d2723ffb59aea9e274bbbf8d01fc043295b0ed02adbf18885206d12e8dfe3e96be6167098de9dfc83cf11458767584ce9f809769f58e1df92e987818e02 SHA512 ee3718e7f70490c9fd71bbf30a386329d4097502605e14d4d8fd962204a6d015ec5140775f1fc8b11b50a689c8d1692ac910adeed3a00f88eceeaa99b9c820ca
 AUX dwl.desktop 75 BLAKE2B 696aa9fd4f0f8c3f67d6899474ba4759b6b81179dd0ec73162203b7bead322b4a679c4e1d3724d44648755d3c31f0a8d6b1e866232f267c3b7152238f2eec32b SHA512 fc8d6e93b6849512f0cafe7e98ab33fb2f6a5c0ae586e95358f03491a6f9736b54171f291de47d38a5ba7cd8a6eca1a36471842d4cc4c4f65086e98fdf4795f8
 DIST dwl-0.4.gh.tar.gz 54718 BLAKE2B 22aac990ed71bcb0be0e2ded7d335c3fb2ffa56d0185e4f15119f54d7dd28ce34c3d8888320f0d448d66c0dd829c036f22367706c4db1bd4a7e2db2dadf410fd SHA512 8db7e4d9559f57232f9dedc1645458cf504c1d56af93bfe3930ab4734dfe898b0ef7b86c987ec908afa43473fab4bef424abd0036645461dbefeb6ac3e2d0c5f
-EBUILD dwl-0.4-r1.ebuild 1514 BLAKE2B fdc5fa141a5caaa5cf7b702f3b29d717d5b66fc1b0411692d7de324169f074cf102aee8b0b69db8bfbd1599d531b50ae19efc22903f7a443e1e7259111f987b5 SHA512 1e5363105a1e9305f3f91e991a5ab9a021d324e31e849ca431a44ae8654468945f0b6a6d2081b0d131865f990dadc92d8f43bbf33145150585d03a06468b61ac
+EBUILD dwl-0.4-r1.ebuild 1570 BLAKE2B 40245537caa97b6b7a06aa3785d11645786477ff3fd9a1f6afbfa53f0ee8bdc892bd156dd01a548ba83235a0d2f1cdf38290d03e3872fa0ea9fb8a06723b5e79 SHA512 ce603d7edd97d6f981d1dd38e8bdd33020c20c9621cf7ed32c515a4af5fe09af07e5be138c2140abe8dd85a67ec9f613a35a72f24793fcb63edf75f57eac3151
 EBUILD dwl-9999-r1.ebuild 1456 BLAKE2B 151c886286b437eae0fb8bdde3926aa02f3775458b76f887067118af79ade3d7d435a8f53c9931fd078191daddac9556d2faa3a9c03ed335e8c8993e19446d2e SHA512 4fe0addba1be77cc1539d7f918a2415e2f6f69aca5caeb0ace8a00d5e720faace0b1772d695df28c8468c6452ef7e0d4f04cdc7ddda0c6ca986b665f82d4d4c0
 EBUILD dwl-9999.ebuild 1444 BLAKE2B 9c2e8557b83366ec82a94946cf5605a48e0efead10902209401a91333599934934768ffed0910ce1a2701a42219173684cbbfba7f55aa79be712f997ecdce806 SHA512 6ff0bdf07f524bcf6e254a0eca7844f0adfbe1e5414b6a8fb70a40b11f6267358832d62944c3b17fb0b624604219be5085a6a88996eeee6997d21f3adcbab289
 MISC metadata.xml 605 BLAKE2B 5187a02016a0e6f1026498e99cd81110b594e0fe78705f4a382326a3af9f5897e44356da176643a152b502040558d50bad4456490ae351358952b105778eb552 SHA512 68efa2356b6ef06bf968d1510ecbe087ffdb5bbb9d73944c5e319e2f7f10742aa9516cfc25116975322d9a46ea26332f473cb343a6b58c881c02faf614e3d1be
diff --git a/gui-wm/dwl/dwl-0.4-r1.ebuild b/gui-wm/dwl/dwl-0.4-r1.ebuild
index 13123b384a95..14e10e810266 100644
--- a/gui-wm/dwl/dwl-0.4-r1.ebuild
+++ b/gui-wm/dwl/dwl-0.4-r1.ebuild
@@ -35,6 +35,8 @@ 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
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
new file mode 100644
index 000000000000..65ef8a5b8186
--- /dev/null
+++ b/gui-wm/dwl/files/dwl-0.4-do-not-use-libX11.patch
@@ -0,0 +1,60 @@
+From 1a1ca779c7d79747dea355d03db74cd1d73787c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@proton.me>
+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 <leohdz172@proton.me>
+---
+ 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
+