Date: Tuesday, August 11, 2020 @ 18:27:46 Author: grazzolini Revision: 674642
upgpkg: i3-wm 4.18.2-2 Applied the patch 838b600 for https://github.com/i3/i3/issues/4159 Added: i3-wm/trunk/0002-kick-tray-clients-before-destroying-the-bar.patch Modified: i3-wm/trunk/PKGBUILD --------------------------------------------------------+ 0002-kick-tray-clients-before-destroying-the-bar.patch | 34 +++++++++++++++ PKGBUILD | 11 +++- 2 files changed, 42 insertions(+), 3 deletions(-) Added: 0002-kick-tray-clients-before-destroying-the-bar.patch =================================================================== --- 0002-kick-tray-clients-before-destroying-the-bar.patch (rev 0) +++ 0002-kick-tray-clients-before-destroying-the-bar.patch 2020-08-11 18:27:46 UTC (rev 674642) @@ -0,0 +1,34 @@ +From 838b600fead202416013db5c1b57f7031f06bed6 Mon Sep 17 00:00:00 2001 +From: Mark Guptill <compguy...@yahoo.com> +Date: Tue, 30 Jun 2020 04:34:32 -0400 +Subject: [PATCH] kick tray clients before destroying the bar + +--- + i3bar/src/xcb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c +index 94212630..5f01c1d8 100644 +--- a/i3bar/src/xcb.c ++++ b/i3bar/src/xcb.c +@@ -1613,6 +1613,8 @@ void destroy_window(i3_output *output) { + return; + } + ++ kick_tray_clients(output); ++ + draw_util_surface_free(xcb_connection, &(output->bar)); + draw_util_surface_free(xcb_connection, &(output->buffer)); + draw_util_surface_free(xcb_connection, &(output->statusline_buffer)); +@@ -1620,8 +1622,6 @@ void destroy_window(i3_output *output) { + xcb_free_pixmap(xcb_connection, output->buffer.id); + xcb_free_pixmap(xcb_connection, output->statusline_buffer.id); + output->bar.id = XCB_NONE; +- +- kick_tray_clients(output); + } + + /* Strut partial tells i3 where to reserve space for i3bar. This is determined +-- +2.28.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-11 18:22:56 UTC (rev 674641) +++ PKGBUILD 2020-08-11 18:27:46 UTC (rev 674642) @@ -2,7 +2,7 @@ pkgname=i3-wm pkgver=4.18.2 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" url="https://i3wm.org/" arch=(x86_64) @@ -20,10 +20,12 @@ groups=(i3) replaces=(i3 i3bar) source=("https://i3wm.org/downloads/i3-$pkgver.tar.bz2"{,.asc} - 0001-Use-OVER-operator-for-drawing-text.patch) + 0001-Use-OVER-operator-for-drawing-text.patch + 0002-kick-tray-clients-before-destroying-the-bar.patch) sha256sums=('b28617d62f308b93817fc9949daffee74cf4a001685de389f3072cb44cf5120c' 'SKIP' - 'e49e147b1cd06f95188decbbe41f5c3a0aca18d0195750bc3ea16465b4aca563') + 'e49e147b1cd06f95188decbbe41f5c3a0aca18d0195750bc3ea16465b4aca563' + 'f8a3a307951f6a2f5fc740a0d5871e5fb502162d0269c6124d87aabb46e6e11a') validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg prepare() { @@ -33,6 +35,9 @@ # https://github.com/i3/i3/pull/2925 patch -Np1 -i ../0001-Use-OVER-operator-for-drawing-text.patch + # https://github.com/i3/i3/issues/4159 + patch -Np1 -i ../0002-kick-tray-clients-before-destroying-the-bar.patch + autoreconf -fvi }