summaryrefslogtreecommitdiff
path: root/misc/tmux
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-10-06 09:01:41 +0000
committerobache <obache@pkgsrc.org>2013-10-06 09:01:41 +0000
commit90d5776e6487056f5f40700ed1a01870d2a4f034 (patch)
tree5f6a252c0a2e58751b07b15fabe59202eeeaff74 /misc/tmux
parentc63e9f75d799912a0f0d35368ad8e7dbfde2f23e (diff)
downloadpkgsrc-90d5776e6487056f5f40700ed1a01870d2a4f034.tar.gz
fixes build on Solaris10.
PR pkg/48173 by Stefan Palm.
Diffstat (limited to 'misc/tmux')
-rw-r--r--misc/tmux/distinfo4
-rw-r--r--misc/tmux/patches/patch-server-client.c23
2 files changed, 21 insertions, 6 deletions
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 7e3484dff6f..f67a3c5c494 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2013/05/08 18:03:44 minskim Exp $
+$NetBSD: distinfo,v 1.23 2013/10/06 09:01:41 obache Exp $
SHA1 (tmux-1.8.tar.gz) = 08677ea914e1973ce605b0008919717184cbd033
RMD160 (tmux-1.8.tar.gz) = b267ab54f6f55292fa1fa9cd0e892bfd5fd27cfb
Size (tmux-1.8.tar.gz) = 417537 bytes
SHA1 (patch-client.c) = e37053d721bd26d31783af883a7d1f6870095325
SHA1 (patch-osdep-darwin.c) = 259230c4437364fc3c956f2ab1429316e697d228
-SHA1 (patch-server-client.c) = 6c8dd82e2dc1965b8c8f9a8808a262366c80d6b4
+SHA1 (patch-server-client.c) = 1cd724559d5cac935b4bbb1d02a7927ae54ae3fc
SHA1 (patch-utf8.c) = d1703d90131f32eef8688f6255e84a315fccfa1d
diff --git a/misc/tmux/patches/patch-server-client.c b/misc/tmux/patches/patch-server-client.c
index c613c424786..98dc9e52327 100644
--- a/misc/tmux/patches/patch-server-client.c
+++ b/misc/tmux/patches/patch-server-client.c
@@ -1,10 +1,11 @@
-$NetBSD: patch-server-client.c,v 1.1 2013/04/02 10:59:50 fhajny Exp $
+$NetBSD: patch-server-client.c,v 1.2 2013/10/06 09:01:41 obache Exp $
-SunOS errno support needs the right include.
+* SunOS errno support needs the right include.
+* timersub is missing on Solaris10
---- server-client.c.orig 2013-04-02 10:54:02.404886167 +0000
+--- server-client.c.orig 2013-03-26 19:22:31.000000000 +0000
+++ server-client.c
-@@ -26,6 +26,10 @@
+@@ -26,8 +26,24 @@
#include <time.h>
#include <unistd.h>
@@ -14,4 +15,18 @@ SunOS errno support needs the right include.
+
#include "tmux.h"
++#ifndef timersub
++# define timersub(a, b, result) \
++ do { \
++ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
++ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
++ if ((result)->tv_usec < 0) { \
++ --(result)->tv_sec; \
++ (result)->tv_usec += 1000000; \
++ } \
++ } while (0)
++#endif
++
void server_client_check_focus(struct window_pane *);
+ void server_client_check_resize(struct window_pane *);
+ void server_client_check_mouse(struct client *, struct window_pane *);