OpenBSD Mail Box: Re: [update] www/luakit

On Thu, Jun 22, 2017 at 07:59:11AM -0600, Aaron Bieber wrote:
> How are ya now?
>
> Upstream luakit is active again! https://github.com/luakit/luakit
>
> Latest from the develop branch contains these tasty bits:
> - Updateded to WebKit 2 API.
> - New widget types.
> - Updated adblocker.
> - Vertical tab support.
> - Auto recovery of sessions.
>
> .. and a lot more: https://aidanholm.github.io/luakit/
>
> Looking to get broader testing (i386?) and cluesticking / OK :D
>
> Cheers,
> Aaron
>

Here is the latest version of the diff! Upstream added some options to
the Makefile, so we can remove chunks of that patch:

https://github.com/luakit/luakit/commit/0ea03ce8111d50494cbf05b78687f2032a2c591d

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 5 Jul 2016 17:00:21 -0000 1.16
+++ Makefile 27 Jun 2017 12:13:42 -0000
@@ -1,84 +1,58 @@
# $OpenBSD: Makefile,v 1.16 2016/07/05 17:00:21 jasper Exp $

-BROKEN-powerpc= help2man: can't get `--help' info from ./luakit
+BROKEN-powerpc = help2man: can't get `--help' info from ./luakit

-COMMENT= fast, small, webkit based browser written in lua
+COMMENT = fast, small, webkit based browser written in lua

# Date of the most recent upstream commit.
-VERSION= 2015.01.24
-GH_ACCOUNT= mason-larobina
-GH_COMMIT= 16f8b89eb7cbcb3ff3a22eb06eb677e46430b1cb
-GH_PROJECT= luakit
-REVISION= 0
+VERSION = 2017.06.24
+GH_ACCOUNT = luakit
+GH_COMMIT = 2de65f50d7f6dd0af5b94b638f59e05cf64946c9
+GH_PROJECT = luakit

-EPOCH= 0
+EPOCH = 0

-DISTNAME= luakit-${VERSION}
+DISTNAME = luakit-${VERSION}

-CATEGORIES= www
+CATEGORIES = www

-MAINTAINER= Aaron Bieber <abieber@openbsd.org>
+MAINTAINER = Aaron Bieber <abieber@openbsd.org>

-HOMEPAGE= http://luakit.org
+HOMEPAGE = http://luakit.org

# GPLv3
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_CDROM = Yes

-USE_GMAKE= Yes
+USE_GMAKE = Yes

-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 javascriptcoregtk-1.0 luajit-5.1
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
-WANTLIB += soup-2.4 sqlite3 unique-1.0 webkitgtk-1.0 z
+COMPILER = gcc

-MODULES = lang/lua \
- devel/gettext
+WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl
+WANTLIB += javascriptcoregtk-4.0 luajit-5.1 pango-1.0 pangocairo-1.0
+WANTLIB += pthread soup-2.4 sqlite3 webkit2gtk-4.0

-BUILD_DEPENDS= devel/help2man
+MODULES = lang/lua

-RUN_DEPENDS= devel/luafs \
+BUILD_DEPENDS = devel/help2man
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ devel/luafs \
textproc/lua-markdown

-LIB_DEPENDS= lang/luajit \
- devel/libunique \
- www/webkit
+LIB_DEPENDS = lang/luajit \
+ www/webkitgtk4

# webkit browsing
RUN_DEPENDS += multimedia/gstreamer1/plugins-good \
multimedia/gstreamer1/plugins-libav

