diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2019-11-21 22:24:07 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2019-11-21 22:28:04 +0100 |
| commit | 8da527d5bc1a1c6c5718236d1870fe907f80dfc6 (patch) | |
| tree | 30a82087a84c561a03efa1ccefa0d809fba32587 /gnu | |
| parent | ce16a026d00cd0b30e3d55b7ed91661aef5a9dfc (diff) | |
| download | guix-8da527d5bc1a1c6c5718236d1870fe907f80dfc6.tar.gz | |
gnu: hexchat: Fix crash on exit.
* gnu/packages/patches/hexchat-crash-exit.patch: New file. * gnu/packages/hexchat.scm (orgin): Add patch. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/messaging.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/hexchat-crash-exit.patch | 31 |
3 files changed, 34 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 4d14c4ccad..7672295e69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -978,6 +978,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/hexchat-crash-exit.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3f223c2cfe..694dfbb51d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -263,7 +263,8 @@ access to servers running the Discord protocol.") version ".tar.xz")) (sha256 (base32 - "064nq151nzsljv97dmkifyl162d2738vbgvm1phx7yv04pjvk4kp")))) + "064nq151nzsljv97dmkifyl162d2738vbgvm1phx7yv04pjvk4kp")) + (patches (search-patches "hexchat-crash-exit.patch")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) ("perl" ,perl) diff --git a/gnu/packages/patches/hexchat-crash-exit.patch b/gnu/packages/patches/hexchat-crash-exit.patch new file mode 100644 index 0000000000..e67fef73e0 --- /dev/null +++ b/gnu/packages/patches/hexchat-crash-exit.patch @@ -0,0 +1,31 @@ +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 + |