CVS commit: pkgsrc/wm/i3

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Oct 31 13:55:17 UTC 2020

Modified Files:
        pkgsrc/wm/i3: Makefile distinfo
        pkgsrc/wm/i3/patches: patch-Makefile.in patch-src_log.c
            patch-src_main.c

Log Message:
i3: update to 4.18.3.

This is a bugfix release for v4.18.

  • Bugfix: kick tray clients before destroying the bar

pkglint cleanup while here.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/wm/i3/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/wm/i3/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/i3/patches/patch-Makefile.in
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/i3/patches/patch-src_log.c \
    pkgsrc/wm/i3/patches/patch-src_main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/i3/Makefile
diff -u pkgsrc/wm/i3/Makefile:1.40 pkgsrc/wm/i3/Makefile:1.41
--- pkgsrc/wm/i3/Makefile:1.40  Fri Sep 25 12:35:47 2020
+++ pkgsrc/wm/i3/Makefile       Sat Oct 31 13:55:17 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2020/09/25 12:35:47 nia Exp $
+# $NetBSD: Makefile,v 1.41 2020/10/31 13:55:17 wiz Exp $
 
-DISTNAME=      i3-4.18.2
-PKGREVISION=   3
+DISTNAME=      i3-4.18.3
 CATEGORIES=    wm
 MASTER_SITES=  https://i3wm.org/downloads/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/i3/distinfo
diff -u pkgsrc/wm/i3/distinfo:1.19 pkgsrc/wm/i3/distinfo:1.20
--- pkgsrc/wm/i3/distinfo:1.19  Fri Sep 25 12:35:47 2020
+++ pkgsrc/wm/i3/distinfo       Sat Oct 31 13:55:17 2020
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2020/09/25 12:35:47 nia Exp $
+$NetBSD: distinfo,v 1.20 2020/10/31 13:55:17 wiz Exp $
 
-SHA1 (i3-4.18.2.tar.bz2) = f31ca8fb7f23ccc8f8a331a948ec223769e688e1
-RMD160 (i3-4.18.2.tar.bz2) = 08315c629d42dc40340d3039a9c7bfb48f01071f
-SHA512 (i3-4.18.2.tar.bz2) = 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
-Size (i3-4.18.2.tar.bz2) = 1218440 bytes
-SHA1 (patch-Makefile.in) = 9908543534c88946dd8a430cd208814cae0a03a1
+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) = 776031960fc912477f88a943ba99d6128e76c330
-SHA1 (patch-src_main.c) = ee24742f40126f3b4f1c3e145ad19d97a05c2384
+SHA1 (patch-src_log.c) = fcc301d7641d94bab75bfcfef94da4c1f25093eb
+SHA1 (patch-src_main.c) = 43583e399386320da320da851c9f3047abd3eef1

Index: pkgsrc/wm/i3/patches/patch-Makefile.in
diff -u pkgsrc/wm/i3/patches/patch-Makefile.in:1.1 pkgsrc/wm/i3/patches/patch-Makefile.in:1.2
--- pkgsrc/wm/i3/patches/patch-Makefile.in:1.1  Wed Aug  9 11:13:30 2017
+++ pkgsrc/wm/i3/patches/patch-Makefile.in      Sat Oct 31 13:55:17 2020
@@ -1,6 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.1 2017/08/09 11:13:30 nros Exp $
+$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 = \

Index: pkgsrc/wm/i3/patches/patch-src_log.c
diff -u pkgsrc/wm/i3/patches/patch-src_log.c:1.6 pkgsrc/wm/i3/patches/patch-src_log.c:1.7
--- pkgsrc/wm/i3/patches/patch-src_log.c:1.6    Fri Aug 16 10:59:55 2019
+++ pkgsrc/wm/i3/patches/patch-src_log.c        Sat Oct 31 13:55:17 2020
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_log.c,v 1.6 2019/08/16 10:59:55 wiz Exp $
+$NetBSD: patch-src_log.c,v 1.7 2020/10/31 13:55:17 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     2019-08-03 13:14:38.000000000 +0000
 +++ src/log.c
 @@ -123,6 +123,7 @@ void init_logging(void) {
Index: pkgsrc/wm/i3/patches/patch-src_main.c
diff -u pkgsrc/wm/i3/patches/patch-src_main.c:1.6 pkgsrc/wm/i3/patches/patch-src_main.c:1.7
--- pkgsrc/wm/i3/patches/patch-src_main.c:1.6   Fri Aug 16 10:59:55 2019
+++ pkgsrc/wm/i3/patches/patch-src_main.c       Sat Oct 31 13:55:17 2020
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_main.c,v 1.6 2019/08/16 10:59:55 wiz Exp $
+$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) {