From patchwork Mon Jun 20 04:46:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Martincoski X-Patchwork-Id: 637802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rXyzv0hNCz9sp7 for ; Mon, 20 Jun 2016 14:48:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=VVnckBYM; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1596089BD0; Mon, 20 Jun 2016 04:48:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4xHj78GF9uMb; Mon, 20 Jun 2016 04:48:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A12687F54; Mon, 20 Jun 2016 04:48:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A9E371C150D for ; Mon, 20 Jun 2016 04:48:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A47F187F54 for ; Mon, 20 Jun 2016 04:48:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1QVRY-n7-+OK for ; Mon, 20 Jun 2016 04:48:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 769E887BD9 for ; Mon, 20 Jun 2016 04:48:35 +0000 (UTC) Received: by mail-qk0-f195.google.com with SMTP id a186so21634734qkf.0 for ; Sun, 19 Jun 2016 21:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=X/fT34354GePB+E9A4Mo5KxJP328pvbYSN6fj/hlob0=; b=VVnckBYMYcSb6EZwAOgZzqNdvkAg9pis2IV61n+9pzC9XsVBLKyXIV/6ryS5tUXxn2 VSqFvpoajhNsrXDSVx6j9al88qnxGZGIW7BhDFFhlq/6ynrMgxTJHWoB5/AXLe95lv21 qArLs6qeNY+kNCIJdsyfHevzHFy7KPpv/yeGyoANOBGdtEdPX6lUuBSk+yHPxWC4yfG/ jmAvPdiSgga5Q/xEWyrDa4iRPxwH397VVOyJxCXJgaXzq5KnRZLIch4dzjsvLLsXmUtp GcNVLZcnFHbGlVvb6I3vZH7FJOb6o6YKPqM4u9cuNYOz+YO8J3JJufPawwSkzkAdJFIQ 2BUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X/fT34354GePB+E9A4Mo5KxJP328pvbYSN6fj/hlob0=; b=YZeH5nmMS+GqdyT7aTwPCTIN60FeegRSny+aw4hgujieF5kye4MTVGAZVWPKx9HCUF H9g2XrJu7DQqIUODCXzGsK44X2bKd1BuE2XPi0aEr8rTBsKIZ0eaqnhmc3OslaITAWpY MNConOWV3YeQzcwRsdf1ciZajEDIOdHYBw7qWnosuuDjC/Rh6ZxvGqOPG6Ldnja2V7pY krt9PC112Oqnss67r/YpN/f5B+Ix7jHHB6aUkUEBv/7EobeZ0BL37vDOnAcvKikSXEqo JmUe6t5CHUVoYDbuVOsJfuanfNLGaQXQbdtEvSXngF9h8VjyrZvTM9dP97JJcy/FDwlX 2rGw== X-Gm-Message-State: ALyK8tIM54NJXIvxAYTTFRHsui0KIgGy8UWwyqY0z497TFqbgsErpaxo9sH8olCIsRFpaA== X-Received: by 10.55.164.20 with SMTP id n20mr18450067qke.73.1466398114619; Sun, 19 Jun 2016 21:48:34 -0700 (PDT) Received: from ultri3.home ([177.97.71.245]) by smtp.gmail.com with ESMTPSA id a198sm19712525qkc.24.2016.06.19.21.48.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 21:48:33 -0700 (PDT) From: Ricardo Martincoski To: buildroot@buildroot.org Date: Mon, 20 Jun 2016 01:46:11 -0300 Message-Id: <20160620044611.14225-1-ricardo.martincoski@gmail.com> X-Mailer: git-send-email 2.9.0 Cc: Ricardo Martincoski Subject: [Buildroot] [PATCH] tmux: bump to version 2.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - remove patch already upstream 0001-remove-use-of-sys-cdefs.h.patch https://github.com/tmux/tmux/commit/7b085136a7291cbcdfcc53182fbd13aaca70306e - add new dependency on BR2_USE_WCHAR (version 2.2 uses mbtowc()) - add new dependency on locale support - add note to help text about the need of a working UTF-8 locale - also rewrap help text to 72 characters Signed-off-by: Ricardo Martincoski --- Some references about the UTF-8 thing: https://github.com/tmux/tmux/commit/0d6de44a37755f0e5046c04e19e4506a6d59e750 https://github.com/tmux/tmux/commit/1f0b317088aaeb230d69f13f43ed63b7406c6fd1 https://groups.google.com/forum/#!topic/tmux-users/BnMK0ijLSIE --- package/tmux/0001-remove-use-of-sys-cdefs.h.patch | 42 ----------------------- package/tmux/Config.in | 13 +++++-- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 2 +- 4 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 package/tmux/0001-remove-use-of-sys-cdefs.h.patch diff --git a/package/tmux/0001-remove-use-of-sys-cdefs.h.patch b/package/tmux/0001-remove-use-of-sys-cdefs.h.patch deleted file mode 100644 index 929953f..0000000 --- a/package/tmux/0001-remove-use-of-sys-cdefs.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29e4794ca396a8db8a468ec74559922d2af5a987 Mon Sep 17 00:00:00 2001 -From: Nicholas Marriott -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 ---- - 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 -- --__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 - diff --git a/package/tmux/Config.in b/package/tmux/Config.in index 61719e4..756f38a 100644 --- a/package/tmux/Config.in +++ b/package/tmux/Config.in @@ -1,10 +1,19 @@ config BR2_PACKAGE_TMUX bool "tmux" depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # mbtowc() + depends on BR2_ENABLE_LOCALE # runtime select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_NCURSES help - tmux is a terminal multiplexer, it enables a number of terminals - (or windows) to be accessed and controlled from a single terminal. + tmux is a terminal multiplexer, it enables a number of + terminals (or windows) to be accessed and controlled from a + single terminal. + + NOTE: tmux needs a working UTF-8 locale (BR2_GENERATE_LOCALE) https://tmux.github.io/ + +comment "tmux needs a toolchain w/ wchar, locale" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index e732aa2..f3cbe74 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 tmux-2.1.tar.gz +sha256 bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4 tmux-2.2.tar.gz diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 40f1a13..1e1b2b7 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,7 +4,7 @@ # ################################################################################ -TMUX_VERSION = 2.1 +TMUX_VERSION = 2.2 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = README