summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-07-26 23:10:21 +0000
committernia <nia@pkgsrc.org>2020-07-26 23:10:21 +0000
commit62f335c027caf2379c9e41651a3a6107e467f033 (patch)
tree841309e600c0ac7a17340a495f9b479239a5df69
parent71e11ff2869bfab6d3805d2307d44756067381fd (diff)
downloadpkgsrc-62f335c027caf2379c9e41651a3a6107e467f033.tar.gz
weechat: Update to 2.9
== Version 2.9 (2020-07-18) New features:: * core: add bar option "color_bg_inactive": color for window bars in inactive window (issue #732) * core: add Alacritty title escape sequence support (issue #1517) * core: display notify level for current buffer with command /buffer notify (issue #1505) * core: count only visible nicks in bar item "buffer_nicklist_count", add bar items "buffer_nicklist_count_groups" and "buffer_nicklist_count_all" (issue #1506) * core: set default size for input bar to 0 (automatic) (issue #1498) * core: add default key kbd:[Alt+Enter] to insert a newline (issue #1498) * core: add flag "input_multiline" in buffer (issue #984, issue #1063) * core: add a scalable WeeChat logo (SVG) (issue #1454, issue #1456) * core: add base 16/32/64 encoding/decoding in evaluation of expressions with "base_encode:base,xxx" and "base_decode:base,xxx" * core: add case sensitive wildcard matching comparison operator (`+==*+` and `+!!*+`) and case sensitive/insensitive include comparison operators (`+==-+`, `+!!-+`, `+=-+`, `+!-+`) in evaluation of expressions * core: add default key kbd:[Alt+Shift+N] to toggle nicklist bar * core: add command line option "--stdout" in weechat-headless binary to log to stdout rather than ~/.weechat/weechat.log (issue #1475, issue #1477) * core: reload configuration files on SIGHUP (issue #1476) * api: add pointer "_bar_window" in hashtable sent to hook focus callback (issue #1450) * api: add info_hashtable "focus_info" (issue #1245, issue #1257) * api: rename function hook_completion_get_string to completion_get_string and hook_completion_list_add to completion_list_add * api: add functions completion_new, completion_search and completion_free * api: add hdata "completion_word" * buflist: add default key kbd:[Alt+Shift+B] to toggle buflist * buflist: add options enable/disable/toggle in command /buflist * buflist: evaluate option buflist.look.sort so that sort can be customized for each of the three buflist bar items (issue #1465) * irc: add support of UTF8MAPPING (issue #1528) * irc: display account messages in buffers (issue #1250) * python: add WeeChat sharedir python directory to PYTHONPATH (issue #1537) * relay: increase default limits for IRC backlog options * relay: add command "handshake" in weechat relay protocol and nonce to prevent replay attacks, add options relay.network.password_hash_algo, relay.network.password_hash_iterations, relay.network.nonce_size (issue #1474) * relay: add command "completion" in weechat relay protocol to perform a completion on a string at a given position (issue #1484) * relay: add option relay.network.auth_timeout * relay: update default colors for client status * relay: add status "waiting_auth" in irc and weechat protocols (issue #1358) * trigger: evaluate arguments of command when the trigger is created (issue #1472) Bug fixes:: * core: fix command /window scroll_beyond_end when buffer has fewer lines than chat height (issue #1509) * core: force buffer property "time_for_each_line" to 0 for buffers with free content (issue #1485) * core: don't collapse consecutive newlines in lines displayed before the first buffer is created * core: don't remove consecutive newlines when pasting text (issue #1500) * core: don't collapse consecutive newlines in bar content (issue #1500) * core: fix WEECHAT_SHAREDIR with CMake build (issue #1461) * core: fix memory leak in calculation of expression on FreeBSD (issue #1469) * core: fix resize of a bar when its size is 0 (automatic) (issue #1470) * api: fix use of pointer after free in function key_unbind * api: replace plugin and buffer name by buffer pointer in argument "modifier_data" sent to weechat_print modifier callback (issue #42) * buflist: add "window" pointer in bar item evaluation only if it's not NULL (if bar type is "window") * exec: fix use of same task id for different tasks (issue #1491) * fifo: fix errors when writing in the FIFO pipe (issue #713) * guile: enable again /guile eval (issue #1514) * irc: use new default chantypes "#&" when the server does not send it * irc: add support of optional server in info "irc_is_nick", fix check of nick using UTF8MAPPING isupport value (issue #1528) * irc: fix add of ignore with flags in regex, display full ignore mask in list of ignores (issue #1518) * irc: do not remove spaces at the end of users messages received (issue #1513) * irc: fix realname delimiter color in WHO/WHOX response (issue #1497) * irc: reuse a buffer with wrong type "channel" when a private message is received (issue #869) * python: fix crash when invalid UTF-8 string is in a WeeChat hashtable converted to a Python dict (issue #1463) * relay: add missing field "notify_level" in message "_buffer_line_added" (issue #1529) * relay: fix slow send of data to clients when SSL is enabled * trigger: only return trigger's return code when condition evaluates to true (issue #592) * trigger: fix truncated trigger command with commands /trigger input|output|recreate * trigger: do not hide values of options with /set command in cmd_pass trigger Documentation:: * add includes directory * merge 53 auto-generated files into 11 files * fix broken literal blocks in Japanese docs with Firefox (issue #1466) Tests:: * core: add CI with GitHub Actions, move codecov.io upload to GitHub Actions * core: switch to Ubuntu Bionic on Travis CI, use pylint3 to lint Python scripts * core: run tests on plugins only if the plugins are enabled and compiled * irc: add tests on IRC color and channel functions Build:: * javascript: disable build by default and remove Debian packaging of JavaScript plugin (issue #360) * core: make GnuTLS a required dependency * core: fix build with CMake 3.17.0 * core: fix build with cygport on Cygwin
-rw-r--r--chat/weechat/Makefile10
-rw-r--r--chat/weechat/distinfo11
-rw-r--r--chat/weechat/options.mk12
-rw-r--r--chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt17
4 files changed, 34 insertions, 16 deletions
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 72b203433c3..7e532243b9c 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2020/05/22 10:55:59 adam Exp $
+# $NetBSD: Makefile,v 1.117 2020/07/26 23:10:21 nia Exp $
-DISTNAME= weechat-2.8
-PKGREVISION= 2
+DISTNAME= weechat-2.9
CATEGORIES= chat
MASTER_SITES= https://www.weechat.org/files/src/
EXTRACT_SUFX= .tar.xz
@@ -46,11 +45,16 @@ SUBST_FILES.python= configure.ac 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
+
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index b52470de1cc..fb31292dc09 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.62 2020/04/01 14:58:49 nia Exp $
+$NetBSD: distinfo,v 1.63 2020/07/26 23:10:21 nia Exp $
-SHA1 (weechat-2.8.tar.xz) = fec7018168f2fa973b1a4d8224fdac8b59617ada
-RMD160 (weechat-2.8.tar.xz) = 6c1453c5b97ba061bc2539033e62eb7f07ee52c8
-SHA512 (weechat-2.8.tar.xz) = 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
-Size (weechat-2.8.tar.xz) = 2248868 bytes
+SHA1 (weechat-2.9.tar.xz) = b977397266e4b586540fd6c4fcf5aaeef24fde67
+RMD160 (weechat-2.9.tar.xz) = 392af28dcbff7b9546b1d4040c7f3e13486fe968
+SHA512 (weechat-2.9.tar.xz) = c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
+Size (weechat-2.9.tar.xz) = 2206584 bytes
SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4
SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068
SHA1 (patch-src_core_weechat.c) = aeb3cb052976e6b4603d3515ffc40bed98434a9f
+SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541
SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk
index 48af86aea31..32069e981de 100644
--- a/chat/weechat/options.mk
+++ b/chat/weechat/options.mk
@@ -1,19 +1,15 @@
-# $NetBSD: options.mk,v 1.26 2020/07/04 11:34:59 nia Exp $
+# $NetBSD: options.mk,v 1.27 2020/07/26 23:10:21 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.weechat
# mk/curses will handle wide-curses
-PKG_SUPPORTED_OPTIONS= gnutls python lua wide-curses perl ruby
-PKG_SUGGESTED_OPTIONS= gnutls python lua wide-curses perl ruby
+PKG_SUPPORTED_OPTIONS= python lua wide-curses perl ruby
+PKG_SUGGESTED_OPTIONS= python lua wide-curses perl ruby
.include "../../mk/bsd.options.mk"
.include "../../mk/bsd.fast.prefs.mk"
PLIST_VARS+= lua plugin python perl ruby
-.if !empty(PKG_OPTIONS:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
.if !empty(PKG_OPTIONS:Mpython)
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/extension.mk"
@@ -24,7 +20,7 @@ CMAKE_ARGS+= -DENABLE_PYTHON=OFF
.endif
.if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_ACCEPTED= 53 52 51
+#LUA_VERSIONS_ACCEPTED= 53 52 51
.include "../../lang/lua/buildlink3.mk"
CMAKE_ARGS+= -DENABLE_LUA=ON
PLIST.lua= yes
diff --git a/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt b/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
new file mode 100644
index 00000000000..fc05b15fd26
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_lua_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_plugins_lua_CMakeLists.txt,v 1.1 2020/07/26 23:10:21 nia 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
+@@ -25,8 +25,8 @@ add_library(lua MODULE
+ 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()
+
+ install(TARGETS lua LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)