update luakit to 2.2.1 + enable test suite
original diff from maintainer remove BROKEN-powerpc from cwen@ remove git call from test suite by me, following cwen@ advices ok cwen@
This commit is contained in:
semarie
parent
be007ddb7b
commit
2f5c64f896
@ -1,13 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.27 2020/09/17 18:20:14 semarie Exp $
|
||||
|
||||
BROKEN-powerpc = help2man: can't get `--help' info from ./luakit
|
||||
# $OpenBSD: Makefile,v 1.28 2020/11/12 14:39:54 semarie Exp $
|
||||
|
||||
COMMENT = fast, small, webkit based browser written in lua
|
||||
|
||||
GH_ACCOUNT = luakit
|
||||
GH_TAGNAME = 2.2
|
||||
GH_PROJECT = luakit
|
||||
REVISION = 1
|
||||
GH_TAGNAME = 2.2.1
|
||||
|
||||
EPOCH = 1
|
||||
|
||||
@ -31,8 +28,6 @@ WANTLIB += pangocairo-1.0 pthread soup-2.4 sqlite3 webkit2gtk-4.0
|
||||
|
||||
MODULES = lang/lua
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
BUILD_DEPENDS = devel/help2man \
|
||||
devel/luafs
|
||||
|
||||
@ -43,6 +38,11 @@ RUN_DEPENDS = devel/desktop-file-utils \
|
||||
LIB_DEPENDS = lang/luajit \
|
||||
www/webkitgtk4
|
||||
|
||||
TEST_DEPENDS = devel/luassert \
|
||||
devel/luacheck
|
||||
|
||||
TEST_TARGET = run-tests
|
||||
|
||||
# webkit browsing
|
||||
RUN_DEPENDS += multimedia/gstreamer1/plugins-good \
|
||||
multimedia/gstreamer1/plugins-libav
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (luakit-2.2.tar.gz) = cEkpoySYSv4kbGMmNmfrHWTAYLT390ztWf7F1ALDd9w=
|
||||
SIZE (luakit-2.2.tar.gz) = 488550
|
||||
SHA256 (luakit-2.2.1.tar.gz) = 81NZ9YY/q+K51Cb00+9tKc5bs7rHtMjggkJC+JhoyA4=
|
||||
SIZE (luakit-2.2.1.tar.gz) = 488845
|
||||
|
||||
31
www/luakit/patches/patch-common_ipc_c
Normal file
31
www/luakit/patches/patch-common_ipc_c
Normal file
@ -0,0 +1,31 @@
|
||||
$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"))
|
||||
@ -1,36 +0,0 @@
|
||||
$OpenBSD: patch-lib_session_lua,v 1.1 2020/09/17 18:20:14 semarie Exp $
|
||||
Use os.remove() instead of spawning rm(1) process.
|
||||
|
||||
Backport https://github.com/luakit/luakit/commit/4b22c18d5eb5594136091b7b615dc8f9ded0e32f
|
||||
Index: lib/session.lua
|
||||
--- lib/session.lua.orig
|
||||
+++ lib/session.lua
|
||||
@@ -19,10 +19,6 @@ local _M = {}
|
||||
|
||||
lousy.signal.setup(_M, true)
|
||||
|
||||
-local function rm(file)
|
||||
- luakit.spawn(string.format("rm %q", file))
|
||||
-end
|
||||
-
|
||||
--- Path to session file.
|
||||
-- @type string
|
||||
-- @readwrite
|
||||
@@ -82,7 +78,7 @@ _M.save = function (file)
|
||||
io.close(fh)
|
||||
os.rename(tempfile, file)
|
||||
else
|
||||
- rm(file)
|
||||
+ os.remove(file)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -220,7 +216,7 @@ window.add_signal("init", function (w)
|
||||
local num_windows = #lousy.util.table.values(window.bywidget)
|
||||
-- Remove the recovery session on a successful exit
|
||||
if num_windows == 0 and os.exists(_M.recovery_file) then
|
||||
- rm(_M.recovery_file)
|
||||
+ os.remove(_M.recovery_file)
|
||||
end
|
||||
end)
|
||||
|
||||
32
www/luakit/patches/patch-tests_run_test_lua
Normal file
32
www/luakit/patches/patch-tests_run_test_lua
Normal file
@ -0,0 +1,32 @@
|
||||
$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
|
||||
Loading…
Reference in New Issue
Block a user