Remove imported
This commit is contained in:
@@ -4,7 +4,10 @@ COMMENT = fast, small, webkit based browser written in lua
|
||||
|
||||
GH_ACCOUNT = luakit
|
||||
GH_PROJECT = luakit
|
||||
GH_TAGNAME = 2.2.1
|
||||
#GH_TAGNAME = 2.2.1
|
||||
REVISION = 0
|
||||
DISTNAME = luakit-2.3.3
|
||||
GH_COMMIT = 858dc946b01487e6ba2475cb7a9bede34c17d134
|
||||
|
||||
EPOCH = 1
|
||||
|
||||
@@ -23,8 +26,8 @@ COMPILER = base-clang ports-gcc
|
||||
|
||||
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 harfbuzz
|
||||
WANTLIB += intl javascriptcoregtk-4.0 luajit-5.1 pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pthread soup-2.4 sqlite3 webkit2gtk-4.0
|
||||
WANTLIB += intl javascriptcoregtk-4.1 luajit-5.1 pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pthread soup-3.0 sqlite3 webkit2gtk-4.1
|
||||
|
||||
MODULES = lang/lua
|
||||
|
||||
@@ -36,7 +39,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
|
||||
textproc/lua-markdown
|
||||
|
||||
LIB_DEPENDS = lang/luajit \
|
||||
www/webkitgtk4
|
||||
www/webkitgtk4,webkitgtk41
|
||||
|
||||
TEST_DEPENDS = devel/luassert \
|
||||
devel/luacheck
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (luakit-2.2.1.tar.gz) = 81NZ9YY/q+K51Cb00+9tKc5bs7rHtMjggkJC+JhoyA4=
|
||||
SIZE (luakit-2.2.1.tar.gz) = 488845
|
||||
SHA256 (luakit-2.3.3-858dc946.tar.gz) = 9VtTrQ02cfKgcUi54IVdDgRd1++FcYBaLgLfiBkjvHo=
|
||||
SIZE (luakit-2.3.3-858dc946.tar.gz) = 508346
|
||||
|
||||
@@ -1,39 +1,13 @@
|
||||
$OpenBSD: patch-Makefile,v 1.4 2019/02/09 17:55:27 abieber Exp $
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -56,21 +56,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)
|
||||
- @echo $(CC) -o $@ $(OBJS)
|
||||
+ @echo $(CC) -o $@ $(OBJS) $(LDFLAGS)
|
||||
@$(CC) -o $@ $(OBJS) $(LDFLAGS)
|
||||
|
||||
luakit.so: $(EXT_OBJS)
|
||||
- @echo $(CC) -o $@ $(EXT_OBJS)
|
||||
+ @echo $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
|
||||
@$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
|
||||
|
||||
luakit.1: luakit.1.in
|
||||
@@ -115,7 +115,7 @@ install: all
|
||||
@@ -118,7 +118,7 @@ install: all
|
||||
install -d $(DESTDIR)$(APPDIR)
|
||||
install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
|
||||
install -d $(DESTDIR)$(MANPREFIX)/man1/
|
||||
- install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
|
||||
+ install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
|
||||
mkdir -p resources
|
||||
find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
|
||||
find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
|
||||
install -d $(DESTDIR)$(PREFIX)/share/luakit/resources/icons
|
||||
for i in resources/icons/*; do install -m644 "$$i" "$(DESTDIR)$(PREFIX)/share/luakit/resources/icons"; done
|
||||
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
$OpenBSD$
|
||||
|
||||
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,4 +1,3 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2020/08/23 22:00:39 abieber Exp $
|
||||
@bin bin/luakit
|
||||
lib/luakit/
|
||||
@so lib/luakit/luakit.so
|
||||
@@ -41,6 +40,7 @@ share/doc/luakit/modules/binds_chrome.html
|
||||
share/doc/luakit/modules/bookmarks.html
|
||||
share/doc/luakit/modules/bookmarks_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/completion.html
|
||||
share/doc/luakit/modules/domain_props.html
|
||||
@@ -54,6 +54,7 @@ share/doc/luakit/modules/formfiller.html
|
||||
share/doc/luakit/modules/go_input.html
|
||||
share/doc/luakit/modules/go_next_prev.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/hide_scrollbars.html
|
||||
share/doc/luakit/modules/history.html
|
||||
@@ -82,6 +83,7 @@ share/doc/luakit/modules/lousy.widget.ssl.html
|
||||
share/doc/luakit/modules/lousy.widget.tab.html
|
||||
share/doc/luakit/modules/lousy.widget.tabi.html
|
||||
share/doc/luakit/modules/lousy.widget.tablist.html
|
||||
share/doc/luakit/modules/lousy.widget.tgname.html
|
||||
share/doc/luakit/modules/lousy.widget.uri.html
|
||||
share/doc/luakit/modules/lousy.widget.zoom.html
|
||||
share/doc/luakit/modules/luakit.html
|
||||
@@ -104,7 +106,9 @@ share/doc/luakit/modules/settings_chrome.html
|
||||
share/doc/luakit/modules/soup.html
|
||||
share/doc/luakit/modules/styles.html
|
||||
share/doc/luakit/modules/tab_favicons.html
|
||||
share/doc/luakit/modules/tabgroups.html
|
||||
share/doc/luakit/modules/tabhistory.html
|
||||
share/doc/luakit/modules/tabmenu.html
|
||||
share/doc/luakit/modules/taborder.html
|
||||
share/doc/luakit/modules/tests.lib.html
|
||||
share/doc/luakit/modules/undoclose.html
|
||||
@@ -143,6 +147,7 @@ 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/clear_data.lua
|
||||
share/luakit/lib/cmdhist.lua
|
||||
share/luakit/lib/completion.lua
|
||||
share/luakit/lib/domain_props.lua
|
||||
@@ -160,6 +165,7 @@ 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/gopher.lua
|
||||
share/luakit/lib/help_chrome.lua
|
||||
share/luakit/lib/hide_scrollbars.lua
|
||||
share/luakit/lib/history.lua
|
||||
@@ -191,6 +197,7 @@ 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/tgname.lua
|
||||
share/luakit/lib/lousy/widget/uri.lua
|
||||
share/luakit/lib/lousy/widget/zoom.lua
|
||||
share/luakit/lib/markdown.lua
|
||||
@@ -210,7 +217,9 @@ share/luakit/lib/settings.lua
|
||||
share/luakit/lib/settings_chrome.lua
|
||||
share/luakit/lib/styles.lua
|
||||
share/luakit/lib/tab_favicons.lua
|
||||
share/luakit/lib/tabgroups.lua
|
||||
share/luakit/lib/tabhistory.lua
|
||||
share/luakit/lib/tabmenu.lua
|
||||
share/luakit/lib/taborder.lua
|
||||
share/luakit/lib/undoclose.lua
|
||||
share/luakit/lib/unique_instance.lua
|
||||
@@ -240,3 +249,4 @@ share/luakit/resources/icons/tab-icon-security-error@2x.png
|
||||
share/pixmaps/
|
||||
share/pixmaps/luakit.png
|
||||
@tag update-desktop-database
|
||||
share/pixmaps/luakit.svg
|
||||
|
||||
Reference in New Issue
Block a user