Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
c84687fbac
2 измененных файлов с 3 добавлено и 27 удалено
  1. 3 5
      package/tmux/Makefile
  2. 0 22
      package/tmux/patches/patch-configure_ac

+ 3 - 5
package/tmux/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		tmux
-PKG_VERSION:=		3.2a
+PKG_VERSION:=		3.6a
 PKG_RELEASE:=		1
-PKG_HASH:=		551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f
+PKG_HASH:=		b6d8d9c76585db8ef5fa00d4931902fa4b8cbe8166f528f44fc403961a3f3759
 PKG_DESCR:=		terminal multiplexer
 PKG_SECTION:=		sys/utils
 PKG_BUILDDEP:=		libevent ncurses
@@ -21,9 +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
+#AUTOTOOL_STYLE:=	autoreconf
 
 tmux-install:
 	$(INSTALL_DIR) $(IDIR_TMUX)/usr/bin

+ 0 - 22
package/tmux/patches/patch-configure_ac

@@ -1,22 +0,0 @@
---- 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