i3: update to 4.19.2

 ┌────────────────────────────┐
 │ Changes in i3 v4.19        │
 └────────────────────────────┘

  • userguide: explain button6 and button7 (scroll wheel right/left)
  • ipc: always include the marks property (even if empty)
  • ipc: introduce GET_BINDING_STATE command
  • ipc: clarify workspace name field semantics
  • ipc: document parse_error COMMAND reply field
  • i3bar: launch using exec to avoid leaving useless shell process
  • i3bar: make dock client order deterministic (sorted by class/instance) as a
    side effect, i3bars without an explicit bar-id will be sorted according
    to their definition order in the config file
  • i3bar: update config when necessary (reduces redraws on bar mode changes)
  • i3bar: add coordinates relative to the current output in i3bar click events
  • i3bar: add “nonprimary” output option
  • i3bar: set WM_CLASS instance to bar id
  • i3-input: add different exit codes for when i3-input fails
  • i3-dmenu-desktop: Support symlinks in search path
  • pod2html: render without stylesheet by default
  • introduce “tiling_from” and ”floating_from” criteria
  • mention rofi in default config file
  • allow ppt values in move direction and move position commands
  • allow matching on empty properties like class, title, etc.

9 files changed, 80 insertions, 118 deletions

diff --git a/wm/i3/Makefile b/wm/i3/Makefile
index 578f28d7c39..86bd7e47fb3 100644
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2021/05/24 19:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2021/09/12 07:22:47 nia Exp $
 
-DISTNAME=	i3-4.18.3
-PKGREVISION=	1
+DISTNAME=	i3-4.19.2
 CATEGORIES=	wm
 MASTER_SITES=	https://i3wm.org/downloads/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://i3wm.org/
@@ -12,18 +11,15 @@ COMMENT=	Improved dynamic tiling window manager
 LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake bison lex yacc pkg-config perl:run
+USE_TOOLS+=	pkg-config perl:run
 USE_LANGUAGES=	c99
 
-CONFIGURE_ARGS+=	--disable-builddir
-
 LDFLAGS.SunOS+=	-lgen -liconv -lsocket
 
-PKG_SYSCONFSUBDIR=	i3
-
 EGDIR=		${PREFIX}/share/examples/i3
-CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
-CONF_FILES+=	${EGDIR}/config.keycodes ${PKG_SYSCONFDIR}/config.keycodes
+OWN_DIRS+=	${PKG_SYSCONFDIR}/i3
+CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/i3/config
+CONF_FILES+=	${EGDIR}/config.keycodes ${PKG_SYSCONFDIR}/i3/config.keycodes
 
 REPLACE_PERL+=	i3-dmenu-desktop
 REPLACE_PERL+=	i3-migrate-config-to-v4
@@ -31,10 +27,9 @@ REPLACE_PERL+=	i3-save-tree
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${FIND} ${DESTDIR}${PREFIX} -name '*.orig' -exec ${RM} '{}' ';'
 
-BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
-BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
-
+.include "../../devel/meson/build.mk"
 .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/wm/i3/PLIST b/wm/i3/PLIST
index 2ee90b0e165..4708cd8b5d6 100644
--- a/wm/i3/PLIST
+++ b/wm/i3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/08/09 11:13:30 nros Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/09/12 07:22:47 nia Exp $
 bin/i3
 bin/i3-config-wizard
 bin/i3-dmenu-desktop
@@ -29,17 +29,36 @@ man/man1/i3.1
 man/man1/i3bar.1
 share/applications/i3.desktop
 share/doc/i3/LICENSE
+share/doc/i3/bigpicture.png
 share/doc/i3/debugging.html
 share/doc/i3/hacking-howto.html
+share/doc/i3/i3-sync-working.png
+share/doc/i3/i3-sync.png
 share/doc/i3/i3bar-protocol.html
 share/doc/i3/ipc.html
+share/doc/i3/keyboard-layer1.png
+share/doc/i3/keyboard-layer2.png
+share/doc/i3/layout-saving-1.png
 share/doc/i3/layout-saving.html
-share/doc/i3/lib-i3test-test.html
-share/doc/i3/lib-i3test.html
+share/doc/i3/logo-30.png
+share/doc/i3/modes.png
 share/doc/i3/multi-monitor.html
