From dd473e9030e32450e354d21aa871e58fec27a7cb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 16 Mar 2022 12:23:59 +0100
Subject: tmux: update to 3.2a, needs locale

---
 package/tmux/Makefile                   |  7 ++++---
 package/tmux/patches/patch-configure_ac | 22 ++++++++++++++++++++++
 target/config/Config.in.runtime         |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 package/tmux/patches/patch-configure_ac

diff --git a/package/tmux/Makefile b/package/tmux/Makefile
index e208b566f..bd8d418f4 100644
--- a/package/tmux/Makefile
+++ b/package/tmux/Makefile
@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		tmux
-PKG_VERSION:=		2.9
+PKG_VERSION:=		3.2a
 PKG_RELEASE:=		1
-PKG_HASH:=		34901232f486fd99f3a39e864575e658b5d49f43289ccc6ee57c365f2e2c2980
+PKG_HASH:=		551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f
 PKG_DESCR:=		terminal multiplexer
 PKG_SECTION:=		sys/utils
 PKG_BUILDDEP:=		libevent ncurses
 PKG_DEPENDS:=		libevent libncurses
-PKG_NEEDS:=		threads
+PKG_NEEDS:=		threads locale
 PKG_URL:=		http://tmux.github.io
 PKG_SITES:=		https://github.com/tmux/tmux/releases/download/$(PKG_VERSION)/
 
@@ -21,6 +21,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TMUX,tmux,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
+AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--disable-static
 
diff --git a/package/tmux/patches/patch-configure_ac b/package/tmux/patches/patch-configure_ac
new file mode 100644
index 000000000..1d70b17ca
--- /dev/null
+++ b/package/tmux/patches/patch-configure_ac
@@ -0,0 +1,22 @@
+--- tmux-3.2a.orig/configure.ac	2021-06-10 10:20:51.000000000 +0200
++++ tmux-3.2a/configure.ac	2022-03-16 12:00:53.916934376 +0100
+@@ -150,18 +150,10 @@ AC_REPLACE_FUNCS([ \
+ 	strlcpy \
+ 	strndup \
+ 	strsep \
++	strtonum \
+ ])
+ AC_FUNC_STRNLEN
+ 
+-# Check if strtonum works.
+-AC_MSG_CHECKING([for working strtonum])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-         [#include <stdlib.h>],
+-         [return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);]
+-	 )],
+-	 [AC_DEFINE(HAVE_STRTONUM) AC_MSG_RESULT(yes)],
+-	 [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)]
+-)
+ 
+ # Clang sanitizers wrap reallocarray even if it isn't available on the target
+ # system. When compiled it always returns NULL and crashes the program. To
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 00772c15b..18f1d1794 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -194,7 +194,7 @@ config ADK_RUNTIME_DEFAULT_LOCALE
 	string "default locale"
 	depends on ADK_TARGET_LIBC_WITH_LOCALE \
 		|| ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
-	default "C.UTF-8"
+	default "en_US.UTF-8"
 	help
 	  Locale to be set in the target system as default.
 
-- 
cgit v1.2.3