From c6a24a60dfde69103724b089e14ac3cdb825fc13 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 16 Aug 2019 10:59:55 +0000 Subject: [PATCH] i3: update to 4.17. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ┌────────────────────────────┐ │ Release notes for i3 v4.17 │ └────────────────────────────┘ This release contains a number of assorted fixes and improvements across pretty much all individual components of i3. ┌────────────────────────────┐ │ Changes in i3 v4.17 │ └────────────────────────────┘ • config: make binding modes case-sensitive • default config: mention ~/.config/i3/config • default config: start xss-lock, nm-applet, pactl (volume keys) • docs/userguide: update syntax in strip_workspace_* • docs/userguide: add a section about hidpi displays • docs/userguide: document mark --replace • docs/userguide: uncomment and update mark section example • docs/userguide: point out differences of normal/pixel title bars • docs/userguide: clarify which config directives can be used at runtime • docs/userguide: for_window is a directive, not a command • docs/ipc: clarify event/reply types • docs/ipc: mention new i3-ipc++ C++ library • docs/ipc: clarify restart/exit behavior • docs/i3bar-protocol: add markup • man/i3.man: fix config file search order • ipc: make restart command send a reply once restart completed • ipc: use queue for all messages fixes i3bar issues when switching between workspaces with many windows • i3-dump-log: clarify log message • i3-msg: exit with status code 2 when i3 returns an error • render left and right borders of titles in stacked mode • make swap work with floating windows, fix swap crash • switch to clang-format-6.0 • add input and bounding shapes support (e.g. for the https://github.com/phw/peek screen recorder) • preserve back_and_forth across restarts • allow partial UTF-8 to UCS-2 conversion for better handling of title bar content which cannot be represented (e.g. emoji) when using bitmap pixel fonts • check for duplicate key bindings in i3 -C • i3bar: support transparency via --transparency flag (RGBA) • i3bar: support for user-defined border widths ┌────────────────────────────┐ │ Bugfixes │ └────────────────────────────┘ • build: correctly depend on glib (for g_utf8_make_valid) • build: fix build when git is configured to show signatures • ipc: report correct workspace in init event after workspace move • ipc: send missing window:focus event • i3bar: correctly recognize click events with text alignment • i3bar: fix running without fd 0 • i3bar: correctly handle button presses on separator • i3 --moreversion: warn when $DISPLAY is unset • i3bar: support disabling click events • release.sh: persist correct version number in docs • accept output names containing spaces (e.g. in assignment) • fix cursor resizing positioning • fix aspect ratio issues (e.g. with mpv) • fix brief focus flicker when renaming workspaces • fix crash when canceling i3 via ctrl+c • fix heap-use-after-free, memory leak • fix focus bugs in enabling/disabling RandR outputs • fix crash with popups when fullscreen is non-leaf • fix crash when moving a second window to mark • fix crash with programs with splash screen • fix atoms when closing inactive workspace • apply title_align to non-leaf containers • layout loading: correctly mark non-leaf containers • truncate wm_name utf8 strings to first zero byte (makes window titles work with buggy clients) • fix crash in workspace moving • export I3SOCK environment variable (again) • fix hanging flaky testcase by using the correct X11 connection • resize: add missing error replies • don’t pop up floating windows on the wrong workspace • remove extra \n from errx and die calls --- wm/i3/Makefile | 5 ++--- wm/i3/distinfo | 14 +++++++------- wm/i3/patches/patch-src_log.c | 16 ++++++++-------- wm/i3/patches/patch-src_main.c | 10 +++++----- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/wm/i3/Makefile b/wm/i3/Makefile index 4a9a67f777d1..65af66bbfc13 100644 --- a/wm/i3/Makefile +++ b/wm/i3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2019/08/11 13:24:15 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/08/16 10:59:55 wiz Exp $ -DISTNAME= i3-4.16.1 -PKGREVISION= 1 +DISTNAME= i3-4.17 CATEGORIES= wm MASTER_SITES= https://i3wm.org/downloads/ EXTRACT_SUFX= .tar.bz2 diff --git a/wm/i3/distinfo b/wm/i3/distinfo index c2846143a907..56619da4a4d1 100644 --- a/wm/i3/distinfo +++ b/wm/i3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2019/03/14 11:07:17 wiz Exp $ +$NetBSD: distinfo,v 1.14 2019/08/16 10:59:55 wiz Exp $ -SHA1 (i3-4.16.1.tar.bz2) = 95607b8e09bdf5d18032b2ec391cb1000efcdf5a -RMD160 (i3-4.16.1.tar.bz2) = 4455278dd0f9290283a35bbd99c3256c959bb546 -SHA512 (i3-4.16.1.tar.bz2) = 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0 -Size (i3-4.16.1.tar.bz2) = 1211532 bytes +SHA1 (i3-4.17.tar.bz2) = 737fe6c3d822f25fe8abd4985853d72d5e9e900f +RMD160 (i3-4.17.tar.bz2) = a6934e6edc9f81f2ece7a2c4c015b864b7d8d049 +SHA512 (i3-4.17.tar.bz2) = 88fef7331c8e76126559d1a200bb7f840980e73e1aebad838830d86d9d2225c0f12c969a724aae3d8367ee58e898c55e21e7bc1e6bc1d3b5b5375ce0af969402 +Size (i3-4.17.tar.bz2) = 1219767 bytes SHA1 (patch-Makefile.in) = 9908543534c88946dd8a430cd208814cae0a03a1 -SHA1 (patch-src_log.c) = 4d703eea9609e9b7cc53d85895f0860d085b1f84 -SHA1 (patch-src_main.c) = ee8cc2baec841d9deeb53ee69303d260eb0358a7 +SHA1 (patch-src_log.c) = 776031960fc912477f88a943ba99d6128e76c330 +SHA1 (patch-src_main.c) = ee24742f40126f3b4f1c3e145ad19d97a05c2384 diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c index 6beeaa265ab1..690567b36955 100644 --- a/wm/i3/patches/patch-src_log.c +++ b/wm/i3/patches/patch-src_log.c @@ -1,17 +1,17 @@ -$NetBSD: patch-src_log.c,v 1.5 2017/08/09 11:13:30 nros Exp $ +$NetBSD: patch-src_log.c,v 1.6 2019/08/16 10:59:55 wiz Exp $ * NetBSD versions below and 7 miss shm_open and shm_unlink * NetBSD versions below 8 miss pthread_condattr_pshared ---- src/log.c.orig 2016-03-06 15:17:18.000000000 +0000 -+++ src/log.c 2016-05-01 10:51:32.392955298 +0000 -@@ -116,6 +116,7 @@ +--- src/log.c.orig 2019-08-03 13:14:38.000000000 +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 -@@ -166,6 +167,7 @@ + * 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(); @@ -19,7 +19,7 @@ $NetBSD: patch-src_log.c,v 1.5 2017/08/09 11:13:30 nros Exp $ } /* -@@ -173,11 +175,13 @@ +@@ -182,11 +184,13 @@ void open_logbuffer(void) { * */ void close_logbuffer(void) { diff --git a/wm/i3/patches/patch-src_main.c b/wm/i3/patches/patch-src_main.c index 40e41588206f..c1c4accd5b65 100644 --- a/wm/i3/patches/patch-src_main.c +++ b/wm/i3/patches/patch-src_main.c @@ -1,9 +1,9 @@ -$NetBSD: patch-src_main.c,v 1.5 2019/03/14 11:07:18 wiz Exp $ +$NetBSD: patch-src_main.c,v 1.6 2019/08/16 10:59:55 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-01-27 15:45:19.000000000 +0000 +--- src/main.c.orig 2019-08-03 13:14:38.000000000 +0000 +++ src/main.c -@@ -160,11 +160,13 @@ void main_set_x11_cb(bool enable) { +@@ -161,11 +161,13 @@ void main_set_x11_cb(bool enable) { * */ static void i3_exit(void) { @@ -14,10 +14,10 @@ $NetBSD: patch-src_main.c,v 1.5 2019/03/14 11:07:18 wiz Exp $ shm_unlink(shmlogname); } +#endif - ipc_shutdown(SHUTDOWN_REASON_EXIT); + ipc_shutdown(SHUTDOWN_REASON_EXIT, -1); unlink(config.ipc_socket_path); xcb_disconnect(conn); -@@ -188,9 +190,11 @@ static void i3_exit(void) { +@@ -189,9 +191,11 @@ static void i3_exit(void) { * */ static void handle_core_signal(int sig, siginfo_t *info, void *data) {