Commit 16340fae authored by Ricardo Martincoski's avatar Ricardo Martincoski Committed by Thomas Petazzoni
Browse files

tmux: bump to version 2.1 



Add patch to fix musl build by removing inclusion of sys/cdefs.h.
Patch was backported from upstream master and can be dropped in the
next version bump.

Update homepage link

Signed-off-by: default avatarRicardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 803539e7

package/tmux/0001-remove-use-of-sys-cdefs.h.patch

0 → 100644
+42 −0
Original line number Diff line number Diff line 
From 29e4794ca396a8db8a468ec74559922d2af5a987 Mon Sep 17 00:00:00 2001

From: Nicholas Marriott <nicholas.marriott@gmail.com>

Date: Tue, 24 Nov 2015 18:46:50 +0000

Subject: [PATCH] -sys/queue.h in proc.c, and nuke the unnecessary C++ header

 guards stuff and sys/cdefs.h in vis.h (it causes problems on some platforms).

 Reported by someone on GitHub, issue 212.



---

Backported from master upstream to fix musl build

https://github.com/tmux/tmux/commit/7b085136a7291cbcdfcc53182fbd13aaca70306e



proc.c does not exist on version 2.1



Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>

---

 compat/vis.h | 5 -----

 1 file changed, 5 deletions(-)



diff --git a/compat/vis.h b/compat/vis.h

index 6795139..9f12d23 100644

--- a/compat/vis.h

+++ b/compat/vis.h

@@ -73,9 +73,6 @@

  */

 #define	UNVIS_END	1	/* no more characters */

 

-#include <sys/cdefs.h>

-

-__BEGIN_DECLS

 char	*vis(char *, int, int, int);

 int	strvis(char *, const char *, int);

 int	stravis(char **, const char *, int);

@@ -85,6 +82,4 @@ int	strunvis(char *, const char *);

 int	unvis(char *, char, int *, int);

 ssize_t strnunvis(char *, const char *, size_t);

 

-__END_DECLS

-

 #endif /* !_VIS_H_ */

-- 

1.9.1

package/tmux/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ config BR2_PACKAGE_TMUX 
	  tmux is a terminal multiplexer, it enables a number of terminals

	  (or windows) to be accessed and controlled from a single terminal.



	  http://tmux.sourceforge.net/
 
	  https://tmux.github.io/

package/tmux/tmux.hash

+1 −1
Original line number Diff line number Diff line 
# Locally computed:

sha256  795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362  tmux-2.0.tar.gz
 
sha256  31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176  tmux-2.1.tar.gz

package/tmux/tmux.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



TMUX_VERSION = 2.0

TMUX_VERSION = 2.1

TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)

TMUX_LICENSE = ISC

TMUX_LICENSE_FILES = README