From 6ba859b919dc3cff4d6a77a9c35c0882d8c867c6 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Mon, 19 Feb 2024 17:41:13 -0500 Subject: [PATCH] hexchat: update to 2.16.2. --- srcpkgs/hexchat/patches/url_delim.patch | 26 +++++++++++++++++++++ srcpkgs/hexchat/patches/whox_colon.patch | 29 ++++++++++++++++++++++++ srcpkgs/hexchat/template | 10 ++++---- 3 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/hexchat/patches/url_delim.patch create mode 100644 srcpkgs/hexchat/patches/whox_colon.patch diff --git a/srcpkgs/hexchat/patches/url_delim.patch b/srcpkgs/hexchat/patches/url_delim.patch new file mode 100644 index 00000000000000..fbb53da966d7a4 --- /dev/null +++ b/srcpkgs/hexchat/patches/url_delim.patch @@ -0,0 +1,26 @@ + OFrom 2305a0b0fe3e66e1cd95683af2c6f02e7ff29220 Mon Sep 17 00:00:00 2001 +From: Antonio Prcela +Date: Fri, 12 Mar 2021 09:40:40 +0100 +Subject: [PATCH] Open links properly if ending with " + +--- + src/fe-gtk/xtext.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-)e + +-- + +Modified by 0x5c: addded case for single quote character + +diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c +index 418bb4da5..fb4962e12 100644 +--- a/src/fe-gtk/xtext.c ++++ b/src/fe-gtk/xtext.c +@@ -64,7 +64,7 @@ + + /* is delimiter */ + #define is_del(c) \ +- (c == ' ' || c == '\n' || c == '>' || c == '<' || c == 0) ++ (c == ' ' || c == '\n' || c == '>' || c == '<' || c == 0 || c == '"' || c == '\'') + + /* force scrolling off */ + #define dontscroll(buf) (buf)->last_pixel_pos = 0x7fffffff diff --git a/srcpkgs/hexchat/patches/whox_colon.patch b/srcpkgs/hexchat/patches/whox_colon.patch new file mode 100644 index 00000000000000..89d35850ac173c --- /dev/null +++ b/srcpkgs/hexchat/patches/whox_colon.patch @@ -0,0 +1,29 @@ +From e1bff829a01715c7c9053b3fb8cc5ecb9d041b43 Mon Sep 17 00:00:00 2001 +From: classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Date: Sun, 6 Aug 2023 10:44:27 -0400 +Subject: [PATCH] proto-irc.c: handle WHOX replies with realnames that aren't + :-prefixed + +the colon is not required if the last argument is a single word + +this was causing issues where the user info context menu was stripping +the first character of single-word realnames when sending the WHOX +command `WHO #channel %chtsunfra,152`. Discovered the issue by seeing that +plain `WHO #channel` fixed the issue temporarily. +--- + src/common/proto-irc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c +index 5b8e02c48..9ef25730b 100644 +--- a/src/common/proto-irc.c ++++ b/src/common/proto-irc.c +@@ -762,7 +762,7 @@ process_numeric (session * sess, int n, + + /* :server 354 yournick 152 #channel ~ident host servname nick H account :realname */ + inbound_user_info (sess, word[5], word[6], word[7], word[8], +- word[9], word_eol[12]+1, word[11], away, ++ word[9], word_eol[12][0] == ':' ? word_eol[12] + 1 : word_eol[12], word[11], away, + tags_data); + + /* try to show only user initiated whos */ diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index b894acbd74a974..b0f495a2b3ff2b 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,7 +1,7 @@ # Template file for 'hexchat' pkgname=hexchat -version=2.16.1 -revision=7 +version=2.16.2 +revision=1 build_style=meson configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-perl=/usr/bin/perl -Dwith-python=python3 @@ -17,7 +17,7 @@ license="GPL-2.0-or-later" homepage="https://hexchat.github.io/" changelog="https://hexchat.readthedocs.org/en/latest/changelog.html" distfiles="https://github.com/hexchat/hexchat/archive/v${version}.tar.gz" -checksum=f15bc487312a96a902e042e8f197a8494a29bcf4a00bbfd276a5e8154263bfe5 +checksum=486d73cdb6a89fa91cfbe242107901d06e777bea25956a7786c4a831a2caa0e3 build_options="LuaJIT" lib32disabled=yes @@ -33,8 +33,8 @@ fi post_install() { # Remove useless files. - rm -rf ${DESTDIR}/usr/include - rm -rf ${DESTDIR}/usr/lib/pkgconfig + rm -rf "${DESTDIR}/usr/include" + rm -rf "${DESTDIR}/usr/lib/pkgconfig" } hexchat-perl_package() {