+share/doc/i3/refcard.html
+share/doc/i3/refcard_style.css
+share/doc/i3/single_terminal.png
+share/doc/i3/snapping.png
 share/doc/i3/testsuite.html
+share/doc/i3/tree-layout1.png
+share/doc/i3/tree-layout2.png
+share/doc/i3/tree-shot1.png
+share/doc/i3/tree-shot2.png
+share/doc/i3/tree-shot3.png
+share/doc/i3/tree-shot4.png
+share/doc/i3/two_columns.png
+share/doc/i3/two_terminals.png
 share/doc/i3/userguide.html
 share/doc/i3/wsbar.html
+share/doc/i3/wsbar.png
 share/examples/i3/config
 share/examples/i3/config.keycodes
 share/xsessions/i3-with-shmlog.desktop
diff --git a/wm/i3/distinfo b/wm/i3/distinfo
index 0d2c4aa5a2d..b31c7cb1ff1 100644
--- a/wm/i3/distinfo
+++ b/wm/i3/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.20 2020/10/31 13:55:17 wiz Exp $
+$NetBSD: distinfo,v 1.21 2021/09/12 07:22:47 nia Exp $
 
-SHA1 (i3-4.18.3.tar.bz2) = aa8403521b0a5f9d98ed425b5e4e2c882c487f49
-RMD160 (i3-4.18.3.tar.bz2) = cfdb8a4e3129ad8410f4b64eae94777a22ade364
-SHA512 (i3-4.18.3.tar.bz2) = 61599b79247ec546819bab22666a78fc8dc77eecbcf6055efb6b52720290fa7f72719ac6670396a6dfb54858781e438b5207c15fdf2cf9e2424a1b84ffeb749c
-Size (i3-4.18.3.tar.bz2) = 1218766 bytes
-SHA1 (patch-Makefile.in) = 57334d85efb237eb2b4b921c315ff5a986ca9c79
-SHA1 (patch-etc_config) = 6f2cbf0005219c236fdedf38addf296515c1feb2
-SHA1 (patch-etc_config.keycodes) = b3eeac13d118e823809f997ce05725ad0d0188a5
-SHA1 (patch-src_log.c) = fcc301d7641d94bab75bfcfef94da4c1f25093eb
-SHA1 (patch-src_main.c) = 43583e399386320da320da851c9f3047abd3eef1
+SHA1 (i3-4.19.2.tar.xz) = c9cbd300ccf5723ba0f749c1369945ea61b82536
+RMD160 (i3-4.19.2.tar.xz) = 83d260e3f652290ba299df43920ec13d171317f3
+SHA512 (i3-4.19.2.tar.xz) = 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
+Size (i3-4.19.2.tar.xz) = 1277396 bytes
+SHA1 (patch-etc_config) = d3f649e8d4dc7cae7eb3c1548fa8d81224e4dacb
+SHA1 (patch-etc_config.keycodes) = 6adde0b3a56576805facd951fa9d32bfd6c88011
+SHA1 (patch-meson.build) = 013ac42f10aeb1ad05b5496f6283878e53506c46
+SHA1 (patch-src_log.c) = 406b459fa646ae25d80595bdee03ccee5d530d4a
diff --git a/wm/i3/patches/patch-Makefile.in b/wm/i3/patches/patch-Makefile.in
deleted file mode 100644
index e443c0009c3..00000000000
--- a/wm/i3/patches/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2020/10/31 13:55:17 wiz Exp $
-
-* install conf files in examples dir to follow the pkgsrc
-  way of installing conf files.
-
---- Makefile.in.orig	2017-08-08 07:26:56.000000000 +0000
-+++ Makefile.in
-@@ -749,7 +749,7 @@ dist_bin_SCRIPTS = \
- 	i3-sensible-pager \
- 	i3-sensible-terminal
- 
--i3confdir = $(sysconfdir)/i3
-+i3confdir = $(datadir)/examples/i3
- dist_i3conf_DATA = \
- 	etc/config \
- 	etc/config.keycodes
diff --git a/wm/i3/patches/patch-etc_config b/wm/i3/patches/patch-etc_config
index 0f3a25614b4..59191290cbe 100644
--- a/wm/i3/patches/patch-etc_config
+++ b/wm/i3/patches/patch-etc_config
@@ -1,10 +1,10 @@
-$NetBSD: patch-etc_config,v 1.1 2020/09/25 12:35:48 nia Exp $
+$NetBSD: patch-etc_config,v 1.2 2021/09/12 07:22:47 nia Exp $
 
 Useful default volume controls for NetBSD.
 
