diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
commit | 982eff9e841f3539e4ecf93669435a290bfde571 (patch) | |
tree | b1e3f6fc85c6c35c264f091eb2fc5cff8514c230 /gnu/packages/patches/hexchat-crash-exit.patch | |
parent | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (diff) | |
parent | 7158fe4ded47a599ceb8d556132ba83fcc686962 (diff) | |
download | guix-982eff9e841f3539e4ecf93669435a290bfde571.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/hexchat-crash-exit.patch')
-rw-r--r-- | gnu/packages/patches/hexchat-crash-exit.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gnu/packages/patches/hexchat-crash-exit.patch b/gnu/packages/patches/hexchat-crash-exit.patch deleted file mode 100644 index e67fef73e0..0000000000 --- a/gnu/packages/patches/hexchat-crash-exit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d9c637ae8a1137d3ca512d2c560589903a4bd79d Mon Sep 17 00:00:00 2001 -From: Adam Williamson <awilliam@redhat.com> -Date: Tue, 30 Apr 2019 11:16:01 -0700 -Subject: [PATCH] Python plugin: Call EndInterpreter when deinit'ing the plugin - -This fixes https://github.com/hexchat/hexchat/issues/2237 , a -commonly-encountered bug when using Hexchat 2.14 on Python 3.7. -Thanks to @ncoghlan for the fix. - -Signed-off-by: Adam Williamson <awilliam@redhat.com> ---- - plugins/python/python.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/plugins/python/python.c b/plugins/python/python.c -index 4403474d..475756ba 100644 ---- a/plugins/python/python.c -+++ b/plugins/python/python.c -@@ -2806,6 +2806,9 @@ hexchat_plugin_deinit(void) - xchatout_buffer = NULL; - - if (interp_plugin) { -+ PyThreadState *tstate = ((PluginObject*)interp_plugin)->tstate; -+ PyThreadState_Swap(tstate); -+ Py_EndInterpreter(tstate); - Py_DECREF(interp_plugin); - interp_plugin = NULL; - } --- -2.21.0 - |