From d595aa16b391bd80f3840c480182838eeac86695 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 16 Mar 2021 19:30:53 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/hexchat.git#86bf619e4976707c356f308b3da0a8f756f80d7b --- ...d29acf4af0d8e13fcf2861b14a356db72641.patch | 25 +++++++++++++++++++ hexchat.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 090fd29acf4af0d8e13fcf2861b14a356db72641.patch diff --git a/090fd29acf4af0d8e13fcf2861b14a356db72641.patch b/090fd29acf4af0d8e13fcf2861b14a356db72641.patch new file mode 100644 index 0000000..f5bbc41 --- /dev/null +++ b/090fd29acf4af0d8e13fcf2861b14a356db72641.patch @@ -0,0 +1,25 @@ +From 090fd29acf4af0d8e13fcf2861b14a356db72641 Mon Sep 17 00:00:00 2001 +From: Sbgodin +Date: Sun, 7 Mar 2021 12:51:45 +0000 +Subject: [PATCH] python: Fix exception with list_pluginpref() + +__decode cannot work (with Python3) because prefs_str has no attribute 'decode'. + +Related to https://github.com/hexchat/hexchat/issues/2531 +--- + plugins/python/_hexchat.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/python/_hexchat.py b/plugins/python/_hexchat.py +index 567b34934..5e4b0c65f 100644 +--- a/plugins/python/_hexchat.py ++++ b/plugins/python/_hexchat.py +@@ -319,7 +319,7 @@ def del_pluginpref(name): + def list_pluginpref(): + prefs_str = ffi.new('char[4096]') + if lib.hexchat_pluginpref_list(lib.ph, prefs_str) == 1: +- return __decode(prefs_str).split(',') ++ return __decode(ffi.string(prefs_str)).split(',') + + return [] + diff --git a/hexchat.spec b/hexchat.spec index 340f6ac..b30674c 100644 --- a/hexchat.spec +++ b/hexchat.spec @@ -3,7 +3,7 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: hexchat Version: 2.14.3 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: https://hexchat.github.io Source: https://dl.hexchat.net/hexchat/%{name}-%{version}.tar.xz @@ -12,6 +12,7 @@ Source: https://dl.hexchat.net/hexchat/%{name}-%{version}.tar.xz Patch1: https://github.com/hexchat/hexchat/commit/5deb69591992d4fede9090b60d3dc847612a4d60.patch Patch2: python-plugin-from-master.patch Patch3: https://github.com/hexchat/hexchat/commit/163608d7fd861c2c4911a38f45be484c88626bdc.patch +Patch4: https://github.com/hexchat/hexchat/commit/090fd29acf4af0d8e13fcf2861b14a356db72641.patch BuildRequires: gcc BuildRequires: meson @@ -80,6 +81,9 @@ This package contains the development files for %{name}. %{_libdir}/pkgconfig/hexchat-plugin.pc %changelog +* Fri Mar 12 2021 Kevin Fenzi - 2.14.3-12 +- Add patch to fix exception in python3 plugin. + * Sat Feb 06 2021 Mikel Olasagasti Uranga - 2.14.3-11 - Include patch to fix underscore not being printed correctly