From ddb4136bcede2b69b646feddd3bbd9d7e168ba6c Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 5 Nov 2023 20:56:55 +0100 Subject: [PATCH] quassel-irssi: fix compilation error with new version of irssi Add patch fixing compilation error with new version of irssi where the renamed some functions. Fixes: #22384 Signed-off-by: Christian Marangi --- net/quassel-irssi/Makefile | 2 +- ...tion-error-with-new-version-of-irssi.patch | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch diff --git a/net/quassel-irssi/Makefile b/net/quassel-irssi/Makefile index 8b850be05d..7374f69108 100644 --- a/net/quassel-irssi/Makefile +++ b/net/quassel-irssi/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quassel-irssi PKG_SOURCE_DATE:=2017-11-30 PKG_SOURCE_VERSION:=079be662dde374a383646256108a4974c2bc7796 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/phhusson/quassel-irssi/tar.gz/$(PKG_SOURCE_VERSION)? diff --git a/net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch b/net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch new file mode 100644 index 0000000000..bd12162923 --- /dev/null +++ b/net/quassel-irssi/patches/100-Fix-compilation-error-with-new-version-of-irssi.patch @@ -0,0 +1,48 @@ +From 61aaa345d3924905aa26023b351fb9502a74de63 Mon Sep 17 00:00:00 2001 +From: Christian Marangi +Date: Sun, 5 Nov 2023 20:50:31 +0100 +Subject: [PATCH 2/2] Fix compilation error with new version of irssi + +Fix compilation error with new version of irssi that changed some +functions names. + +Caused by https://github.com/irssi/irssi/pull/1246 + +Signed-off-by: Christian Marangi +--- + core/quassel-net.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/core/quassel-net.c ++++ b/core/quassel-net.c +@@ -105,8 +105,8 @@ static void sig_connected(Quassel_SERVER + } + + r->readtag = +- g_input_add(net_sendbuffer_handle(r->handle), +- G_INPUT_READ, ++ i_input_add(net_sendbuffer_handle(r->handle), ++ I_INPUT_READ, + (GInputFunction) quassel_parse_incoming, r); + + quassel_init_packet(net_sendbuffer_handle(r->handle), r->ssl); +@@ -166,8 +166,8 @@ static void quassel_net_final_setup(SERV + server->handle->handle = handle; + + server->readtag = +- g_input_add(handle, +- G_INPUT_READ, ++ i_input_add(handle, ++ I_INPUT_READ, + (GInputFunction) quassel_parse_incoming, server); + } + +@@ -185,7 +185,7 @@ static void quassel_net_ssl_callback(SER + if (error & 1) { + if (server->connect_tag != -1) + g_source_remove(server->connect_tag); +- server->connect_tag = g_input_add(handle, error == 1 ? G_INPUT_READ : G_INPUT_WRITE, ++ server->connect_tag = i_input_add(handle, error == 1 ? I_INPUT_READ : I_INPUT_WRITE, + (GInputFunction) + quassel_net_ssl_callback, + server); -- 2.30.2