Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_163143190583420"
MIME-Version: 1.0
Date: Sun, 12 Sep 2021 07:31:45 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/wm/i3
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20210912073145.1BEAEFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_163143190583420
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Sep 12 07:31:45 UTC 2021

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

Log Message:
i3: avoid posix_fallocate on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/wm/i3/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/wm/i3/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/wm/i3/patches/patch-src_log.c

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


--_----------=_163143190583420
Content-Disposition: inline
Content-Length: 2427
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/wm/i3/Makefile
diff -u pkgsrc/wm/i3/Makefile:1.43 pkgsrc/wm/i3/Makefile:1.44
--- pkgsrc/wm/i3/Makefile:1.43	Sun Sep 12 07:22:47 2021
+++ pkgsrc/wm/i3/Makefile	Sun Sep 12 07:31:44 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2021/09/12 07:22:47 nia Exp $
+# $NetBSD: Makefile,v 1.44 2021/09/12 07:31:44 nia Exp $
 
 DISTNAME=	i3-4.19.2
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	https://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/wm/i3/distinfo
diff -u pkgsrc/wm/i3/distinfo:1.21 pkgsrc/wm/i3/distinfo:1.22
--- pkgsrc/wm/i3/distinfo:1.21	Sun Sep 12 07:22:47 2021
+++ pkgsrc/wm/i3/distinfo	Sun Sep 12 07:31:44 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2021/09/12 07:22:47 nia Exp $
+$NetBSD: distinfo,v 1.22 2021/09/12 07:31:44 nia Exp $
 
 SHA1 (i3-4.19.2.tar.xz) = c9cbd300ccf5723ba0f749c1369945ea61b82536
 RMD160 (i3-4.19.2.tar.xz) = 83d260e3f652290ba299df43920ec13d171317f3
@@ -7,4 +7,4 @@ 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
+SHA1 (patch-src_log.c) = 4ade2bf17399c307339cb8c73ba65d2fe418841d

Index: pkgsrc/wm/i3/patches/patch-src_log.c
diff -u pkgsrc/wm/i3/patches/patch-src_log.c:1.8 pkgsrc/wm/i3/patches/patch-src_log.c:1.9
--- pkgsrc/wm/i3/patches/patch-src_log.c:1.8	Sun Sep 12 07:22:47 2021
+++ pkgsrc/wm/i3/patches/patch-src_log.c	Sun Sep 12 07:31:44 2021
@@ -1,9 +1,19 @@
-$NetBSD: patch-src_log.c,v 1.8 2021/09/12 07:22:47 nia Exp $
+$NetBSD: patch-src_log.c,v 1.9 2021/09/12 07:31:44 nia Exp $
 
-NetBSD lacks pthread_condattr_setpshared.
+- 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
+@@ -136,7 +136,7 @@ void open_logbuffer(void) {
+         return;
+     }
+ 
+-#if defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+     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;


--_----------=_163143190583420--