---- etc/config.orig	2020-07-26 08:11:37.000000000 +0000
+--- etc/config.orig	2021-02-27 09:37:58.746645500 +0000
 +++ etc/config
-@@ -22,18 +22,24 @@ font pango:monospace 8
+@@ -22,18 +22,22 @@ font pango:monospace 8
  
  # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
  # screen before suspend. Use loginctl lock-session to lock your screen.
@@ -25,8 +25,6 @@ Useful default volume controls for NetBSD.
 -bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 +bindsym XF86AudioRaiseVolume exec --no-startup-id mixerctl -w outputs.master+=15 && $refresh_i3status
 +bindsym XF86AudioLowerVolume exec --no-startup-id mixerctl -w outputs.master-=15 && $refresh_i3status
-+bindsym XF86AudioMute exec --no-startup-id mixerctl -w outputs.master=0 && $refresh_i3status
-+bindsym XF86AudioMicMute exec --no-startup-id mixerctl -w inputs.reclevel=0 && $refresh_i3status
 +
 +# Use pactl to adjust volume in PulseAudio.
 +#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
diff --git a/wm/i3/patches/patch-etc_config.keycodes b/wm/i3/patches/patch-etc_config.keycodes
index 965e9bb2771..b67c3a4ba28 100644
--- a/wm/i3/patches/patch-etc_config.keycodes
+++ b/wm/i3/patches/patch-etc_config.keycodes
@@ -1,10 +1,10 @@
-$NetBSD: patch-etc_config.keycodes,v 1.1 2020/09/25 12:35:48 nia Exp $
+$NetBSD: patch-etc_config.keycodes,v 1.2 2021/09/12 07:22:47 nia Exp $
 
 Useful default volume controls for NetBSD.
 
---- etc/config.keycodes.orig	2020-07-26 08:11:37.000000000 +0000
+--- etc/config.keycodes.orig	2021-02-27 09:37:58.746645500 +0000
 +++ etc/config.keycodes
-@@ -23,18 +23,24 @@ font pango:monospace 8
+@@ -23,18 +23,22 @@ font pango:monospace 8
  
  # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
  # screen before suspend. Use loginctl lock-session to lock your screen.
@@ -25,8 +25,6 @@ Useful default volume controls for NetBSD.
 -bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 +bindsym XF86AudioRaiseVolume exec --no-startup-id mixerctl -w outputs.master+=5 && $refresh_i3status
 +bindsym XF86AudioLowerVolume exec --no-startup-id mixerctl -w outputs.master-=5 && $refresh_i3status
-+bindsym XF86AudioMute exec --no-startup-id mixerctl -w outputs.master=0 && $refresh_i3status
-+bindsym XF86AudioMicMute exec --no-startup-id mixerctl -w inputs.reclevel=0 && $refresh_i3status
 +
 +# Use pactl to adjust volume in PulseAudio.
 +#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
