Skip to contentSkip to conversation

package: tmux: bump to v2.4

PATCH New Mario J. Rugiero 2 participants 2 messages May 12, 2017 – May 13, 2017

lore
Share & tools
lore

Mario J. Rugiero

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 ...t-re-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
package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch deleted +0 -42
deleted file mode 100644
index bddc2c720..000000000
@@ -1,42 +0,0 @@
-From 9b18a98614a9f201b0883c2b15e7c7bde0aa0ff2 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-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" <[email protected]>
----
- 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 <errno.h>
- const char *
- getprogname(void)
- {
--	extern char	*program_invocation_short_name;
--
- 	return (program_invocation_short_name);
- }
- #elif defined(HAVE___PROGNAME)
--- 
-2.7.4
-
package/tmux/tmux.hash +1 -1
index 9195a1689..ac42571fd 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b  tmux-2.3.tar.gz
+sha256 757d6b13231d0d9dd48404968fc114ac09e005d475705ad0cd4b7166f799b349 tmux-2.4.tar.gz
package/tmux/tmux.mk +1 -1
index f6dd1a9cc..6636b9b5f 100644
@@ -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
Signature · 1 line
2.13.0
Applied
#1 lore raw

PATCH 1/1 package: tmux: bump to v2.4

Hello,

Quoted 6 lines · Mario J. Rugiero

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

Quoted 7 lines
Signed-off-by Mario J. Rugiero <[email protected]>
---
 ...t-re-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

Applied to next, thanks. However, not that the commit title should have been:

package/tmux: bump to v2.4

or:

tmux: bump to v2.4

We don't use "package: tmux: " as a prefix.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com