Sun Sep 12 07:31:45 2021 UTC ()
i3: avoid posix_fallocate on NetBSD


(nia)
diff -r1.43 -r1.44 pkgsrc/wm/i3/Makefile
diff -r1.21 -r1.22 pkgsrc/wm/i3/distinfo
diff -r1.8 -r1.9 pkgsrc/wm/i3/patches/patch-src_log.c
cvs diff -r1.43 -r1.44 pkgsrc/wm/i3/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/i3/Makefile 2021/09/12 07:22:47 1.43
+++ pkgsrc/wm/i3/Makefile 2021/09/12 07:31:44 1.44
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.43 2021/09/12 07:22:47 nia Exp $ 1# $NetBSD: Makefile,v 1.44 2021/09/12 07:31:44 nia Exp $
2 2
3DISTNAME= i3-4.19.2 3DISTNAME= i3-4.19.2
 4PKGREVISION= 1
4CATEGORIES= wm 5CATEGORIES= wm
5MASTER_SITES= https://i3wm.org/downloads/ 6MASTER_SITES= https://i3wm.org/downloads/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://i3wm.org/ 10HOMEPAGE= https://i3wm.org/
10COMMENT= Improved dynamic tiling window manager 11COMMENT= Improved dynamic tiling window manager
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14USE_TOOLS+= pkg-config perl:run 15USE_TOOLS+= pkg-config perl:run
15USE_LANGUAGES= c99 16USE_LANGUAGES= c99
16 17
cvs diff -r1.21 -r1.22 pkgsrc/wm/i3/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/i3/distinfo 2021/09/12 07:22:47 1.21
+++ pkgsrc/wm/i3/distinfo 2021/09/12 07:31:44 1.22
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.21 2021/09/12 07:22:47 nia Exp $ 1$NetBSD: distinfo,v 1.22 2021/09/12 07:31:44 nia Exp $
2 2
3SHA1 (i3-4.19.2.tar.xz) = c9cbd300ccf5723ba0f749c1369945ea61b82536 3SHA1 (i3-4.19.2.tar.xz) = c9cbd300ccf5723ba0f749c1369945ea61b82536
4RMD160 (i3-4.19.2.tar.xz) = 83d260e3f652290ba299df43920ec13d171317f3 4RMD160 (i3-4.19.2.tar.xz) = 83d260e3f652290ba299df43920ec13d171317f3
5SHA512 (i3-4.19.2.tar.xz) = 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d 5SHA512 (i3-4.19.2.tar.xz) = 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
6Size (i3-4.19.2.tar.xz) = 1277396 bytes 6Size (i3-4.19.2.tar.xz) = 1277396 bytes
7SHA1 (patch-etc_config) = d3f649e8d4dc7cae7eb3c1548fa8d81224e4dacb 7SHA1 (patch-etc_config) = d3f649e8d4dc7cae7eb3c1548fa8d81224e4dacb
8SHA1 (patch-etc_config.keycodes) = 6adde0b3a56576805facd951fa9d32bfd6c88011 8SHA1 (patch-etc_config.keycodes) = 6adde0b3a56576805facd951fa9d32bfd6c88011
9SHA1 (patch-meson.build) = 013ac42f10aeb1ad05b5496f6283878e53506c46 9SHA1 (patch-meson.build) = 013ac42f10aeb1ad05b5496f6283878e53506c46
10SHA1 (patch-src_log.c) = 406b459fa646ae25d80595bdee03ccee5d530d4a 10SHA1 (patch-src_log.c) = 4ade2bf17399c307339cb8c73ba65d2fe418841d
cvs diff -r1.8 -r1.9 pkgsrc/wm/i3/patches/patch-src_log.c (expand / switch to unified diff)

--- pkgsrc/wm/i3/patches/patch-src_log.c 2021/09/12 07:22:47 1.8
+++ pkgsrc/wm/i3/patches/patch-src_log.c 2021/09/12 07:31:44 1.9
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-src_log.c,v 1.8 2021/09/12 07:22:47 nia Exp $ 1$NetBSD: patch-src_log.c,v 1.9 2021/09/12 07:31:44 nia Exp $
2 2
3NetBSD lacks pthread_condattr_setpshared. 3- ftruncate() is unimplemented in NetBSD FFS.
 4- NetBSD lacks pthread_condattr_setpshared.
4 5
5--- src/log.c.orig 2021-02-27 09:37:58.756645200 +0000 6--- src/log.c.orig 2021-02-27 09:37:58.756645200 +0000
6+++ src/log.c 7+++ src/log.c
 8@@ -136,7 +136,7 @@ void open_logbuffer(void) {
 9 return;
 10 }
 11
 12-#if defined(__OpenBSD__) || defined(__APPLE__)
 13+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 14 if (ftruncate(logbuffer_shm, logbuffer_size) == -1) {
 15 fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno));
 16 #else
7@@ -161,7 +161,7 @@ void open_logbuffer(void) { 17@@ -161,7 +161,7 @@ void open_logbuffer(void) {
8  18
9 header = (i3_shmlog_header *)logbuffer; 19 header = (i3_shmlog_header *)logbuffer;
10  20
11-#if !defined(__OpenBSD__) 21-#if !defined(__OpenBSD__)
12+#if !defined(__OpenBSD__) && !defined(__NetBSD__) 22+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
13 pthread_condattr_t cond_attr; 23 pthread_condattr_t cond_attr;
14 pthread_condattr_init(&cond_attr); 24 pthread_condattr_init(&cond_attr);
15 if (pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0) 25 if (pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0)