From f1b31f07e6a915336fb8ff6750851b94369bf68b Mon Sep 17 00:00:00 2001 From: Mario Rugiero Date: Fri, 12 May 2017 13:59:43 -0300 Subject: [PATCH] package/tmux: bump to v2.4 Also removes 0001-compat-don-t-re-define-program_invocation_short_name.patch, since it's applied to upstream in this version. Tested with: qemu_ppc_g3beige_defconfig Signed-off-by: Mario J. Rugiero Signed-off-by: Thomas Petazzoni --- ...define-program_invocation_short_name.patch | 42 ------------------- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 2 +- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch diff --git a/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch b/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch deleted file mode 100644 index bddc2c720d..0000000000 --- a/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9b18a98614a9f201b0883c2b15e7c7bde0aa0ff2 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 5 Feb 2017 17:12:00 +0100 -Subject: [PATCH] compat: don't re-define program_invocation_short_name - -program_invocation_short_name is defined in errno.h, and its definition -can differ between the various C libraries: glibc defines it as: - extern char *program_invocation_short_name; - -while uClibc defines it as: - extern const char *program_invocation_short_name; - -So there is not simple solution to know the prototype. - -But since it is defined in errno.h, there is no reason to try and define -it ourselves; let's just trust what the header provides. - -Signed-off-by: "Yann E. MORIN" ---- - compat/getprogname.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/compat/getprogname.c b/compat/getprogname.c -index 80a496d..ad619fc 100644 ---- a/compat/getprogname.c -+++ b/compat/getprogname.c -@@ -19,11 +19,10 @@ - #include "compat.h" - - #if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME) -+#include - const char * - getprogname(void) - { -- extern char *program_invocation_short_name; -- - return (program_invocation_short_name); - } - #elif defined(HAVE___PROGNAME) --- -2.7.4 - diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 9195a1689c..ac42571fdf 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b tmux-2.3.tar.gz +sha256 757d6b13231d0d9dd48404968fc114ac09e005d475705ad0cd4b7166f799b349 tmux-2.4.tar.gz diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index f6dd1a9cc6..6636b9b5ff 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,7 +4,7 @@ # ################################################################################ -TMUX_VERSION = 2.3 +TMUX_VERSION = 2.4 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = README -- 2.30.2