pkgsrc-WIP-changes archive

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

luakit-git: Unconditionally avoid to destroy the view (revert last commit)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Oct 8 16:39:18 2018 +0200
Changeset:	5c7b84d56c6aad6dbfb3f4ac340f2e4ecf24bc64

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

Log Message:
luakit-git: Unconditionally avoid to destroy the view (revert last commit)

The previous version of the patch actually made the problem worse
leading to stuck in luakit also when one than more tab was present
(so calling `view:destroy()' can be problematic also if more than
one tab is present...).

Revert back to the functional version.

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

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 | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs:
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
index c3b7853929..0b7775455b 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) = c63cbfb636a70688e68b90bbcb362a09bf068383
+SHA1 (patch-lib_window.lua) = cdbea2b3a9cca18c6e3a6b682cdb33b44ef286c0
diff --git a/luakit-git/patches/patch-lib_window.lua b/luakit-git/patches/patch-lib_window.lua
index 1bcbde8ad7..1372a19724 100644
--- a/luakit-git/patches/patch-lib_window.lua
+++ b/luakit-git/patches/patch-lib_window.lua
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Do not destroy() the view if there is only one tab.
+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
@@ -12,12 +12,11 @@ Reported uptsream via:
 
 --- lib/window.lua.orig	2018-09-22 23:42:41.000000000 +0000
 +++ lib/window.lua
-@@ -481,7 +481,7 @@ _M.methods = {
+@@ -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()
-+        if w.tabs:count() > 1 then view:destroy() end
      end,
  
      attach_tab = function (w, view, switch, order)


Home | Main Index | Thread Index | Old Index