diff options
author | wiz <wiz@pkgsrc.org> | 2021-11-01 20:42:58 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2021-11-01 20:42:58 +0000 |
commit | 3f31a9b78a727aa644a91d882f6c799b257915a8 (patch) | |
tree | f7ca04b1d90f0ac3b695c319d6a4211e4ac4a6ca | |
parent | 50f7e07a1658844051e31132f4e31c7b7ed01570 (diff) | |
download | pkgsrc-3f31a9b78a727aa644a91d882f6c799b257915a8.tar.gz |
i3: update to 4.20.
Two long-awaited features have been added:
1. You can now use an “include” directive in your i3 config:
https://i3wm.org/docs/userguide.html#include
2. You can now enable showing window icons in window titlebars:
https://i3wm.org/docs/userguide.html#title_window_icon
Other changes:
• default config: use dex for XDG autostart
• docs/ipc: document scratchpad_state
• ipc: the GET_CONFIG request now returns all included files and their details
• i3-nagbar: position on focused monitor by default
• i3-nagbar: add option to position on primary monitor
• i3bar: use first bar config by default
• i3-dmenu-desktop: ignore duplicate files and directories (fixes crash on NixOS)
• i3-dump-log -f now uses UNIX sockets instead of pthreads. The UNIX socket approach
should be more reliable and also more portable.
• When clicking on a tab, focus its child (like when scrolling), or (if
already focused), focus the tab container (alternatingly).
• Implement the include config directive:
https://i3wm.org/docs/userguide.html#include
• Implement optionally showing window icons in titlebar:
https://i3wm.org/docs/userguide.html#title_window_icon
• Allow for_window to match against WM_CLIENT_MACHINE
• Add %machine placeholder (WM_CLIENT_MACHINE) to title_format
• 'move container|workspace to output': toggle a workspace (or container)
between multiple outputs when multiple output names specified.
• Add 'move container|workspace to output next'
• Add 'all' window matching criterion
• Acquire the WM_Sn selection when starting as required by ICCCM
• Add --replace command line argument to replace an existing WM
• Notify systemd when i3 is ready, allowing other services in a systemd user session
to use i3 as a dependency
-rw-r--r-- | wm/i3/Makefile | 5 | ||||
-rw-r--r-- | wm/i3/distinfo | 12 | ||||
-rw-r--r-- | wm/i3/patches/patch-libi3_create__socket.c | 14 | ||||
-rw-r--r-- | wm/i3/patches/patch-src_config__parser.c | 15 | ||||
-rw-r--r-- | wm/i3/patches/patch-src_log.c | 12 |
5 files changed, 39 insertions, 19 deletions
diff --git a/wm/i3/Makefile b/wm/i3/Makefile index dccb283646c..15704a1bbd0 100644 --- a/wm/i3/Makefile +++ b/wm/i3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2021/09/14 06:23:32 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2021/11/01 20:42:58 wiz Exp $ -DISTNAME= i3-4.19.2 -PKGREVISION= 1 +DISTNAME= i3-4.20 CATEGORIES= wm MASTER_SITES= https://i3wm.org/downloads/ EXTRACT_SUFX= .tar.xz diff --git a/wm/i3/distinfo b/wm/i3/distinfo index c5f157449d9..dcc27cf2938 100644 --- a/wm/i3/distinfo +++ b/wm/i3/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.24 2021/10/26 11:25:13 nia Exp $ +$NetBSD: distinfo,v 1.25 2021/11/01 20:42:58 wiz Exp $ -BLAKE2s (i3-4.19.2.tar.xz) = 243d76e6ea940766a548ad5a292582a066ed0c948d6f727e0c40952d6e881557 -SHA512 (i3-4.19.2.tar.xz) = 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d -Size (i3-4.19.2.tar.xz) = 1277396 bytes +BLAKE2s (i3-4.20.tar.xz) = c074d6f79095505008a7a9bc80121f402d755c3fe7bfeffeff09f651caf12932 +SHA512 (i3-4.20.tar.xz) = 7b184116664d2c3e097341e8008fea91bdc446a05177f50f5472890289e862fb41a11edc1d2b8d004347ce312219cb3d80c75840d3427330e3f0ee256163c198 +Size (i3-4.20.tar.xz) = 1286300 bytes SHA1 (patch-etc_config) = d3f649e8d4dc7cae7eb3c1548fa8d81224e4dacb SHA1 (patch-etc_config.keycodes) = 6adde0b3a56576805facd951fa9d32bfd6c88011 +SHA1 (patch-libi3_create__socket.c) = 2e2dbf245b8e34fbbb94a734faa6a31db0bf83db SHA1 (patch-meson.build) = 013ac42f10aeb1ad05b5496f6283878e53506c46 -SHA1 (patch-src_log.c) = 4ade2bf17399c307339cb8c73ba65d2fe418841d +SHA1 (patch-src_config__parser.c) = 36b511cc3efc9ed9d3baf6a9f90197915bae4bfb +SHA1 (patch-src_log.c) = 19b33b43d1716ead4bad36e2afd52ff30af017c1 diff --git a/wm/i3/patches/patch-libi3_create__socket.c b/wm/i3/patches/patch-libi3_create__socket.c new file mode 100644 index 00000000000..54dbd0fa004 --- /dev/null +++ b/wm/i3/patches/patch-libi3_create__socket.c @@ -0,0 +1,14 @@ +$NetBSD: patch-libi3_create__socket.c,v 1.1 2021/11/01 20:42:58 wiz Exp $ + +Include header for S_IRWXU. + +--- libi3/create_socket.c.orig 2021-10-19 06:37:59.902370500 +0000 ++++ libi3/create_socket.c +@@ -14,6 +14,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/socket.h> ++#include <sys/stat.h> + #include <sys/un.h> + + /* diff --git a/wm/i3/patches/patch-src_config__parser.c b/wm/i3/patches/patch-src_config__parser.c new file mode 100644 index 00000000000..ddc93a6e545 --- /dev/null +++ b/wm/i3/patches/patch-src_config__parser.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_config__parser.c,v 1.1 2021/11/01 20:42:58 wiz Exp $ + +NetBSD does not provide get_current_dir_name(). + +--- src/config_parser.c.orig 2021-10-19 06:37:59.902370500 +0000 ++++ src/config_parser.c +@@ -864,7 +864,7 @@ parse_file_result_t parse_file(struct pa + 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); diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c index f02922cbfef..0316b707640 100644 --- a/wm/i3/patches/patch-src_log.c +++ b/wm/i3/patches/patch-src_log.c @@ -1,7 +1,6 @@ -$NetBSD: patch-src_log.c,v 1.9 2021/09/12 07:31:44 nia Exp $ +$NetBSD: patch-src_log.c,v 1.10 2021/11/01 20:42:58 wiz Exp $ - ftruncate() is unimplemented in NetBSD FFS. -- NetBSD lacks pthread_condattr_setpshared. --- src/log.c.orig 2021-02-27 09:37:58.756645200 +0000 +++ src/log.c @@ -14,12 +13,3 @@ $NetBSD: patch-src_log.c,v 1.9 2021/09/12 07:31:44 nia Exp $ if (ftruncate(logbuffer_shm, logbuffer_size) == -1) { fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno)); #else -@@ -161,7 +161,7 @@ void open_logbuffer(void) { - - 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) |