-MAKE_ENV+= USE_LUAJIT=1 USE_UNIQUE=1 INSTALLDIR=${PREFIX} \
- MANDIR=${PREFIX}
-
-PIXDIR = ${PREFIX}/share/pixmaps
-JQDIR = ${PREFIX}/share/luakit/lib
-
-
-pre-configure:
- perl -pi -e 's,/usr/bin/env lua,${MODLUA_BIN},g' \
- ${WRKSRC}/build-utils/gentokens.lua
- perl -pi -e 's,/usr/bin/env lua,${MODLUA_BIN},g' \
- ${WRKSRC}/lib/markdown.lua
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/luakit ${PREFIX}/bin/luakit
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luakit/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/luakit/
- ${INSTALL_DATA_DIR} ${PIXDIR}
- ${INSTALL_DATA_DIR} ${JQDIR}
- ${INSTALL_DATA_DIR} ${MODLUA_DATADIR}
- for file in README.md AUTHORS COPYING COPYING.GPLv3; do \
- ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/luakit/; \
- done
- ${INSTALL_DATA} ${WRKSRC}/extras/luakit.png ${PIXDIR}
- ${INSTALL_MAN} ${WRKSRC}/luakit.1 ${PREFIX}/man/man1/luakit.1
- cp -R ${WRKSRC}/lib/*.lua ${MODLUA_DATADIR}
- # Already provided by dependency
- rm ${MODLUA_DATADIR}/markdown.lua
- cp -R ${WRKSRC}/lib/lousy ${MODLUA_DATADIR}
- cp -R ${WRKSRC}/lib/*.js ${JQDIR}
- cp -R ${WRKSRC}/config/*.lua ${PREFIX}/share/examples/luakit/
+MAKE_FLAGS += LUA_BIN_NAME=${MODLUA_BIN} \
+ MANPREFIX=${DESTDIR}/${PREFIX}/man \
+ PIXMAPDIR=${DESTDIR}/${PREFIX}/share/pixmaps/ \
+ APPDIR=${DESTDIR}/${PREFIX}/share/applications/ \
+ PREFIX=${PREFIX} \
+ XDGPREFIX=${DESTDIR}/${PREFIX}/share/examples/ \
+ DEVELOPMENT_PATHS=0

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/luakit/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 6 May 2017 15:10:18 -0000 1.5
+++ distinfo 27 Jun 2017 12:13:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (luakit-2015.01.24-16f8b89e.tar.gz) = Slmgbol8qOWJKzBWZNb9fIEoc0JsNfDEufzQzVg77Hw=
-SIZE (luakit-2015.01.24-16f8b89e.tar.gz) = 220420
+SHA256 (luakit-2017.06.24-2de65f50.tar.gz) = n1t0RJTYWeYjac0qWFoyd7N8G7RXku6uQAoXtDKgRHA=
+SIZE (luakit-2017.06.24-2de65f50.tar.gz) = 348582
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 28 Oct 2012 23:43:00 -0000 1.1.1.1
+++ patches/patch-Makefile 27 Jun 2017 12:13:42 -0000
@@ -1,14 +1,29 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2012/10/28 23:43:00 abieber Exp $
---- Makefile.orig Mon Oct 1 11:38:55 2012
-+++ Makefile Mon Oct 1 11:39:09 2012
-@@ -37,13 +37,13 @@ globalconf.h: globalconf.h.in
- $(OBJS): $(HEADS) config.mk
+$OpenBSD$
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -13,7 +13,7 @@ OBJS = $(foreach obj,$(SRCS:.c=.o),$(obj))
+ EXT_SRCS = $(filter-out $(TSRC),$(wildcard extension/*.c) $(wildcard extension/clib/*.c) $(wildcard common/*.c)) $(wildcard common/clib/*.c) $(TSRC)
+ EXT_OBJS = $(foreach obj,$(EXT_SRCS:.c=.o),$(obj))

- .c.o:
+-all: options newline luakit luakit.1.gz luakit.so apidoc
++all: options newline luakit luakit.1 luakit.so
+
+ default: all
+ @echo "[DEPRECATED] Use of the 'default' target is deprecated. Please use 'all' target as a replacement."
+@@ -49,21 +49,21 @@ buildopts.h: buildopts.h.in
+ $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
+
+ $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
- @echo $(CC) -c $< -o $@
+ @echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
@$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@

+ $(EXT_OBJS) : %.o : %.c
+- @echo $(CC) -c $< -o $@
++ @echo $(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
+ @$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
+
widgets/webview.o: $(wildcard widgets/webview/*.c)

luakit: $(OBJS)
@@ -16,4 +31,42 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/
+ @echo $(CC) -o $@ $(OBJS) $(LDFLAGS)
@$(CC) -o $@ $(OBJS) $(LDFLAGS)

- luakit.1: luakit
+ luakit.so: $(EXT_OBJS)
+- @echo $(CC) -o $@ $(EXT_OBJS)
++ @echo $(CC) -o $@ $(EXT_OBJS) $(LDFLAGS)
+ @$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
+
+ luakit.1: luakit.1.in
+@@ -83,16 +83,12 @@ doc: buildopts.h $(THEAD) $(TSRC)
+ doxygen -s doc/luakit.doxygen
+
+ clean:
+- rm -rf doc/apidocs doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.1.gz luakit.so
++ rm -rf doc/apidocs doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.so
+
+ install: all
+ install -d $(INSTALLDIR)/share/luakit/
+ install -d $(DOCDIR) $(DOCDIR)/classes $(DOCDIR)/modules $(DOCDIR)/pages
+ install -m644 README.md AUTHORS COPYING* $(DOCDIR)
+- install -m644 doc/apidocs/classes/* $(DOCDIR)/classes
+- install -m644 doc/apidocs/modules/* $(DOCDIR)/modules
+- install -m644 doc/apidocs/pages/* $(DOCDIR)/pages
+- install -m644 doc/apidocs/*.html $(DOCDIR)
+ install -d $(INSTALLDIR)/share/luakit/lib $(INSTALLDIR)/share/luakit/lib/lousy $(INSTALLDIR)/share/luakit/lib/lousy/widget
+ install -m644 lib/*.* $(INSTALLDIR)/share/luakit/lib
+ install -m644 lib/lousy/*.* $(INSTALLDIR)/share/luakit/lib/lousy
+@@ -107,7 +103,7 @@ install: all
+ install -d $(APPDIR)
+ install -m644 extras/luakit.desktop $(APPDIR)
+ install -d $(MANPREFIX)/man1/
+- install -m644 luakit.1.gz $(MANPREFIX)/man1/
++ install -m644 luakit.1 $(MANPREFIX)/man1/
+ mkdir -p resources
+ find resources -type d -exec install -d $(INSTALLDIR)/share/luakit/'{}' \;
+ find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(INSTALLDIR)/share/luakit/$$(dirname $$f)"' \;
+@@ -124,4 +120,4 @@ run-tests: luakit luakit.so tests/util.so
+ @$(LUA_BIN_NAME) tests/run_test.lua
+
+ newline: options;@echo
+-.PHONY: all clean options install newline apidoc doc default
++.PHONY: all clean options install newline doc default
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/luakit/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 5 Jul 2016 17:00:21 -0000 1.2
+++ pkg/PLIST 27 Jun 2017 12:13:42 -0000
@@ -1,11 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2016/07/05 17:00:21 jasper Exp $
@bin bin/luakit
@man man/man1/luakit.1
-share/doc/luakit/
-share/doc/luakit/AUTHORS
-share/doc/luakit/COPYING
-share/doc/luakit/COPYING.GPLv3
-share/doc/luakit/README.md
+share/applications/luakit.desktop
share/examples/luakit/
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/luakit/
@@ -21,51 +17,109 @@ share/examples/luakit/theme.lua
@sample ${SYSCONFDIR}/xdg/luakit/theme.lua
share/examples/luakit/webview.lua
@sample ${SYSCONFDIR}/xdg/luakit/webview.lua
+share/examples/luakit/webview_wm.lua
+@sample ${SYSCONFDIR}/xdg/luakit/webview_wm.lua
share/examples/luakit/window.lua
@sample ${SYSCONFDIR}/xdg/luakit/window.lua
-share/lua/${MODLUA_VERSION}/bookmarks.lua
-share/lua/${MODLUA_VERSION}/bookmarks_chrome.lua
-share/lua/${MODLUA_VERSION}/chrome.lua
-share/lua/${MODLUA_VERSION}/cmdhist.lua
-share/lua/${MODLUA_VERSION}/completion.lua
-share/lua/${MODLUA_VERSION}/cookie_blocking.lua
-share/lua/${MODLUA_VERSION}/cookies.lua
-share/lua/${MODLUA_VERSION}/downloads.lua
-share/lua/${MODLUA_VERSION}/downloads_chrome.lua
-share/lua/${MODLUA_VERSION}/follow.lua
-share/lua/${MODLUA_VERSION}/follow_selected.lua
-share/lua/${MODLUA_VERSION}/formfiller.lua
-share/lua/${MODLUA_VERSION}/go_input.lua
-share/lua/${MODLUA_VERSION}/go_next_prev.lua
-share/lua/${MODLUA_VERSION}/go_up.lua
-share/lua/${MODLUA_VERSION}/history.lua
-share/lua/${MODLUA_VERSION}/history_chrome.lua
-share/lua/${MODLUA_VERSION}/introspector.lua
-share/lua/${MODLUA_VERSION}/lousy/
-share/lua/${MODLUA_VERSION}/lousy/bind.lua
-share/lua/${MODLUA_VERSION}/lousy/init.lua
-share/lua/${MODLUA_VERSION}/lousy/load.lua
-share/lua/${MODLUA_VERSION}/lousy/mode.lua
-share/lua/${MODLUA_VERSION}/lousy/signal.lua
-share/lua/${MODLUA_VERSION}/lousy/theme.lua
-share/lua/${MODLUA_VERSION}/lousy/uri.lua
-share/lua/${MODLUA_VERSION}/lousy/util.lua
-share/lua/${MODLUA_VERSION}/lousy/widget/
-share/lua/${MODLUA_VERSION}/lousy/widget/init.lua
-share/lua/${MODLUA_VERSION}/lousy/widget/menu.lua
-share/lua/${MODLUA_VERSION}/lousy/widget/tablist.lua
-share/lua/${MODLUA_VERSION}/noscript.lua
-share/lua/${MODLUA_VERSION}/proxy.lua
-share/lua/${MODLUA_VERSION}/quickmarks.lua
-share/lua/${MODLUA_VERSION}/search.lua
-share/lua/${MODLUA_VERSION}/session.lua
-share/lua/${MODLUA_VERSION}/tabhistory.lua
-share/lua/${MODLUA_VERSION}/taborder.lua
-share/lua/${MODLUA_VERSION}/undoclose.lua
-share/lua/${MODLUA_VERSION}/userscripts.lua
-share/lua/${MODLUA_VERSION}/webinspector.lua
share/luakit/
+share/luakit/doc/
+share/luakit/doc/AUTHORS
+share/luakit/doc/COPYING
+share/luakit/doc/COPYING.GPLv3
+share/luakit/doc/README.md
+share/luakit/doc/classes/
+share/luakit/doc/modules/
+share/luakit/doc/pages/
share/luakit/lib/
+share/luakit/lib/adblock.lua
+share/luakit/lib/adblock_chrome.lua
+share/luakit/lib/adblock_wm.lua
+share/luakit/lib/bookmarks.lua
+share/luakit/lib/bookmarks_chrome.lua
+share/luakit/lib/chrome.lua
+share/luakit/lib/chrome_wm.lua
+share/luakit/lib/cmdhist.lua
+share/luakit/lib/completion.lua
+share/luakit/lib/domain_props.lua
+share/luakit/lib/downloads.lua
+share/luakit/lib/downloads_chrome.lua
+share/luakit/lib/editor.lua
+share/luakit/lib/error_page.lua
+share/luakit/lib/error_page_wm.lua
+share/luakit/lib/follow.lua
+share/luakit/lib/follow_selected.lua
+share/luakit/lib/follow_selected_wm.lua
+share/luakit/lib/follow_wm.lua
+share/luakit/lib/formfiller.lua
+share/luakit/lib/formfiller_wm.lua
+share/luakit/lib/go_input.lua
+share/luakit/lib/go_next_prev.lua
+share/luakit/lib/go_up.lua
+share/luakit/lib/help_chrome.lua
+share/luakit/lib/hide_scrollbars.lua
+share/luakit/lib/history.lua
+share/luakit/lib/history_chrome.lua
+share/luakit/lib/image_css.lua
+share/luakit/lib/image_css_wm.lua
+share/luakit/lib/introspector.lua
+share/luakit/lib/introspector_chrome.lua
share/luakit/lib/jquery.min.js
+share/luakit/lib/lousy/
+share/luakit/lib/lousy/bind.lua
+share/luakit/lib/lousy/init.lua
+share/luakit/lib/lousy/load.lua
+share/luakit/lib/lousy/mode.lua
+share/luakit/lib/lousy/pickle.lua
+share/luakit/lib/lousy/signal.lua
+share/luakit/lib/lousy/theme.lua
+share/luakit/lib/lousy/uri.lua
+share/luakit/lib/lousy/util.lua
+share/luakit/lib/lousy/widget/
+share/luakit/lib/lousy/widget/buf.lua
+share/luakit/lib/lousy/widget/common.lua
+share/luakit/lib/lousy/widget/hist.lua
+share/luakit/lib/lousy/widget/init.lua
+share/luakit/lib/lousy/widget/menu.lua
+share/luakit/lib/lousy/widget/progress.lua
+share/luakit/lib/lousy/widget/scroll.lua
+share/luakit/lib/lousy/widget/ssl.lua
+share/luakit/lib/lousy/widget/tab.lua
+share/luakit/lib/lousy/widget/tabi.lua
+share/luakit/lib/lousy/widget/tablist.lua
+share/luakit/lib/lousy/widget/uri.lua
+share/luakit/lib/markdown.lua
+share/luakit/lib/mixed_content.lua
+share/luakit/lib/newtab_chrome.lua
+share/luakit/lib/noscript.lua
+share/luakit/lib/open_editor.lua
+share/luakit/lib/proxy.lua
+share/luakit/lib/quickmarks.lua
+share/luakit/lib/referer_control_wm.lua
+share/luakit/lib/search.lua
+share/luakit/lib/select.lua
+share/luakit/lib/select_wm.lua
+share/luakit/lib/session.lua
+share/luakit/lib/styles.lua
+share/luakit/lib/tab_favicons.lua
+share/luakit/lib/tabhistory.lua
+share/luakit/lib/taborder.lua
+share/luakit/lib/undoclose.lua
+share/luakit/lib/userscripts.lua
+share/luakit/lib/vertical_tabs.lua
+share/luakit/lib/view_source.lua
+share/luakit/lib/viewpdf.lua
+share/luakit/lib/webinspector.lua
+share/luakit/luakit.so
+share/luakit/resources/
+share/luakit/resources/icons/
+share/luakit/resources/icons/COPYING
+share/luakit/resources/icons/tab-icon-chrome.png
+share/luakit/resources/icons/tab-icon-chrome@2x.png
+share/luakit/resources/icons/tab-icon-page.png
+share/luakit/resources/icons/tab-icon-page@2x.png
+share/luakit/resources/icons/tab-icon-private.png
+share/luakit/resources/icons/tab-icon-private@2x.png
share/pixmaps/
share/pixmaps/luakit.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE

OpenBSD Mail Box

Tuesday, June 27, 2017

Re: [update] www/luakit

No comments:

Post a Comment