CVS commit: pkgsrc/chat/weechat
"Nia Alarie" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: nia
Date: Fri Aug 14 09:35:12 UTC 2026
Modified Files:
pkgsrc/chat/weechat: Makefile distinfo
pkgsrc/chat/weechat/patches: patch-po_CMakeLists.txt
patch-src_plugins_lua_CMakeLists.txt
patch-src_plugins_relay_api_relay-api-msg.c
Added Files:
pkgsrc/chat/weechat/patches: patch-src_core_core-debug.c
patch-src_core_core-utf8.c
Removed Files:
pkgsrc/chat/weechat/patches: patch-src_core_hook_hook-url.h
Log Message:
weechat: Update to 4.10.0
This is a new feature and security release that includes a deluge
of fixes, some of which might be security relevant (e.g. in irc
and relay protocol support).
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 pkgsrc/chat/weechat/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/chat/weechat/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
pkgsrc/chat/weechat/patches/patch-src_core_core-debug.c \
pkgsrc/chat/weechat/patches/patch-src_core_core-utf8.c
cvs rdiff -u -r1.1 -r0 \
pkgsrc/chat/weechat/patches/patch-src_core_hook_hook-url.h
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/chat/weechat/patches/patch-src_plugins_relay_api_relay-api-msg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 10.8 KB)
Modified files:
Index: pkgsrc/chat/weechat/Makefile
diff -u pkgsrc/chat/weechat/Makefile:1.166 pkgsrc/chat/weechat/Makefile:1.167
--- pkgsrc/chat/weechat/Makefile:1.166 Fri Jul 24 15:56:04 2026
+++ pkgsrc/chat/weechat/Makefile Fri Aug 14 09:35:12 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.166 2026/07/24 15:56:04 taca Exp $
+# $NetBSD: Makefile,v 1.167 2026/08/14 09:35:12 nia Exp $
-DISTNAME= weechat-4.6.2
-PKGREVISION= 8
+DISTNAME= weechat-4.10.0
CATEGORIES= chat
MASTER_SITES= https://www.weechat.org/files/src/
EXTRACT_SUFX= .tar.xz
@@ -16,10 +15,9 @@ LICENSE= gnu-gpl-v3
TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
USE_CC_FEATURES= c99
-USE_TOOLS+= msgfmt pkg-config
+USE_TOOLS+= msgfmt msgmerge xgettext pkg-config
FAKE_NCURSES= yes
-#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
CMAKE_CONFIGURE_ARGS+= -DASCIIDOCTOR_FOUND=ON
CMAKE_CONFIGURE_ARGS+= -DASCIIDOCTOR_EXECUTABLE=${PREFIX}/bin/asciidoctor${RUBY_VER}
CMAKE_CONFIGURE_ARGS+= -DENABLE_GUILE=OFF
@@ -44,14 +42,6 @@ BUILDLINK_TRANSFORM+= rm:-Werror-implici
.include "options.mk"
-.if !empty(PKG_OPTIONS:Mpython)
-SUBST_CLASSES+= python
-SUBST_STAGE.python= pre-configure
-SUBST_MESSAGE.python= Adjusting pkg-config python checks
-SUBST_FILES.python= cmake/FindPython.cmake
-SUBST_SED.python= -e 's,python3,python-${PYVERSSUFFIX},g'
-.endif
-
pre-configure:
# Use the standard cmake mechanism for finding Lua.
${RM} -f ${WRKSRC}/cmake/FindLua.cmake
Index: pkgsrc/chat/weechat/distinfo
diff -u pkgsrc/chat/weechat/distinfo:1.86 pkgsrc/chat/weechat/distinfo:1.87
--- pkgsrc/chat/weechat/distinfo:1.86 Thu May 8 13:18:24 2025
+++ pkgsrc/chat/weechat/distinfo Fri Aug 14 09:35:12 2026
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.86 2025/05/08 13:18:24 jperkin Exp $
+$NetBSD: distinfo,v 1.87 2026/08/14 09:35:12 nia Exp $
-BLAKE2s (weechat-4.6.2.tar.xz) = 022b6bd74199b025a97541c112bc8aa78f7e5047715ac87c1b73321d61e255da
-SHA512 (weechat-4.6.2.tar.xz) = 202c694b806ddcad97b7bc9899c4170d30f11aac85b30f8ea496bba5e9d6e0fa2453e4cefb71a80ac18d479b0e07918bc24ccd9de7c530d453f513dd1f79ae5a
-Size (weechat-4.6.2.tar.xz) = 2763244 bytes
+BLAKE2s (weechat-4.10.0.tar.xz) = 0d913dcd3819d307ab4f180f08892bf5280d5017a09e9b2a52dd4cee110af9d5
+SHA512 (weechat-4.10.0.tar.xz) = bba7597bbc83ffe6a4bf59dfbdb03d622a1f0c023bc27f1d417610e2ab84dea7ca68e03b0a6de276464bc35e69ff8b733de3f965142938423db978a2abdf98ae
+Size (weechat-4.10.0.tar.xz) = 2847188 bytes
SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4
-SHA1 (patch-po_CMakeLists.txt) = b5a186dc5e135ef2e1ec5f01f75152fc769867be
-SHA1 (patch-src_core_hook_hook-url.h) = 92af21dda8324ff7ed0fcfa63d5fef93789dcc1c
-SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 08a1b7dfca5dbbdf45a10b466eeac42671fe9edc
+SHA1 (patch-po_CMakeLists.txt) = 153955aa69882aaae9992ed027252037d64e2c9f
+SHA1 (patch-src_core_core-debug.c) = 8380926d327b46a7bca495806af7c1868e9113e4
+SHA1 (patch-src_core_core-utf8.c) = ec5e8e741fd1b5ef61d0ce28fcb01be9a61ff546
+SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 0b2322bb599411d3ce97d0638444005eb99b740c
SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
-SHA1 (patch-src_plugins_relay_api_relay-api-msg.c) = 8d5670c6e0ddb1d70e29f23015f0f1422fb63f65
+SHA1 (patch-src_plugins_relay_api_relay-api-msg.c) = bcdb74d58f101ec5070538bc95adc4ae4208a5f2
Index: pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt
diff -u pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt:1.7 pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt:1.8
--- pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt:1.7 Sun Dec 10 12:00:00 2023
+++ pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt Fri Aug 14 09:35:12 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-po_CMakeLists.txt,v 1.7 2023/12/10 12:00:00 ryoon Exp $
+$NetBSD: patch-po_CMakeLists.txt,v 1.8 2026/08/14 09:35:12 nia Exp $
Drop package-name and package-version args to xgettext.
Don't run --statistics to /dev/null, it tries to handle it as a regular file
and aborts.
---- po/CMakeLists.txt.orig 2023-10-15 07:02:57.000000000 +0000
+--- po/CMakeLists.txt.orig 2026-08-02 08:40:12.000000000 +0000
+++ po/CMakeLists.txt
-@@ -56,7 +56,7 @@ endforeach()
+@@ -64,7 +64,7 @@ add_custom_command(
add_custom_command(
OUTPUT "${POT_FILE_PATH}"
COMMAND "${XGETTEXT_EXECUTABLE}"
@@ -15,11 +15,12 @@ and aborts.
DEPENDS ${POT_DEPENDS}
COMMENT "Generating ${POT_FILE}"
)
-@@ -74,7 +74,6 @@ foreach(pofile ${PO_FILES})
+@@ -81,7 +81,7 @@ foreach(pofile ${PO_FILES})
+ add_custom_command(
OUTPUT "${mofile}"
COMMAND "${MSGMERGE_EXECUTABLE}" ARGS --quiet -o "${CMAKE_CURRENT_BINARY_DIR}/${pofile}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}" ${POT_FILE_PATH}
- COMMAND "${MSGFMT_EXECUTABLE}" ARGS -o "${mofile}" "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
-- COMMAND "${MSGFMT_EXECUTABLE}" ARGS -c --statistics --verbose --output-file=/dev/null "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
+- COMMAND "${MSGFMT_EXECUTABLE}" ARGS -c --statistics --verbose -o "${mofile}" "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
++ COMMAND "${MSGFMT_EXECUTABLE}" ARGS -o "${mofile}" "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
DEPENDS "${POT_FILE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}"
COMMENT "Compiling ${polang}.po"
)
Index: pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
diff -u pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt:1.2 pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt:1.3
--- pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt:1.2 Mon Jul 10 08:16:59 2023
+++ pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt Fri Aug 14 09:35:12 2026
@@ -1,17 +1,16 @@
-$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.2 2023/07/10 08:16:59 jperkin Exp $
+$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.3 2026/08/14 09:35:12 nia Exp $
Use the standard variables defined by cmake's own FindLua.
---- src/plugins/lua/CMakeLists.txt.orig 2023-06-30 19:18:01.000000000 +0000
+--- src/plugins/lua/CMakeLists.txt.orig 2026-08-02 08:40:12.000000000 +0000
+++ src/plugins/lua/CMakeLists.txt
-@@ -25,8 +25,8 @@ add_library(lua MODULE
+@@ -29,7 +29,7 @@ add_definitions(${LUA_CFLAGS})
set_target_properties(lua PROPERTIES PREFIX "")
- if(LUA_FOUND)
-- include_directories(${LUA_INCLUDE_DIRS})
-- target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config)
-+ include_directories(${LUA_INCLUDE_DIR})
-+ target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config)
- endif()
+ add_definitions(${LUA_CFLAGS})
+-include_directories(${LUA_INCLUDE_DIRS})
+-target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config)
++include_directories(${LUA_INCLUDE_DIR})
++target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config)
install(TARGETS lua LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")
Index: pkgsrc/chat/weechat/patches/patch-src_plugins_relay_api_relay-api-msg.c
diff -u pkgsrc/chat/weechat/patches/patch-src_plugins_relay_api_relay-api-msg.c:1.1 pkgsrc/chat/weechat/patches/patch-src_plugins_relay_api_relay-api-msg.c:1.2
--- pkgsrc/chat/weechat/patches/patch-src_plugins_relay_api_relay-api-msg.c:1.1 Mon Dec 16 10:55:22 2024
+++ pkgsrc/chat/weechat/patches/patch-src_plugins_relay_api_relay-api-msg.c Fri Aug 14 09:35:12 2026
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_plugins_relay_api_relay-api-msg.c,v 1.1 2024/12/16 10:55:22 jperkin Exp $
+$NetBSD: patch-src_plugins_relay_api_relay-api-msg.c,v 1.2 2026/08/14 09:35:12 nia Exp $
illumos does not have tm_gmtoff.
---- src/plugins/relay/api/relay-api-msg.c.orig 2024-12-16 10:46:41.984837031 +0000
+--- src/plugins/relay/api/relay-api-msg.c.orig 2026-08-02 08:40:12.000000000 +0000
+++ src/plugins/relay/api/relay-api-msg.c
-@@ -55,6 +55,18 @@
+@@ -57,14 +57,27 @@
cJSON_Create##__json_type ( \
weechat_hdata_##__var_type (hdata, pointer, __var_name)));
+#if defined(__illumos__)
-+#define MSG_ADD_HDATA_TIME_USEC(__json_name, \
-+ __var_name, __var_name_usec) \
+ #define MSG_ADD_HDATA_TIME_USEC(__json_name, \
+ __var_name, __var_name_usec) \
+ time_value = weechat_hdata_time (hdata, pointer, __var_name); \
+ local_time = localtime (&time_value); \
+ tv.tv_sec = mktime (local_time); \
@@ -20,12 +20,13 @@ illumos does not have tm_gmtoff.
+ "%FT%T.%fZ", &tv); \
+ MSG_ADD_STR_BUF(__json_name, str_time);
+#else
- #define MSG_ADD_HDATA_TIME_USEC(__json_name, \
- __var_name, __var_name_usec) \
- time_value = weechat_hdata_time (hdata, pointer, __var_name); \
-@@ -67,6 +79,7 @@
++#define MSG_ADD_HDATA_TIME_USEC(__json_name, \
++ __var_name, __var_name_usec) \
+ tv.tv_sec = weechat_hdata_time (hdata, pointer, __var_name); \
+ tv.tv_usec = weechat_hdata_integer (hdata, pointer, \
+ __var_name_usec); \
weechat_util_strftimeval (str_time, sizeof (str_time), \
- "%FT%T.%fZ", &tv); \
+ "%@%FT%T.%fZ", &tv); \
MSG_ADD_STR_BUF(__json_name, str_time);
+#endif
Added files:
Index: pkgsrc/chat/weechat/patches/patch-src_core_core-debug.c
diff -u /dev/null pkgsrc/chat/weechat/patches/patch-src_core_core-debug.c:1.1
--- /dev/null Fri Aug 14 09:35:12 2026
+++ pkgsrc/chat/weechat/patches/patch-src_core_core-debug.c Fri Aug 14 09:35:12 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_core-debug.c,v 1.1 2026/08/14 09:35:12 nia Exp $
+
+Need _XOPEN_SOURCE=600 for wcwidth.
+
+--- src/core/core-debug.c.orig 2026-08-14 09:01:12.225036791 +0000
++++ src/core/core-debug.c
+@@ -22,7 +22,7 @@
+ /* Debug functions */
+
+ /* for wcwidth in wchar.h */
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
Index: pkgsrc/chat/weechat/patches/patch-src_core_core-utf8.c
diff -u /dev/null pkgsrc/chat/weechat/patches/patch-src_core_core-utf8.c:1.1
--- /dev/null Fri Aug 14 09:35:12 2026
+++ pkgsrc/chat/weechat/patches/patch-src_core_core-utf8.c Fri Aug 14 09:35:12 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_core-utf8.c,v 1.1 2026/08/14 09:35:12 nia Exp $
+
+Need _XOPEN_SOURCE=600 for wcwidth.
+
+--- src/core/core-utf8.c.orig 2026-08-14 09:02:06.066523691 +0000
++++ src/core/core-utf8.c
+@@ -23,7 +23,7 @@
+ /* UTF-8 string functions */
+
+ /* for wcwidth in wchar.h */
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"