CVS commit: pkgsrc/www/luakit

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct  4 18:16:43 UTC 2020

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

Log Message:
luakit: Update to 2.2.1

### Changed
- Removed debug symbol generation for default make.
- Changed the C standard from gnu99 to c11 because Webkit wants it.

### Fixed

- Fixed bounding box not spanning over whole element.
- Fixed an issue where styled hint labels caused intransparent bounding boxes.
- Fixed a race condition when a tab is closed on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/luakit/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/luakit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/luakit/patches/patch-common_ipc.c
cvs rdiff -u -r1.1 -r0 pkgsrc/www/luakit/patches/patch-lib_window.lua

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

Modified files:

Index: pkgsrc/www/luakit/Makefile
diff -u pkgsrc/www/luakit/Makefile:1.3 pkgsrc/www/luakit/Makefile:1.4
--- pkgsrc/www/luakit/Makefile:1.3      Mon Aug 17 20:20:21 2020
+++ pkgsrc/www/luakit/Makefile  Sun Oct  4 18:16:42 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2020/08/17 20:20:21 leot Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/04 18:16:42 nia Exp $
 
-DISTNAME=      luakit-2.2
-PKGREVISION=   2
+DISTNAME=      luakit-2.2.1
 CATEGORIES=    www lua
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=luakit/}
 

Index: pkgsrc/www/luakit/distinfo
diff -u pkgsrc/www/luakit/distinfo:1.1 pkgsrc/www/luakit/distinfo:1.2
--- pkgsrc/www/luakit/distinfo:1.1      Sun Aug  9 17:25:37 2020
+++ pkgsrc/www/luakit/distinfo  Sun Oct  4 18:16:42 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2020/08/09 17:25:37 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/10/04 18:16:42 nia Exp $
 
-SHA1 (luakit-2.2.tar.gz) = 644be3ed722cb6a004e57ad579a9e1ba33a7abd6
-RMD160 (luakit-2.2.tar.gz) = 2dc74d65d30c9322ea8ad8fd1d50d1d4d3c45d25
-SHA512 (luakit-2.2.tar.gz) = 5364acc559c934593dd9d66f8f3238225a7f89a824780f406a0a616d89fc78db4ee98b2cfa161e43ffbdfb9c5ac915a63383f45b1b6bd4eda9c33d62eff2b06f
-Size (luakit-2.2.tar.gz) = 488550 bytes
+SHA1 (luakit-2.2.1.tar.gz) = a634f4e87aecf62a305284560ba15dbe1119e602
+RMD160 (luakit-2.2.1.tar.gz) = a0ac406989aa56e061d5a9e7722a85387bbe60de
+SHA512 (luakit-2.2.1.tar.gz) = 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
+Size (luakit-2.2.1.tar.gz) = 488845 bytes
 SHA1 (patch-Makefile) = 8510a1de1c99244ce1f8cb925439921381692f3d
-SHA1 (patch-lib_window.lua) = 7a2a41610b20cc18e8ff5a4bd7f0ed06994c2ce8
+SHA1 (patch-common_ipc.c) = bcaf0b83dac1b9e3af07883473c028f0dad1a696

Added files:

Index: pkgsrc/www/luakit/patches/patch-common_ipc.c
diff -u /dev/null pkgsrc/www/luakit/patches/patch-common_ipc.c:1.1
--- /dev/null   Sun Oct  4 18:16:43 2020
+++ pkgsrc/www/luakit/patches/patch-common_ipc.c        Sun Oct  4 18:16:42 2020
@@ -0,0 +1,36 @@
+$NetBSD: patch-common_ipc.c,v 1.1 2020/10/04 18:16:42 nia Exp $
+
+[PATCH] Handle EOF sent to G_IO_IN instead of G_IO_HUP (NetBSD/OSX)
+
+Fixes https://github.com/luakit/luakit/issues/725
+
+--- common/ipc.c.orig  2020-09-19 10:55:41.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,19 @@ 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");
++            /* OSX and NetBSD are sending EOF on nonblocking channels first.
++             * These requests can be ignored. They should end up in
++             * recv_hup(), but unfortunately they do not.
++             *
++             * If we do not close the socket, glib will continue to
++             * call the G_IO_IN handler.
++             *
++             * We decrement the refcount to 1 here, and when ipc_recv
++             * decrements the refcount to zero, the socket will be
++             * disconnected.
++             */
++            g_atomic_int_dec_and_test(&ipc->refcount);
+             return;
+         case G_IO_STATUS_ERROR:
+             if (!g_str_equal(ipc->name, "UI"))