diff options
| author | leot <leot@pkgsrc.org> | 2020-03-12 11:35:33 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2020-03-12 11:35:33 +0000 |
| commit | 624ca96c867cf8ac7ad9254f32c013433a738a54 (patch) | |
| tree | 17f503b0152259106b40d4a26a961e7cf82a7c83 /misc/tmux | |
| parent | 8afdde3e643bcb34663bcf0becdd8b0466216b15 (diff) | |
| download | pkgsrc-624ca96c867cf8ac7ad9254f32c013433a738a54.tar.gz | |
tmux: Fix build on Solaris due missing paths.h defines
Solaris has paths.h but does not define all _PATH_DEFPATH.
Backport upsrteam commit
<https://github.com/tmux/tmux/commit/92ecd611f68663dfceb2494e637b3ebe51d3fd86>
to address that.
Fixes PR pkg/55065.
Thanks to Joern Clausen for the patch and PR!
Diffstat (limited to 'misc/tmux')
| -rw-r--r-- | misc/tmux/Makefile | 4 | ||||
| -rw-r--r-- | misc/tmux/distinfo | 4 | ||||
| -rw-r--r-- | misc/tmux/patches/patch-compat.h | 58 |
3 files changed, 59 insertions, 7 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index bc92d0bea1b..fc2926e2ab2 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2020/01/18 23:33:09 rillig Exp $ +# $NetBSD: Makefile,v 1.53 2020/03/12 11:35:33 leot Exp $ DISTNAME= tmux-3.0a -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/} GITHUB_RELEASE= ${PKGVERSION_NOREV} diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index f97b334aae1..d1eb34c3577 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.44 2020/01/23 10:09:35 jperkin Exp $ +$NetBSD: distinfo,v 1.45 2020/03/12 11:35:33 leot Exp $ SHA1 (tmux-3.0a.tar.gz) = 0cc951b9ff545b429c101eb562e0be9c5aba5ed4 RMD160 (tmux-3.0a.tar.gz) = 2b781a3632c11098184f787774742b5e5af761ce SHA512 (tmux-3.0a.tar.gz) = f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b Size (tmux-3.0a.tar.gz) = 546377 bytes -SHA1 (patch-compat.h) = 3d78363377e0a518d9fad5c92eccb6209ec13e6c +SHA1 (patch-compat.h) = bee44eb311a6ff5fa64743d61867300303d9c65b diff --git a/misc/tmux/patches/patch-compat.h b/misc/tmux/patches/patch-compat.h index 8e9d9dee110..65e74834517 100644 --- a/misc/tmux/patches/patch-compat.h +++ b/misc/tmux/patches/patch-compat.h @@ -1,9 +1,61 @@ -$NetBSD: patch-compat.h,v 1.1 2020/01/23 10:09:35 jperkin Exp $ +$NetBSD: patch-compat.h,v 1.2 2020/03/12 11:35:33 leot Exp $ -Handle the FNM_CASEFOLD extension. tmux/tmux#2020. +- Solaris has paths.h but does not define all used _PATH_*. + Backport commit 92ecd611f68663dfceb2494e637b3ebe51d3fd86 to address that: + <https://github.com/tmux/tmux/commit/92ecd611f68663dfceb2494e637b3ebe51d3fd86> ---- compat.h.orig 2019-06-26 11:26:30.000000000 +0000 +- Handle the FNM_CASEFOLD extension. + Shared upstream via: + <https://github.com/tmux/tmux/pull/2020> + +--- compat.h.orig 2020-03-12 11:24:29.222099235 +0000 +++ compat.h +@@ -61,12 +61,31 @@ void warn(const char *, ...); + void warnx(const char *, ...); + #endif + +-#ifndef HAVE_PATHS_H +-#define _PATH_BSHELL "/bin/sh" +-#define _PATH_TMP "/tmp/" ++#ifdef HAVE_PATHS_H ++#include <paths.h> ++#endif ++ ++#ifndef _PATH_BSHELL ++#define _PATH_BSHELL "/bin/sh" ++#endif ++ ++#ifndef _PATH_TMP ++#define _PATH_TMP "/tmp/" ++#endif ++ ++#ifndef _PATH_DEVNULL + #define _PATH_DEVNULL "/dev/null" ++#endif ++ ++#ifndef _PATH_TTY + #define _PATH_TTY "/dev/tty" ++#endif ++ ++#ifndef _PATH_DEV + #define _PATH_DEV "/dev/" ++#endif ++ ++#ifndef _PATH_DEFPATH + #define _PATH_DEFPATH "/usr/bin:/bin" + #endif + +@@ -98,10 +117,6 @@ void warnx(const char *, ...); + #include "compat/bitstring.h" + #endif + +-#ifdef HAVE_PATHS_H +-#include <paths.h> +-#endif +- + #ifdef HAVE_LIBUTIL_H + #include <libutil.h> + #endif @@ -154,6 +154,14 @@ void warnx(const char *, ...); #define O_DIRECTORY 0 #endif |