Update luakit to 2.3.

diff from MAINTAINER.
This commit is contained in:
abieber 2021-03-21 14:16:21 +00:00
parent d252e2b83d
commit e88168e145
5 changed files with 12 additions and 68 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2020/11/12 14:39:54 semarie Exp $ # $OpenBSD: Makefile,v 1.29 2021/03/21 14:16:21 abieber Exp $
COMMENT = fast, small, webkit based browser written in lua COMMENT = fast, small, webkit based browser written in lua
GH_ACCOUNT = luakit GH_ACCOUNT = luakit
GH_PROJECT = luakit GH_PROJECT = luakit
GH_TAGNAME = 2.2.1 GH_TAGNAME = 2.3
EPOCH = 1 EPOCH = 1
@ -33,6 +33,7 @@ BUILD_DEPENDS = devel/help2man \
RUN_DEPENDS = devel/desktop-file-utils \ RUN_DEPENDS = devel/desktop-file-utils \
devel/luafs \ devel/luafs \
net/luasocket \
textproc/lua-markdown textproc/lua-markdown
LIB_DEPENDS = lang/luajit \ LIB_DEPENDS = lang/luajit \

View File

@ -1,2 +1,2 @@
SHA256 (luakit-2.2.1.tar.gz) = 81NZ9YY/q+K51Cb00+9tKc5bs7rHtMjggkJC+JhoyA4= SHA256 (luakit-2.3.tar.gz) = xwJrTwvfpE9DeYuA+HVI0+etVvW5I/xDuccSvxhJYJU=
SIZE (luakit-2.2.1.tar.gz) = 488845 SIZE (luakit-2.3.tar.gz) = 497471

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-common_ipc_c,v 1.1 2020/11/12 14:39:54 semarie Exp $
NetBSD EOF fix
Index: common/ipc.c
--- common/ipc.c.orig
+++ 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,15 @@ ipc_recv_and_dispatch_or_enqueue(ipc_endpoint_t *ipc)
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.
+ */
+ g_atomic_int_dec_and_test(&ipc->refcount);
return;
case G_IO_STATUS_ERROR:
if (!g_str_equal(ipc->name, "UI"))

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-tests_run_test_lua,v 1.1 2020/11/12 14:39:54 semarie Exp $
Remove git usage in tests. The tarball isn't a git checkout and the output could be too verbose if /usr/ports in a git checkout.
Index: tests/run_test.lua
--- tests/run_test.lua.orig
+++ tests/run_test.lua
@@ -186,25 +186,6 @@ if not pcall(require, "luassert") then
os.exit(1)
end
--- Check for untracked files in Git
-do
- local untracked = {}
- local f = io.popen("git ls-files --others --exclude-standard")
- for line in f:lines() do
- table.insert(untracked, line)
- end
- f:close()
-
- if #untracked > 0 then
- local c_yellow = string.char(27) .. "[0;33m"
- local c_reset = string.char(27) .. "[0;0m"
- print(c_yellow .. "WARN" .. c_reset .. " The following files are untracked:")
- for _, line in ipairs(untracked) do
- print(" " .. line)
- end
- end
-end
-
-- Find a free server number
-- Does have a race condition...
for i=0,math.huge do

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2020/08/23 22:00:39 abieber Exp $ @comment $OpenBSD: PLIST,v 1.9 2021/03/21 14:16:21 abieber Exp $
@bin bin/luakit @bin bin/luakit
lib/luakit/ lib/luakit/
@so lib/luakit/luakit.so @so lib/luakit/luakit.so
@ -41,6 +41,7 @@ share/doc/luakit/modules/binds_chrome.html
share/doc/luakit/modules/bookmarks.html share/doc/luakit/modules/bookmarks.html
share/doc/luakit/modules/bookmarks_chrome.html share/doc/luakit/modules/bookmarks_chrome.html
share/doc/luakit/modules/chrome.html share/doc/luakit/modules/chrome.html
share/doc/luakit/modules/clear_data.html
share/doc/luakit/modules/cmdhist.html share/doc/luakit/modules/cmdhist.html
share/doc/luakit/modules/completion.html share/doc/luakit/modules/completion.html
share/doc/luakit/modules/domain_props.html share/doc/luakit/modules/domain_props.html
@ -54,6 +55,7 @@ share/doc/luakit/modules/formfiller.html
share/doc/luakit/modules/go_input.html share/doc/luakit/modules/go_input.html
share/doc/luakit/modules/go_next_prev.html share/doc/luakit/modules/go_next_prev.html
share/doc/luakit/modules/go_up.html share/doc/luakit/modules/go_up.html
share/doc/luakit/modules/gopher.html
share/doc/luakit/modules/help_chrome.html share/doc/luakit/modules/help_chrome.html
share/doc/luakit/modules/hide_scrollbars.html share/doc/luakit/modules/hide_scrollbars.html
share/doc/luakit/modules/history.html share/doc/luakit/modules/history.html
@ -105,6 +107,7 @@ share/doc/luakit/modules/soup.html
share/doc/luakit/modules/styles.html share/doc/luakit/modules/styles.html
share/doc/luakit/modules/tab_favicons.html share/doc/luakit/modules/tab_favicons.html
share/doc/luakit/modules/tabhistory.html share/doc/luakit/modules/tabhistory.html
share/doc/luakit/modules/tabmenu.html
share/doc/luakit/modules/taborder.html share/doc/luakit/modules/taborder.html
share/doc/luakit/modules/tests.lib.html share/doc/luakit/modules/tests.lib.html
share/doc/luakit/modules/undoclose.html share/doc/luakit/modules/undoclose.html
@ -143,6 +146,7 @@ share/luakit/lib/bookmarks.lua
share/luakit/lib/bookmarks_chrome.lua share/luakit/lib/bookmarks_chrome.lua
share/luakit/lib/chrome.lua share/luakit/lib/chrome.lua
share/luakit/lib/chrome_wm.lua share/luakit/lib/chrome_wm.lua
share/luakit/lib/clear_data.lua
share/luakit/lib/cmdhist.lua share/luakit/lib/cmdhist.lua
share/luakit/lib/completion.lua share/luakit/lib/completion.lua
share/luakit/lib/domain_props.lua share/luakit/lib/domain_props.lua
@ -160,6 +164,7 @@ share/luakit/lib/formfiller_wm.lua
share/luakit/lib/go_input.lua share/luakit/lib/go_input.lua
share/luakit/lib/go_next_prev.lua share/luakit/lib/go_next_prev.lua
share/luakit/lib/go_up.lua share/luakit/lib/go_up.lua
share/luakit/lib/gopher.lua
share/luakit/lib/help_chrome.lua share/luakit/lib/help_chrome.lua
share/luakit/lib/hide_scrollbars.lua share/luakit/lib/hide_scrollbars.lua
share/luakit/lib/history.lua share/luakit/lib/history.lua
@ -211,6 +216,7 @@ share/luakit/lib/settings_chrome.lua
share/luakit/lib/styles.lua share/luakit/lib/styles.lua
share/luakit/lib/tab_favicons.lua share/luakit/lib/tab_favicons.lua
share/luakit/lib/tabhistory.lua share/luakit/lib/tabhistory.lua
share/luakit/lib/tabmenu.lua
share/luakit/lib/taborder.lua share/luakit/lib/taborder.lua
share/luakit/lib/undoclose.lua share/luakit/lib/undoclose.lua
share/luakit/lib/unique_instance.lua share/luakit/lib/unique_instance.lua