On Sat, Sep 19, 2020 at 07:06:59PM +0200, Stefan Hagen wrote: > Hello, > > This luakit update is specifically for OpenBSD. > > luakit changes: > > - fixed up CFLAGS to compile with the correct XOPEN_SOURCE and C standard. > - fixed an issue where long options where used on eval (not supportd in BSD) > - upstreamed replacement of "rm" with os.remove() > - no more debugging symbols for regular installs > - fixed an issue with non-transparent hint overlays > > port changes: > > - tag version update > - removed revision > - removed patch-lib_session_lua patch (is upstream now) > - enabled test target > > NOTE: The test suite requires devel/luassert and devel/lua-say, which > should be committed before this one.
the diff is fine. there is just a small problem regarding TEST_DEPENDS: devel/luacheck is required for some tests (but I could add it, no need to resent a full diff) else, the testsuite runs fine. so I will just wait for someone to OK import of luassert and lua-say dependences before commiting this update. eventually, we could also first update luakit to 2.2.1 (with NO_TEST=yes), and next adds TEST_DEPENDS + remove NO_TEST. Thanks ! -- Sebastien Marie > Index: www/luakit/Makefile > =================================================================== > RCS file: /cvs/ports/www/luakit/Makefile,v > retrieving revision 1.27 > diff -u -p -u -p -r1.27 Makefile > --- www/luakit/Makefile 17 Sep 2020 18:20:14 -0000 1.27 > +++ www/luakit/Makefile 19 Sep 2020 16:55:41 -0000 > @@ -1,13 +1,12 @@ > -# $OpenBSD: Makefile,v 1.27 2020/09/17 18:20:14 semarie Exp $ > +# $OpenBSD: Makefile,v 1.26 2020/09/15 07:04:25 pamela Exp $ > > BROKEN-powerpc = help2man: can't get `--help' info from ./luakit > > 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 +30,6 @@ WANTLIB += pangocairo-1.0 pthread soup-2 > > MODULES = lang/lua > > -NO_TEST = Yes > - > BUILD_DEPENDS = devel/help2man \ > devel/luafs > > @@ -42,6 +39,10 @@ RUN_DEPENDS = devel/desktop-file-utils \ > > LIB_DEPENDS = lang/luajit \ > www/webkitgtk4 > + > +TEST_DEPENDS = devel/luassert > + > +TEST_TARGET = run-tests > > # webkit browsing > RUN_DEPENDS += multimedia/gstreamer1/plugins-good \ > Index: www/luakit/distinfo > =================================================================== > RCS file: /cvs/ports/www/luakit/distinfo,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 distinfo > --- www/luakit/distinfo 23 Aug 2020 22:00:39 -0000 1.10 > +++ www/luakit/distinfo 19 Sep 2020 16:55:41 -0000 > @@ -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 > Index: www/luakit/patches/patch-lib_session_lua > =================================================================== > RCS file: www/luakit/patches/patch-lib_session_lua > diff -N www/luakit/patches/patch-lib_session_lua > --- www/luakit/patches/patch-lib_session_lua 17 Sep 2020 18:20:14 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -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) > - >
