summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2019-03-14 11:07:17 +0000
committerwiz <wiz@pkgsrc.org>2019-03-14 11:07:17 +0000
commit6fb18a43343515c51ec797072a28fc12d62650b2 (patch)
tree7d36c2ae060713cc322c7c4e165d90aa09fde369 /wm
parent1e380ba766802104284b9625a717b16d95096504 (diff)
downloadpkgsrc-6fb18a43343515c51ec797072a28fc12d62650b2.tar.gz
i3: update to 4.16.1.
This is i3 v4.16.1. This version is considered stable. All users of i3 are strongly encouraged to upgrade. This is a bugfix release for v4.16. Bugfixes • Truncate wm_name utf8 strings to first zero byte (fixes window title corruption) • Apply title_align to non-leaf containers Additionally, marks will now display for non-leaf containers. • attach_to_workspace: set new parent before tree_render (fixes a heap-use-after-free) • Use ipc queue for all messages (fixes an i3bar crash) • Fix crash with popups when fullscreen is non-leaf • Fix: render_con shows floating containers on wrong workspace
Diffstat (limited to 'wm')
-rw-r--r--wm/i3/Makefile5
-rw-r--r--wm/i3/distinfo12
-rw-r--r--wm/i3/patches/patch-src_main.c16
3 files changed, 16 insertions, 17 deletions
diff --git a/wm/i3/Makefile b/wm/i3/Makefile
index 86443783c14..18890eefd33 100644
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2018/11/14 22:22:33 kleink Exp $
+# $NetBSD: Makefile,v 1.28 2019/03/14 11:07:17 wiz Exp $
-DISTNAME= i3-4.15
-PKGREVISION= 2
+DISTNAME= i3-4.16.1
CATEGORIES= wm
MASTER_SITES= https://i3wm.org/downloads/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/i3/distinfo b/wm/i3/distinfo
index a5b5fb593b5..c2846143a90 100644
--- a/wm/i3/distinfo
+++ b/wm/i3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2018/10/19 15:21:54 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2019/03/14 11:07:17 wiz Exp $
-SHA1 (i3-4.15.tar.bz2) = 906126f61e62c53903a5ad53cb9288c6fc517a4b
-RMD160 (i3-4.15.tar.bz2) = ef2ca62a8bc1dffb1a191c00a96586557216dbe6
-SHA512 (i3-4.15.tar.bz2) = 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
-Size (i3-4.15.tar.bz2) = 1196263 bytes
+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 (patch-Makefile.in) = 9908543534c88946dd8a430cd208814cae0a03a1
SHA1 (patch-src_log.c) = 4d703eea9609e9b7cc53d85895f0860d085b1f84
-SHA1 (patch-src_main.c) = 5461500584cdc979a9d8491884c75cb01919d358
+SHA1 (patch-src_main.c) = ee8cc2baec841d9deeb53ee69303d260eb0358a7
diff --git a/wm/i3/patches/patch-src_main.c b/wm/i3/patches/patch-src_main.c
index 5a68029b911..40e41588206 100644
--- a/wm/i3/patches/patch-src_main.c
+++ b/wm/i3/patches/patch-src_main.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_main.c,v 1.4 2018/10/19 15:21:54 jperkin Exp $
+$NetBSD: patch-src_main.c,v 1.5 2019/03/14 11:07:18 wiz Exp $
* NetBSD versions lower than 7 does not have shm_open and shm_unlink
see patch-src_log.c
---- src/main.c.orig 2018-03-10 17:29:14.000000000 +0000
+--- src/main.c.orig 2019-01-27 15:45:19.000000000 +0000
+++ src/main.c
-@@ -169,11 +169,13 @@ static void i3_exit(void) {
- ev_loop_destroy(main_loop);
- #endif
-
+@@ -160,11 +160,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);
@@ -16,8 +16,8 @@ $NetBSD: patch-src_main.c,v 1.4 2018/10/19 15:21:54 jperkin Exp $
+#endif
ipc_shutdown(SHUTDOWN_REASON_EXIT);
unlink(config.ipc_socket_path);
- }
-@@ -185,9 +187,11 @@ static void i3_exit(void) {
+ xcb_disconnect(conn);
+@@ -188,9 +190,11 @@ static void i3_exit(void) {
*
*/
static void handle_core_signal(int sig, siginfo_t *info, void *data) {