pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

luakit-git: Backport current patch discussed upstream to fix hanging luakit



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Sep 27 11:51:20 2020 +0200
Changeset:	c9ecaa580dbf7978142062fc56f07f1cc95c14d9

Modified Files:
	luakit-git/distinfo
Added Files:
	luakit-git/patches/patch-common_ipc.c
Removed Files:
	luakit-git/patches/patch-lib_window.lua

Log Message:
luakit-git: Backport current patch discussed upstream to fix hanging luakit

(Unlike #726 that's probably the real fix.)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c9ecaa580dbf7978142062fc56f07f1cc95c14d9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 luakit-git/distinfo                     |  2 +-
 luakit-git/patches/patch-common_ipc.c   | 28 ++++++++++++++++++++++++++++
 luakit-git/patches/patch-lib_window.lua | 22 ----------------------
 3 files changed, 29 insertions(+), 23 deletions(-)

diffs:
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
index 91c5fbb29c..892258c719 100644
--- a/luakit-git/distinfo
+++ b/luakit-git/distinfo
@@ -5,4 +5,4 @@ RMD160 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf39
 SHA512 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = f493fde91e87b8bd40f3a90b558c4d297ed31bc00e6924660a5c1fa55aa35bfd2eb7c8a6a7ea1d6b9ef7d095d358659d350ca92fbc6f654a9df9a1544ce30fdf
 Size (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = 518360 bytes
 SHA1 (patch-Makefile) = d45f31061ea5d5bcf5ed6d63fcea41590003e10b
-SHA1 (patch-lib_window.lua) = cdbea2b3a9cca18c6e3a6b682cdb33b44ef286c0
+SHA1 (patch-common_ipc.c) = 0b45f8ecacbf7f94fe6913826944afdf80279c9d
diff --git a/luakit-git/patches/patch-common_ipc.c b/luakit-git/patches/patch-common_ipc.c
new file mode 100644
index 0000000000..d03a0d8940
--- /dev/null
+++ b/luakit-git/patches/patch-common_ipc.c
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Fix for #725: luakit get stuck and start using all the CPU when closing the last
+tab when window.close_with_last_tab setting is false.
+
+From:
+
+ <https://github.com/luakit/luakit/pull/862>
+
+--- common/ipc.c.orig	2020-07-21 22:24:57.000000000 +0000
++++ common/ipc.c
+@@ -21,6 +21,7 @@
+ #include "common/lualib.h"
+ #include "common/luaserialize.h"
+ #include "common/ipc.h"
++#include "log.h"
+ 
+ /* Prototypes for ipc_recv_... functions */
+ #define X(name) void ipc_recv_##name(ipc_endpoint_t *ipc, const void *msg, guint length);
+@@ -138,6 +139,8 @@ ipc_recv_and_dispatch_or_enqueue(ipc_end
+         case G_IO_STATUS_AGAIN:
+             return;
+         case G_IO_STATUS_EOF:
++            verbose("g_io_channel_read_chars(): End Of File received");
++            g_atomic_int_dec_and_test(&ipc->refcount);
+             return;
+         case G_IO_STATUS_ERROR:
+             if (!g_str_equal(ipc->name, "UI"))
diff --git a/luakit-git/patches/patch-lib_window.lua b/luakit-git/patches/patch-lib_window.lua
deleted file mode 100644
index 1372a19724..0000000000
--- a/luakit-git/patches/patch-lib_window.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Do not destroy() the view.
-
-When just one tab is present it leads to an high CPU usage and luakit completely
-stuck (although start luakit via `--log=DEBUG' option shows that it responds to
-events).
-
-Reported uptsream via:
-
- <https://github.com/luakit/luakit/pull/726>
-
---- lib/window.lua.orig	2018-09-22 23:42:41.000000000 +0000
-+++ lib/window.lua
-@@ -481,7 +481,6 @@ _M.methods = {
-         view = view or w.view
-         w:emit_signal("close-tab", view)
-         w:detach_tab(view, blank_last)
--        view:destroy()
-     end,
- 
-     attach_tab = function (w, view, switch, order)


Home | Main Index | Thread Index | Old Index