Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 36AEB84CFE for ; Mon, 10 Jul 2023 08:17:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id JILtjV15uPLN for ; Mon, 10 Jul 2023 08:16:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6145484CCA for ; Mon, 10 Jul 2023 08:16:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5AC49FBDB; Mon, 10 Jul 2023 08:16:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168897701964330" MIME-Version: 1.0 Date: Mon, 10 Jul 2023 08:16:59 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/chat/weechat To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20230710081659.5AC49FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168897701964330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: jperkin Date: Mon Jul 10 08:16:59 UTC 2023 Modified Files: pkgsrc/chat/weechat: Makefile distinfo pkgsrc/chat/weechat/patches: patch-po_CMakeLists.txt patch-src_plugins_lua_CMakeLists.txt patch-src_plugins_ruby_CMakeLists.txt Removed Files: pkgsrc/chat/weechat/patches: patch-po_cs.po Log Message: weechat: Update to 4.0.1. Also fix issue with newer msgfmt unable to use /dev/null as an output file. Version 4.0.1 (2023-06-30) core: force key "return" to command "/input return" when migrating legacy keys core: display actual key name and command with key Alt+k, remove key Alt+K (grab raw key) and associated commands /input grab_raw_key and /input grab_raw_key_command core: check for newline characters in string_is_whitespace_char (issue #1968) api: do not convert option name to lower case in API functions config_set_plugin and config_set_desc_plugin guile: fix crash on quit with Guile < 3 (issue #1965) irc: reply to a CTCP request sent to self nick (issue #1966) irc: sent "QUIT" message to servers connected with TLS on /upgrade Version 4.0.0 (2023-06-24) New features core: use human readable key bindings, separate keys with comma in combos, remove modifier "meta2-", add option legacy in command /key (issue #1238, task #10317) core: make keys normal options, so they are shown and can be updated with /set and /fset commands (task #12427, task #11783) core: add key Alt+K (upper case) to grab raw key and its command (issue #1238) core: add option key in command /debug (issue #1238) core: force ctrl keys to lower case when they are added (issue #1875) core: use 256 colors by default and always allow 256 colors, find nearest color if less colors are available in terminal (issue #1920) core: insert multiple pasted lines in input instead of sending immediately, add keys to move and delete in a single line and whole input, add option weechat.look.input_multiline_lead_linebreak (issue #1502, issue #1503, issue #1504) core: render newline characters in chat line messages (issue #1908) core: don’t split on newline characters in printf_date_tags when input_multiline is set (issue #1909) core: add key @l in cursor mode to quote line, add variable "_chat_focused_line" in function hashtable sent to hook_focus callback (issue #1913, issue #1914) core: add option split_return in command /input (issue #1916) core: send all command line parameters not beginning with a dash to all plugins core: add command /reset to reset options to their default values core: add option rename in command /bar core: add relative move of read marker with /buffer set unread [+/-]N (issue #1895) core: add access to hashtable properties in evaluation of expressions (issue #1888) core: display similar command names when a command is unknown (issue #1877) core: rename option weechat.color.status_name_ssl to weechat.color.status_name_tls core: add option weechat.color.status_name_insecure to display buffer name with a specific color when not connected with TLS to the server core, plugins: make many identifiers case sensitive (issue #1872, issue #398, bug #32213) core: add item "mouse_status" in default status bar, change default color to lightgreen core, trigger: add options weechat.color.chat_status_disabled and weechat.color.chat_status_enabled, remove options trigger.color.trigger and trigger.color.trigger_disabled, add enabled/disabled status color in output of /filter list (issue #1820) core: add completions "filters_names_disabled" and "filters_names_enabled", used in completion of /filter disable and /filter enable api: add function config_set_version (issue #1238) api: don’t split on newline by default in functions command and command_options when input_multiline is set to 0 api: add optional argument with version in info "version_number" api: add info "auto_load_scripts" alias: use lower case for default aliases, rename all aliases to lower case on upgrade (issue #1872) alias: add $& to replace all arguments with double quotes escaped (issue #1140, issue #1190) alias: add options missing and rename in command /alias fifo: add support of escaped chars in text or commands sent (issue #1950) fset: add options fset.color.color_name and fset.color.color_name_selected (issue #1920) irc: rename "ssl" options to "tls", connect with TLS and port 6697 by default irc: add support of capabilities "batch" and "draft/multiline" (issue #1292, issue #1923) irc: add support of capability "echo-message" (issue #139) irc: display CTCP ACTION to channel on the channel buffer (issue #207) irc: display STATUSMSG actions differently from standard actions on channels (issue #1577) irc: add modifier "irc_cap_sync_req" (issue #1767) irc: add support of "LINELEN" in message 005 (max message length in bytes) (issue #1927) irc: add support of "UTF8ONLY" in message 005 (issue #1688) irc: add command /action (issue #201, issue #1577) irc: add command /rules (issue #1864) irc: add command /knock (issue #7) irc: add server option "registered_mode", add fields "authentication_method" and "sasl_mechanism_used" in server (issue #1625) irc: add option join in command /autojoin irc: use key when /joining in open channel buffer (issue #1260) irc: add option buffer in command /autojoin sort (issue #1876) irc: add ${username} in server options "nicks" and "username", change their default values to use it irc: add infos "irc_server_cap" and "irc_server_cap_value" irc: add option irc.look.display_host_notice irc: add tag "new_host_xxx" in message displayed for command CHGHOST (issue #1808) logger: add option logger.file.log_conditions (issue #1942) logger: add info "logger_log_file" relay: rename "ssl" options and protocol to "tls" relay: make TLS certificate/key loading error handling more verbose (issue #1558) relay: add modifiers "relay_client_irc_in", "relay_client_irc_out1" and "relay_client_irc_out" in irc protocol relay: add support of capability "echo-message" in irc protocol (issue #1949) relay: add handshake option "escape_commands" in weechat protocol trigger: add completions "trigger_names_disabled" and "trigger_names_enabled", used in completion of /trigger disable and /trigger enable Bug fixes core: fix refresh of bar item "input_search" after buffer switch in root bars (issue #1939) core: fix completion after newline in input (issue #1925) core: fix partial completion when the common prefix found is empty (issue #340) core: display a specific error when trying to bind a key without area in mouse context core: fix display of key with command /key bindctxt core: fix default value of bar options (issue #846) core: allow any valid boolean value in command /bar set separator xxx core: run config hooks only when value or default value is actually changed in set/reset/unset functions core: fix crash in case of NULL message sent to function gui_chat_printf_y_date_tags (issue #1883) core: allow command /input move_next_word going to the end of line (issue #1881) core: ignore incomplete ctrl/meta/meta2 codes in keys core: fix display glitch in command errors when a wide char is set in option weechat.look.command_chars (issue #1871) core: fix update of terminal title in some terminals like suckless terminal (stterm) (issue #1882) core: fix infinite loop on startup when running some gui commands before the switch to core buffer is performed (issue #1917) api: readjust string size in function string_dyn_free when string is not freed buflist: do not display keys added in default context on first load exec: remove trailing "M" (carriage return) in output of commands fset: remove scroll to top of fset buffer when options are added or removed (issue #1892) guile: fix crash when plugin is loaded on GNU/Hurd (issue #1951) irc: fix format of IRC tags displayed in messages (use "=" to separate key from value, do not convert "_" to "-") (issue #1929) irc: reset all internal servers variables when disconnecting irc: start from the beginning of nicks at automatic reconnection (issue #337, issue #965) irc: fix join of channels in "autojoin" server option on first connection to server if auto reconnection is performed (issue #1873) irc: update autojoin option with redirected channels when autojoin_dynamic is enabled (issue #1898) irc: update secure data when server autojoin option contains ${sec.data.xxx} and option autojoin_dynamic is enabled (issue #1934) irc: don’t switch to buffer of joined channel if it was not manually joined nor present in server autojoin option irc: fix target buffer for commands 432/433 (erroneous nickname/nickname already in use) when the nickname looks like a channel irc: display command 437 on server buffer when nickname cannot change while banned on channel (issue #88) irc: add messages 415 (cannot send message to channel) and 742 (mode cannot be set) irc: add missing tag "log3" in notify messages irc: add missing tags "irc_cap" and "log3" in cap messages (client capability) irc: fix split of CTCP message with no arguments irc: remove extra space in CTCP ACTION message sent without arguments logger: fix display of multiline messages in backlog (issue #1926) lua: fix crash with print when the value to print is not a string (issue #1904, issue #1905) relay: fix crash on /upgrade when at least a client is connected with weechat protocol relay: fix connection with IRC clients sending "CAP REQ :" (without capability) and not sending "CAP END" (issue #1040) ruby: fix crash on quit when a child process is still running (issue #1889, issue #1915) ruby: fix crash in display of exception backtrace with Ruby 3 (issue #1631, issue #1886) script: remove trailing "J" (line feed char) in source of scripts displayed spell: check buffer pointer received in info "spell_dict" trigger: make default triggers "cmd_pass", "cmd_pass_register" and "server_pass" compatible with multiline input (issue #1935) typing: fix crash when pointer buffer is not received in callback for signal "input_text_changed" (issue #1869) typing: remove nicks typing even when option typing.look.enabled_self is off (issue #1718) Tests core: add tests on URL functions gui: add tests on bar and key functions alias: add tests on alias functions irc: check tags in messages displayed by IRC plugin irc: add tests on function irc_server_alloc_with_url irc: add tests on message/notice/action/CTCP sent logger: add tests on tail functions relay: add tests on "irc" protocol Build core: remove build with autotools (issue #1860) core: remove RPM packaging core: remove build of .bz2 and .zst files in make dist core: remove obsolete cpack config core: add "stable-number" and "devel-number" in script version.sh core: add quotes around paths in CMake files (issue #29) doc: convert docgen.py to C, remove autogen files from repository, add parameter --doc-gen to weechat-headless binary, add CMake option ENABLE_DOC_INCOMPLETE To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 pkgsrc/chat/weechat/Makefile cvs rdiff -u -r1.77 -r1.78 pkgsrc/chat/weechat/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt cvs rdiff -u -r1.1 -r0 pkgsrc/chat/weechat/patches/patch-po_cs.po cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt \ pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168897701964330 Content-Disposition: inline Content-Length: 8526 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/weechat/Makefile diff -u pkgsrc/chat/weechat/Makefile:1.137 pkgsrc/chat/weechat/Makefile:1.138 --- pkgsrc/chat/weechat/Makefile:1.137 Thu Jul 6 09:38:12 2023 +++ pkgsrc/chat/weechat/Makefile Mon Jul 10 08:16:59 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.137 2023/07/06 09:38:12 wiz Exp $ +# $NetBSD: Makefile,v 1.138 2023/07/10 08:16:59 jperkin Exp $ -DISTNAME= weechat-3.8 -PKGREVISION= 2 +DISTNAME= weechat-4.0.1 CATEGORIES= chat MASTER_SITES= https://www.weechat.org/files/src/ EXTRACT_SUFX= .tar.xz @@ -48,7 +47,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror-implici SUBST_CLASSES+= python SUBST_STAGE.python= pre-configure SUBST_MESSAGE.python= Adjusting pkg-config python checks -SUBST_FILES.python= configure.ac cmake/FindPython.cmake +SUBST_FILES.python= cmake/FindPython.cmake SUBST_SED.python= -e 's,python3,python-${PYVERSSUFFIX},g' .endif Index: pkgsrc/chat/weechat/distinfo diff -u pkgsrc/chat/weechat/distinfo:1.77 pkgsrc/chat/weechat/distinfo:1.78 --- pkgsrc/chat/weechat/distinfo:1.77 Thu Jul 6 13:40:39 2023 +++ pkgsrc/chat/weechat/distinfo Mon Jul 10 08:16:59 2023 @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.77 2023/07/06 13:40:39 jperkin Exp $ +$NetBSD: distinfo,v 1.78 2023/07/10 08:16:59 jperkin Exp $ -BLAKE2s (weechat-3.8.tar.xz) = 3f9ac7305d5514124e00e48b146112fd8fde0cf215585cec5e6f9c7bfe620642 -SHA512 (weechat-3.8.tar.xz) = f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516 -Size (weechat-3.8.tar.xz) = 2777420 bytes +BLAKE2s (weechat-4.0.1.tar.xz) = 962975b4e64510990719052e6e17c0eaa164320d3163f8129eb60a9d6e94f97b +SHA512 (weechat-4.0.1.tar.xz) = d21586771c096f3fe3c702f3db7caa50ca0e5f40448bf7150180eeee0d198014c6484eea13000596c8f1f3c369252a76727e11869b430f4f02956c0192c3db26 +Size (weechat-4.0.1.tar.xz) = 2572104 bytes SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4 -SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068 -SHA1 (patch-po_cs.po) = 79cb7a9905d4c4b91c08c6719b3fd3eaee58d52c -SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541 +SHA1 (patch-po_CMakeLists.txt) = 27dd84961ef725857ad12d6926111e97202c9029 +SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 08a1b7dfca5dbbdf45a10b466eeac42671fe9edc SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341 -SHA1 (patch-src_plugins_ruby_CMakeLists.txt) = 84e7e348985fe047ac80884ad4a4a9b32066d733 +SHA1 (patch-src_plugins_ruby_CMakeLists.txt) = e4dc80bd1f8a0b6ba10802fea9d121c4c9faaa15 Index: pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt diff -u pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt:1.5 pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt:1.6 --- pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt:1.5 Tue Dec 10 13:04:06 2019 +++ pkgsrc/chat/weechat/patches/patch-po_CMakeLists.txt Mon Jul 10 08:16:59 2023 @@ -1,15 +1,25 @@ -$NetBSD: patch-po_CMakeLists.txt,v 1.5 2019/12/10 13:04:06 nia Exp $ +$NetBSD: patch-po_CMakeLists.txt,v 1.6 2023/07/10 08:16:59 jperkin 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 2019-12-08 08:48:53.000000000 +0000 +--- po/CMakeLists.txt.orig 2023-06-30 19:18:01.000000000 +0000 +++ po/CMakeLists.txt -@@ -57,7 +57,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC +@@ -58,7 +58,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC add_custom_command( - OUTPUT ${POT_FILE_PATH} - COMMAND ${XGETTEXT_EXECUTABLE} -- ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} -+ ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} + OUTPUT "${POT_FILE_PATH}" + COMMAND "${XGETTEXT_EXECUTABLE}" +- ARGS -o "${POT_FILE_PATH}" --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory="${CMAKE_SOURCE_DIR}" --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} ++ ARGS -o "${POT_FILE_PATH}" --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory="${CMAKE_SOURCE_DIR}" --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} DEPENDS ${POT_DEPENDS} COMMENT "Generating ${POT_FILE}" ) +@@ -76,7 +76,6 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC + 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}" + 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.1 pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt:1.2 --- pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt:1.1 Sun Jul 26 23:10:21 2020 +++ pkgsrc/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt Mon Jul 10 08:16:59 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.1 2020/07/26 23:10:21 nia Exp $ +$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.2 2023/07/10 08:16:59 jperkin Exp $ Use the standard variables defined by cmake's own FindLua. ---- src/plugins/lua/CMakeLists.txt.orig 2020-07-18 11:59:02.000000000 +0000 +--- src/plugins/lua/CMakeLists.txt.orig 2023-06-30 19:18:01.000000000 +0000 +++ src/plugins/lua/CMakeLists.txt @@ -25,8 +25,8 @@ add_library(lua MODULE set_target_properties(lua PROPERTIES PREFIX "") @@ -14,4 +14,4 @@ Use the standard variables defined by cm + target_link_libraries(lua ${LUA_LIBRARIES} weechat_plugins_scripts coverage_config) endif() - install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) + install(TARGETS lua LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins") Index: pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt diff -u pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt:1.1 pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt:1.2 --- pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt:1.1 Thu Feb 24 09:55:40 2022 +++ pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt Mon Jul 10 08:16:59 2023 @@ -1,16 +1,16 @@ -$NetBSD: patch-src_plugins_ruby_CMakeLists.txt,v 1.1 2022/02/24 09:55:40 jperkin Exp $ +$NetBSD: patch-src_plugins_ruby_CMakeLists.txt,v 1.2 2023/07/10 08:16:59 jperkin Exp $ RUBY_LDFLAGS may contain strings unsuitable for target_link_libraries(), for example "-arch arm64" will get converted to "-arch -larm64". ---- src/plugins/ruby/CMakeLists.txt.orig 2021-12-18 07:57:32.000000000 +0000 +--- src/plugins/ruby/CMakeLists.txt.orig 2023-06-30 19:18:01.000000000 +0000 +++ src/plugins/ruby/CMakeLists.txt -@@ -25,7 +25,7 @@ set_target_properties(ruby PROPERTIES PR - - if(RUBY_FOUND) +@@ -29,7 +29,7 @@ if(RUBY_FOUND) + # see: https://github.com/ruby/ruby/pull/7085 + add_definitions(-Wno-unused-parameter) include_directories(${RUBY_INCLUDE_DIRS}) - target_link_libraries(ruby ${RUBY_LDFLAGS} weechat_plugins_scripts coverage_config) + target_link_libraries(ruby ${RUBY_LIBRARIES} weechat_plugins_scripts coverage_config) endif(RUBY_FOUND) - install(TARGETS ruby LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) + install(TARGETS ruby LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins") --_----------=_168897701964330--