diff --git a/wm/i3/patches/patch-meson.build b/wm/i3/patches/patch-meson.build
new file mode 100644
index 00000000000..6f9f04bbe32
--- /dev/null
+++ b/wm/i3/patches/patch-meson.build
@@ -0,0 +1,24 @@
+$NetBSD: patch-meson.build,v 1.1 2021/09/12 07:22:47 nia Exp $
+
+Install config files to examples, per pkgsrc policy.
+
+--- meson.build.orig	2021-02-27 09:37:58.753311900 +0000
++++ meson.build
+@@ -44,7 +44,7 @@ else
+   cdata.set('PATCH_VERSION', 0)
+ endif
+ cdata.set_quoted('I3_VERSION', '@VCS_TAG@')
+-cdata.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir')))
++cdata.set_quoted('SYSCONFDIR', join_paths(get_option('sysconfdir')))
+ 
+ if get_option('b_sanitize').split(',').contains('address')
+   cdata.set('I3_ASAN_ENABLED', 1)
+@@ -580,7 +580,7 @@ install_data(
+ install_subdir(
+   'etc',
+   strip_directory: true,
+-  install_dir: join_paths(get_option('sysconfdir'), 'i3'),
++  install_dir: join_paths(get_option('datadir'), 'examples', 'i3'),
+ )
+ 
+ install_subdir(
diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c
index 24815a0959f..81b5abc0ec9 100644
--- a/wm/i3/patches/patch-src_log.c
+++ b/wm/i3/patches/patch-src_log.c
@@ -1,37 +1,15 @@
-$NetBSD: patch-src_log.c,v 1.7 2020/10/31 13:55:17 wiz Exp $
+$NetBSD: patch-src_log.c,v 1.8 2021/09/12 07:22:47 nia Exp $
 
-* NetBSD versions below and 7 miss shm_open and shm_unlink
-* NetBSD versions below 8 miss pthread_condattr_pshared 
+NetBSD lacks pthread_condattr_setpshared.
 
---- src/log.c.orig	2019-08-03 13:14:38.000000000 +0000
+--- src/log.c.orig	2021-02-27 09:37:58.756645200 +0000
 +++ src/log.c
-@@ -123,6 +123,7 @@ void init_logging(void) {
-  *
-  */
- void open_logbuffer(void) {
-+#if !defined(__NetBSD__) 
-     /* Reserve 1% of the RAM for the logfile, but at max 25 MiB.
-      * For 512 MiB of RAM this will lead to a 5 MiB log buffer.
-      * At the moment (2011-12-10), no testcase leads to an i3 log
-@@ -175,6 +176,7 @@ void open_logbuffer(void) {
-     logwalk = logbuffer + sizeof(i3_shmlog_header);
-     loglastwrap = logbuffer + logbuffer_size;
-     store_log_markers();
-+#endif /* !defined(__NetBSD__) */
- }
+@@ -161,7 +161,7 @@ void open_logbuffer(void) {
  
- /*
-@@ -182,11 +184,13 @@ void open_logbuffer(void) {
-  *
-  */
- void close_logbuffer(void) {
-+#if !defined(__NetBSD__)
-     close(logbuffer_shm);
-     shm_unlink(shmlogname);
-     free(shmlogname);
-     logbuffer = NULL;
-     shmlogname = "";
-+#endif /* !defined(__NetBSD__) */
- }
+     header = (i3_shmlog_header *)logbuffer;
  
- /*
+-#if !defined(__OpenBSD__)
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+     pthread_condattr_t cond_attr;
+     pthread_condattr_init(&cond_attr);
+     if (pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0)
diff --git a/wm/i3/patches/patch-src_main.c b/wm/i3/patches/patch-src_main.c
deleted file mode 100644
index 6df3a59a707..00000000000
--- a/wm/i3/patches/patch-src_main.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-src_main.c,v 1.7 2020/10/31 13:55:17 wiz Exp $
-
-* NetBSD versions lower than 7 does not have shm_open and shm_unlink
-  see patch-src_log.c 
-
---- src/main.c.orig	2019-08-03 13:14:38.000000000 +0000
-+++ src/main.c
-@@ -161,11 +161,13 @@ void main_set_x11_cb(bool enable) {
-  *
-  */
- static void i3_exit(void) {
-+#if !defined(__NetBSD__)
-     if (*shmlogname != '\0') {
-         fprintf(stderr, "Closing SHM log \"%s\"\n", shmlogname);
-         fflush(stderr);
-         shm_unlink(shmlogname);
-     }
-+#endif
-     ipc_shutdown(SHUTDOWN_REASON_EXIT, -1);
-     unlink(config.ipc_socket_path);
-     xcb_disconnect(conn);
-@@ -189,9 +191,11 @@ static void i3_exit(void) {
-  *
-  */
- static void handle_core_signal(int sig, siginfo_t *info, void *data) {
-+#if !defined(__NetBSD__)
-     if (*shmlogname != '\0') {
-         shm_unlink(shmlogname);
-     }
-+#endif
-     raise(sig);
- }
-