Attachment #250231 for bug #277941




PORTNAME=	luakit
DISTVERSION=	2.3.6-7
DISTVERSIONSUFFIX=	-g0bc0e39
PORTREVISION=	3
PORTEPOCH=	2
CATEGORIES=	www
PKGNAMESUFFIX=	-devel

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING.GPLv3

BUILD_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
		libharfbuzz.so:print/harfbuzz \
		libsoup-2.4.so:devel/libsoup \
		libwebkit2gtk-4.0.so:www/webkit2-gtk3
		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
		libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR}

USES=		compiler:c++11-lang desktop-file-utils gmake \
		gnome lua:51 pkgconfig sqlite
USE_GITHUB=	yes
GH_ACCOUNT=	luakit

PORTDOCS=	*

OPTIONS_DEFINE=	DOCS LUAJIT
OPTIONS_DEFAULT=	LUAJIT
LUAJIT_DESC=	Use the Just-In-Time compiler for lua
LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
LUAJIT_MAKE_ARGS=	USE_LUAJIT=1


post-extract:
	@${REINPLACE_CMD} -e \
		's|luakit/doc|doc/luakit| ; \
		s|/etc/xdg|${PREFIX}/etc/xdg| ; \
		s|-ggdb||' \
		${WRKSRC}/config.mk
	@${REINPLACE_CMD} -e 's|bin/env lua|&${LUA_VER_STR}|' \
		${WRKSRC}/build-utils/gentokens.lua

Lines 1-3 Link Here

(-)b/www/luakit-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1673789816	1	TIMESTAMP = 1711344330
2	SHA256 (luakit-luakit-2.3.3-0-g68e4ffc_GH0.tar.gz) = 7576866112a7a1c3e3162d5e83025088959b8979147e823e87f573997278cbcb	2	SHA256 (luakit-luakit-2.3.6-7-g0bc0e39_GH0.tar.gz) = 4a95e772ae1870a8c10fdd6d606636e29a4c7b9bc190f1040df012152a0826fd
3	SIZE (luakit-luakit-2.3.3-0-g68e4ffc_GH0.tar.gz) = 507448	3	SIZE (luakit-luakit-2.3.6-7-g0bc0e39_GH0.tar.gz) = 511284




--- config.mk.orig	2024-03-25 05:36:59 UTC
+++ config.mk
@@ -98,10 +98,10 @@ PKGS += gthread-2.0
 # Packages required to build luakit.
 PKGS += gtk+-3.0
 PKGS += gthread-2.0
-PKGS += webkit2gtk-4.1
+PKGS += webkit2gtk-4.0
 PKGS += sqlite3
 PKGS += $(LUA_PKG_NAME)
-PKGS += javascriptcoregtk-4.1
+PKGS += javascriptcoregtk-4.0

 # Check user has correct packages installed (and found by pkg-config).
 PKGS_OK := $(shell $(PKG_CONFIG) --print-errors --exists $(PKGS) && echo 1)

Return to bug 277941

Lines 1-7 Link Here

(-)b/www/luakit-devel/Makefile (-13 / +9 lines)
1	PORTNAME= luakit	1	PORTNAME= luakit
2	DISTVERSION= 2.3.3-0	2	DISTVERSION= 2.3.6-7
3	DISTVERSIONSUFFIX= -g68e4ffc	3	DISTVERSIONSUFFIX= -g0bc0e39
4	PORTREVISION= 3
5	PORTEPOCH= 2	4	PORTEPOCH= 2
6	CATEGORIES= www	5	CATEGORIES= www
7	PKGNAMESUFFIX= -devel	6	PKGNAMESUFFIX= -devel
Lines 13-29 WWW= https://luakit.github.io Link Here
13	LICENSE= GPLv3	12	LICENSE= GPLv3
14	LICENSE_FILE= ${WRKSRC}/COPYING.GPLv3	13	LICENSE_FILE= ${WRKSRC}/COPYING.GPLv3
15		14
16	BUILD_DEPENDS= help2man:misc/help2man \	15	BUILD_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
17	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}	16	LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \
18	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
19	libharfbuzz.so:print/harfbuzz \
20	libsoup-2.4.so:devel/libsoup \	17	libsoup-2.4.so:devel/libsoup \
21	libfreetype.so:print/freetype2 \	18	libwebkit2gtk-4.0.so:www/webkit2-gtk3
22	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
23	libfontconfig.so:x11-fonts/fontconfig
24	RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR}	19	RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR}
25		20
26	USES= compiler:c++11-lang desktop-file-utils gettext-runtime gmake \	21	USES= compiler:c++11-lang desktop-file-utils gmake \
27	gnome lua:51 pkgconfig sqlite	22	gnome lua:51 pkgconfig sqlite
28	USE_GITHUB= yes	23	USE_GITHUB= yes
29	GH_ACCOUNT= luakit	24	GH_ACCOUNT= luakit
Lines 37-42 PORTDATA= * Link Here
37	PORTDOCS= *	32	PORTDOCS= *
38		33
39	OPTIONS_DEFINE= DOCS LUAJIT	34	OPTIONS_DEFINE= DOCS LUAJIT
		35	OPTIONS_DEFAULT= LUAJIT
40	LUAJIT_DESC= Use the Just-In-Time compiler for lua	36	LUAJIT_DESC= Use the Just-In-Time compiler for lua
41	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	37	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
42	LUAJIT_MAKE_ARGS= USE_LUAJIT=1	38	LUAJIT_MAKE_ARGS= USE_LUAJIT=1
Lines 44-52 LUAJIT_MAKE_ARGS_OFF= USE_LUAJIT=0 Link Here
44		40
45	post-extract:	41	post-extract:
46	@${REINPLACE_CMD} -e \	42	@${REINPLACE_CMD} -e \
47	's\|share/man\|man\| ; s\|luakit/doc\|doc/luakit\| ; \	43	's\|luakit/doc\|doc/luakit\| ; \
48	s\|/etc/xdg\|${PREFIX}/etc/xdg\| ; \	44	s\|/etc/xdg\|${PREFIX}/etc/xdg\| ; \
49	s\|gnu99\|gnu11\| ; s\|-ggdb\|\|' \	45	s\|-ggdb\|\|' \
50	${WRKSRC}/config.mk	46	${WRKSRC}/config.mk
51	@${REINPLACE_CMD} -e 's\|bin/env lua\|&${LUA_VER_STR}\|' \	47	@${REINPLACE_CMD} -e 's\|bin/env lua\|&${LUA_VER_STR}\|' \
52	${WRKSRC}/build-utils/gentokens.lua	48	${WRKSRC}/build-utils/gentokens.lua

Added Link Here

(-)b/www/luakit-devel/files/patch-config.mk (+15 lines)
1	--- config.mk.orig 2024-03-25 05:36:59 UTC
2	+++ config.mk
3	@@ -98,10 +98,10 @@ PKGS += gthread-2.0
4	# Packages required to build luakit.
5	PKGS += gtk+-3.0
6	PKGS += gthread-2.0
7	-PKGS += webkit2gtk-4.1
8	+PKGS += webkit2gtk-4.0
9	PKGS += sqlite3
10	PKGS += $(LUA_PKG_NAME)
11	-PKGS += javascriptcoregtk-4.1
12	+PKGS += javascriptcoregtk-4.0
13
14	# Check user has correct packages installed (and found by pkg-config).
15	PKGS_OK := $(shell $(PKG_CONFIG) --print-errors --exists $(PKGS) && echo 1)