From nobody Thu May 9 06:31:03 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VZhwl6r52z5KgZW; Thu, 09 May 2024 06:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VZhwl6Q8Nz4LSZ; Thu, 9 May 2024 06:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715236263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4UFHR8MEpyiHiaT+r32jOLVO4KZyAeMQSWcIOBHGb0=; b=FVi7ICpBYi6YcNfI/WqRo0oYgLG8Xw5rGC3vmWFoaBXQeW98x8PirUfonr67lTfLkKfb0g a1LM838DDrlU8xCC8tirQ4b/dCsmb29XJL0rthhqtXf79b3+Nm/MYfSCqZHPQFgBk1Utzm 7WJHj/664W0KDmLLXtZUxk+P7AEOXHAtCJGpxxPGVkcLF7KyoHNaGDYLR89w+qaVQs8ASb VVNftG51S1j+kSYoxbI41Jn8102T4oEqAT4Q+BpwnH30BCuesTJXtEbMsW9VbD3KahURxW re87kgrRQ6KKJ53+o7MKfV/fcsZKhsR8LR4Hilpk087MbVHhfNcg/uEhs6+7cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715236263; a=rsa-sha256; cv=none; b=EvkwP9NJg11OScHjUYuji9INt3kw5NNug85UGvyKo9QnFLXkE0Ji2lV82kRIsOenGk0wgZ UDSK9pJB8E2qqMYsZ1TzP5soBItTj1ao/l9D41axx3BGFq5LZO/Qq3v54Co1T97qnR8StL mq5cPSauRt9So1MLHyVQjemWkMLrg5yLI4KB9sL9fuFpBl42sIqrBnXcS4SzFnUW6IZunr KpwxGAx7NZfs+88Tlu4ntONO3DuWg/Z4GRC57xgKKtmINJS52+RlK/KzcTO0GWpVH81QJD TD6N97E5SY5Nyc2lS8FxE5hsamMRfCGjbcJ5ESHxGewx/z2i+Ce0cAQm6X/r1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715236263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4UFHR8MEpyiHiaT+r32jOLVO4KZyAeMQSWcIOBHGb0=; b=wwUzlTqEsN7lJec4q+9VTfVfuqpUHp5HYPzu/4s1G8gT26A51e+bvOaF2ZeDAAor8DKDir 7mbVbCVK+UAw2JxL3wB9vWpzXj9eIL3YtclUG3dpD+eD3gOJiXRx6lcU338VsQuhWdIihM j6QjLOhmkJo/RIcUJ/6shsBzmhpANhGhIan5gBCiszwqKiMXkZHzob0NA2WtPDvxJIQJDk XpLm4dhi5r5pWV/cIL/RoBoRaytPLrG2EdpupZeK360BUXNzNJopmDVi+OYQDk+AJddhbh pYgLWMTrhE2bpITIC4UrC8CClkhhqNlC5UnN/ytxVzcIJHKPKbvoB9Du1XMYkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VZhwl5ytFzxkB; Thu, 9 May 2024 06:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4496V3hQ049832; Thu, 9 May 2024 06:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4496V34E049829; Thu, 9 May 2024 06:31:03 GMT (envelope-from git) Date: Thu, 9 May 2024 06:31:03 GMT Message-Id: <202405090631.4496V34E049829@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: ef10d90ce399 - main - x11/tint: Fix crashes caused by conky List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef10d90ce399d295a7887173bd8ebbbd8f3cbe46 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef10d90ce399d295a7887173bd8ebbbd8f3cbe46 commit ef10d90ce399d295a7887173bd8ebbbd8f3cbe46 Author: Fernando Apesteguía AuthorDate: 2024-05-07 15:51:12 +0000 Commit: Fernando Apesteguía 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: {