pkgsrc-WIP-changes archive

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

luakit-git: Adjust patch-lib_window.lua



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Oct 8 16:08:27 2018 +0200
Changeset:	7f902576aecf4354fda2a75faf5c2d38782d743d

Modified Files:
	luakit-git/distinfo
	luakit-git/patches/patch-lib_window.lua

Log Message:
luakit-git: Adjust patch-lib_window.lua

We can safely destroy() the view-s when there are more than one tab... but not
just one!  So adjust the logic as needed.

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

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-lib_window.lua | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs:
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
index 7faa666d99..c3b7853929 100644
--- a/luakit-git/distinfo
+++ b/luakit-git/distinfo
@@ -6,4 +6,4 @@ SHA512 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf39
 Size (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = 518360 bytes
 SHA1 (patch-Makefile) = 6a62050e0b65604b893dbd9d2b21bb19d2855916
 SHA1 (patch-config.mk) = 0818316651f9cda2cc149a3eaa4f84eb2923ee6d
-SHA1 (patch-lib_window.lua) = 7a2a41610b20cc18e8ff5a4bd7f0ed06994c2ce8
+SHA1 (patch-lib_window.lua) = c63cbfb636a70688e68b90bbcb362a09bf068383
diff --git a/luakit-git/patches/patch-lib_window.lua b/luakit-git/patches/patch-lib_window.lua
index 8fbb5f093f..1bcbde8ad7 100644
--- a/luakit-git/patches/patch-lib_window.lua
+++ b/luakit-git/patches/patch-lib_window.lua
@@ -1,24 +1,23 @@
 $NetBSD$
 
-Do not destroy() the current view.
+Do not destroy() the view if there is only one tab.
 
 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). To workaround this problem avoid to call view:destroy().
-
-XXX: I'm not sure if it's the correct fix.
+events).
 
 Reported uptsream via:
 
  <https://github.com/luakit/luakit/pull/726>
 
---- lib/window.lua.orig	2017-08-10 09:50:15.000000000 +0000
+--- lib/window.lua.orig	2018-09-22 23:42:41.000000000 +0000
 +++ lib/window.lua
-@@ -519,7 +519,6 @@ window.methods = {
+@@ -481,7 +481,7 @@ _M.methods = {
          view = view or w.view
          w:emit_signal("close-tab", view)
          w:detach_tab(view, blank_last)
 -        view:destroy()
++        if w.tabs:count() > 1 then view:destroy() end
      end,
  
      attach_tab = function (w, view, switch, order)


Home | Main Index | Thread Index | Old Index