git: 50b9218ce7d5 - main - x11-wm/i3: update to 4.20

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=50b9218ce7d5e0d9ac78bb364fde5e3412feb049

commit 50b9218ce7d5e0d9ac78bb364fde5e3412feb049
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-11-02 09:55:47 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-11-02 15:56:51 +0000

    x11-wm/i3: update to 4.20
---
 x11-wm/i3/Makefile                         |  9 ++++-----
 x11-wm/i3/distinfo                         |  8 +++-----
 x11-wm/i3/files/patch-include_libi3.h      | 10 ++++++++++
 x11-wm/i3/files/patch-src_config__parser.c | 11 +++++++++++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 6b93d4fc8a6f..3cb8bba2b4fe 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -1,14 +1,11 @@
 # Created by: Dennis Herrmann <dhn@FreeBSD.org>
 
 PORTNAME=	i3
-DISTVERSION=	4.19.2
+DISTVERSION=	4.20
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://i3wm.org/downloads/ \
 		http://i3wm.org/downloads/
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES+=	d0067077ed9f.patch:-p1 # https://github.com/i3/i3/pull/4264
-
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Improved dynamic tiling window manager
 
@@ -32,7 +29,9 @@ RUN_DEPENDS=	p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3 \
 		p5-IPC-Run>=0:devel/p5-IPC-Run \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
-USES=		compiler:c11 iconv localbase:ldflags meson perl5 pkgconfig tar:xz xorg
+USES=		compiler:c11 gnome iconv localbase:ldflags meson perl5 \
+		pkgconfig tar:xz xorg
+USE_GNOME=	glib20
 USE_XORG=	xcb
 MESON_ARGS=	-Ddocs=false \
 		-Dmans=false
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index 3a33737becc0..de3d4440c6bc 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1614605399
-SHA256 (i3-4.19.2.tar.xz) = 8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279
-SIZE (i3-4.19.2.tar.xz) = 1277396
-SHA256 (d0067077ed9f.patch) = 2131a32d9b96c359ce169b243c8a87e826d508a0842a373009255e2f424a7fe2
-SIZE (d0067077ed9f.patch) = 1174
+TIMESTAMP = 1635845011
+SHA256 (i3-4.20.tar.xz) = 8cf4f174f6cf554f38563380681abe25868e9955883791e0986ecd89c53ac322
+SIZE (i3-4.20.tar.xz) = 1286300
diff --git a/x11-wm/i3/files/patch-include_libi3.h b/x11-wm/i3/files/patch-include_libi3.h
new file mode 100644
index 000000000000..660691cc77ab
--- /dev/null
+++ b/x11-wm/i3/files/patch-include_libi3.h
@@ -0,0 +1,10 @@
+--- include/libi3.h.orig	2021-10-19 06:37:59 UTC
++++ include/libi3.h
+@@ -15,6 +15,7 @@
+ #include <stdbool.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <sys/stat.h>
+ #include <xcb/xcb.h>
+ #include <xcb/xproto.h>
+ #include <xcb/xcb_keysyms.h>
diff --git a/x11-wm/i3/files/patch-src_config__parser.c b/x11-wm/i3/files/patch-src_config__parser.c
new file mode 100644
index 000000000000..599675c1b0ed
--- /dev/null
+++ b/x11-wm/i3/files/patch-src_config__parser.c
@@ -0,0 +1,11 @@
+--- src/config_parser.c.orig	2021-10-19 06:37:59 UTC
++++ src/config_parser.c
+@@ -864,7 +864,7 @@ parse_file_result_t parse_file(struct parser_ctx *ctx,
+     FILE *fstr;
+     char buffer[4096], key[512], value[4096], *continuation = NULL;
+ 
+-    char *old_dir = get_current_dir_name();
++    char *old_dir = getwd(NULL);
+     char *dir = NULL;
+     /* dirname(3) might modify the buffer, so make a copy: */
+     char *dirbuf = sstrdup(f);