pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
i3-git: Update a patch
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Thu Jun 16 12:43:06 2016 +0200
Changeset: 2169942040bedf1a7ed3b7772afe7b39a47fabd9
Modified Files:
i3-git/distinfo
i3-git/patches/patch-src_log.c
Log Message:
i3-git: Update a patch
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2169942040bedf1a7ed3b7772afe7b39a47fabd9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
i3-git/distinfo | 2 +-
i3-git/patches/patch-src_log.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diffs:
diff --git a/i3-git/distinfo b/i3-git/distinfo
index 4db0872..5f52f50 100644
--- a/i3-git/distinfo
+++ b/i3-git/distinfo
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $
SHA1 (patch-common.mk) = 219f43cf29b19d43885c17e7b6e203ce05afc2e0
-SHA1 (patch-src_log.c) = 3b70d5be029936e02bb2e5beddf2cd7d6adc7328
+SHA1 (patch-src_log.c) = bdcb87df351ad9f4c3346726da8de18732813b8f
diff --git a/i3-git/patches/patch-src_log.c b/i3-git/patches/patch-src_log.c
index e5f02be..90b7e51 100644
--- a/i3-git/patches/patch-src_log.c
+++ b/i3-git/patches/patch-src_log.c
@@ -3,9 +3,9 @@ $NetBSD: patch-src_log.c,v 1.3 2014/08/09 19:14:01 degroote Exp $
Use ftruncate(2) instead of posix_fallocate(2) on NetBSD.
Do not set process-shared attribute on NetBSD.
---- src/log.c.orig 2016-01-11 23:36:55.000000000 +0000
+--- src/log.c.orig 2016-06-16 10:26:19.201603208 +0000
+++ src/log.c
-@@ -129,7 +129,7 @@ void open_logbuffer(void) {
+@@ -134,7 +134,7 @@ void open_logbuffer(void) {
return;
}
@@ -14,8 +14,8 @@ Do not set process-shared attribute on NetBSD.
if (ftruncate(logbuffer_shm, logbuffer_size) == -1) {
fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno));
#else
-@@ -156,8 +156,10 @@ void open_logbuffer(void) {
-
+@@ -162,8 +162,10 @@ void open_logbuffer(void) {
+ #if !defined(__OpenBSD__)
pthread_condattr_t cond_attr;
pthread_condattr_init(&cond_attr);
+#if !defined(__NetBSD__)
@@ -23,5 +23,5 @@ Do not set process-shared attribute on NetBSD.
fprintf(stderr, "pthread_condattr_setpshared() failed, i3-dump-log -f will not work!\n");
+#endif
pthread_cond_init(&(header->condvar), &cond_attr);
+ #endif
- logwalk = logbuffer + sizeof(i3_shmlog_header);
Home |
Main Index |
Thread Index |
Old Index