Date: Thu, 9 May 2024 06:31:03 GMT From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ef10d90ce399 - main - x11/tint: Fix crashes caused by conky Message-ID: <202405090631.4496V34E049829@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef10d90ce399d295a7887173bd8ebbbd8f3cbe46 commit ef10d90ce399d295a7887173bd8ebbbd8f3cbe46 Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2024-05-07 15:51:12 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2024-05-09 06:30:42 +0000 x11/tint: Fix crashes caused by conky The attached patch integrates a band-aid fix into x11/tint which fixes crashes when conky is running on the the same X11 display PR: 278343 Reported by: yamagi@yamagi.org --- x11/tint/Makefile | 2 +- x11/tint/files/patch-src_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/x11/tint/Makefile b/x11/tint/Makefile index 2c1b19430723..2cf2fb3289ee 100644 --- a/x11/tint/Makefile +++ b/x11/tint/Makefile @@ -1,6 +1,6 @@ PORTNAME= tint2 PORTVERSION= 16.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MAINTAINER= yamagi@yamagi.org diff --git a/x11/tint/files/patch-src_main.c b/x11/tint/files/patch-src_main.c new file mode 100644 index 000000000000..085c8ffc3580 --- /dev/null +++ b/x11/tint/files/patch-src_main.c @@ -0,0 +1,12 @@ +--- src/main.c.orig 2024-04-13 07:17:11 UTC ++++ src/main.c +@@ -419,6 +419,9 @@ void handle_x_event(XEvent *e) + if (handle_x_event_autohide(e)) + return; + ++ if ((e->type==4 || e->type==5 || e->type==6) && e->xproperty.window==server.root_win) ++ return; ++ + Panel *panel = get_panel(e->xany.window); + switch (e->type) { + case ButtonPress: {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405090631.4496V34E049829>