pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
luakit-git: Import luakit-0.0nb2017060 as wip/luakit-git
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Mon Jun 5 23:55:37 2017 +0200
Changeset: 87025c867d4eb83085f6d1e51a4007f2ecc0ab93
Modified Files:
Makefile
Added Files:
luakit-git/DESCR
luakit-git/Makefile
luakit-git/PLIST
luakit-git/distinfo
luakit-git/patches/patch-Makefile
luakit-git/patches/patch-luakit.c
Log Message:
luakit-git: Import luakit-0.0nb2017060 as wip/luakit-git
luakit is a fast, light and simple to use micro-browser framework extensible
by Lua using the WebKit web content engine and the GTK+ toolkit.
This is a fork of the original luakit based on the newer WebKit2 web
engine, which is under active development.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87025c867d4eb83085f6d1e51a4007f2ecc0ab93
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
luakit-git/DESCR | 7 ++
luakit-git/Makefile | 49 +++++++++++
luakit-git/PLIST | 177 ++++++++++++++++++++++++++++++++++++++
luakit-git/distinfo | 8 ++
luakit-git/patches/patch-Makefile | 36 ++++++++
luakit-git/patches/patch-luakit.c | 49 +++++++++++
7 files changed, 327 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 9cb5043720..336734bd00 100644
--- a/Makefile
+++ b/Makefile
@@ -1854,6 +1854,7 @@ SUBDIR+= lua-ldoc
SUBDIR+= lua-luafilesystem
SUBDIR+= lua-mpack
SUBDIR+= lua-penlight
+SUBDIR+= luakit-git
SUBDIR+= lucene
SUBDIR+= lugaru
SUBDIR+= lumberjack
diff --git a/luakit-git/DESCR b/luakit-git/DESCR
new file mode 100644
index 0000000000..7ae5c67eec
--- /dev/null
+++ b/luakit-git/DESCR
@@ -0,0 +1,7 @@
+# Luakit
+
+luakit is a fast, light and simple to use micro-browser framework extensible
+by Lua using the WebKit web content engine and the GTK+ toolkit.
+
+This is a fork of the original luakit based on the newer WebKit2 web
+engine, which is under active development.
diff --git a/luakit-git/Makefile b/luakit-git/Makefile
new file mode 100644
index 0000000000..54ecd75c3f
--- /dev/null
+++ b/luakit-git/Makefile
@@ -0,0 +1,49 @@
+# $NetBSD$
+
+PKGNAME= luakit-0.0
+CATEGORIES= www
+MASTER_SITES= ${MASTER_SITE_GITHUB:=aidanholm/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://aidanholm.github.io/luakit/
+COMMENT= Webkit based browser framework extensible by Lua
+LICENSE= gnu-gpl-v3
+
+USE_TOOLS+= gmake
+
+GIT_REPOSITORIES= luakit
+GIT_BRANCH.luakit= develop
+GIT_REPO.luakit= git://github.com/aidanholm/luakit
+WRKSRC= ${WRKDIR}/luakit
+
+CONF_FILES+= ${PREFIX}/share/examples/luakit/binds.lua ${PREFIX}/etc/xdg/luakit/binds.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/globals.lua ${PREFIX}/etc/xdg/luakit/globals.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/modes.lua ${PREFIX}/etc/xdg/luakit/modes.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/rc.lua ${PREFIX}/etc/xdg/luakit/rc.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/theme.lua ${PREFIX}/etc/xdg/luakit/theme.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/webview.lua ${PREFIX}/etc/xdg/luakit/webview.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/webview_wm.lua ${PREFIX}/etc/xdg/luakit/webview_wm.lua
+CONF_FILES+= ${PREFIX}/share/examples/luakit/window.lua ${PREFIX}/etc/xdg/luakit/window.lua
+
+# luakit tries to open the X11 display while generating API documentation
+# ... but does not actually use X11 for this step
+MAKE_ENV+= DISPLAY=
+LUAKIT_MAKE_FLAGS+= DEVELOPMENT_PATHS=0
+LUAKIT_MAKE_FLAGS+= DOCDIR=${DESTDIR}${PREFIX}/share/doc/luakit
+LUAKIT_MAKE_FLAGS+= MANPREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
+LUAKIT_MAKE_FLAGS+= USE_LUAJIT=0
+BUILD_MAKE_FLAGS+= ${LUAKIT_MAKE_FLAGS}
+INSTALL_MAKE_FLAGS+= ${LUAKIT_MAKE_FLAGS}
+
+LUA_VERSIONS_ACCEPTED= 51
+
+.include "../../lang/lua/luaversion.mk"
+
+DEPENDS+= ${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
+
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../wip/webkit-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/luakit-git/PLIST b/luakit-git/PLIST
new file mode 100644
index 0000000000..36aab81e42
--- /dev/null
+++ b/luakit-git/PLIST
@@ -0,0 +1,177 @@
+@comment $NetBSD$
+bin/luakit
+man/man1/luakit.1
+share/applications/luakit.desktop
+share/doc/luakit/AUTHORS
+share/doc/luakit/COPYING
+share/doc/luakit/COPYING.GPLv3
+share/doc/luakit/README.md
+share/doc/luakit/classes/page.html
+share/doc/luakit/classes/regex.html
+share/doc/luakit/classes/sqlite3.html
+share/doc/luakit/classes/timer.html
+share/doc/luakit/classes/widget.webview.html
+share/doc/luakit/index.html
+share/doc/luakit/modules/adblock.html
+share/doc/luakit/modules/adblock_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/cmdhist.html
+share/doc/luakit/modules/completion.html
+share/doc/luakit/modules/domain_props.html
+share/doc/luakit/modules/downloads.html
+share/doc/luakit/modules/downloads_chrome.html
+share/doc/luakit/modules/editor.html
+share/doc/luakit/modules/error_page.html
+share/doc/luakit/modules/extension.html
+share/doc/luakit/modules/follow.html
+share/doc/luakit/modules/follow_selected.html
+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/help_chrome.html
+share/doc/luakit/modules/hide_scrollbars.html
+share/doc/luakit/modules/history.html
+share/doc/luakit/modules/history_chrome.html
+share/doc/luakit/modules/image_css.html
+share/doc/luakit/modules/introspector_chrome.html
+share/doc/luakit/modules/ipc.html
+share/doc/luakit/modules/lousy.bind.html
+share/doc/luakit/modules/lousy.html
+share/doc/luakit/modules/lousy.load.html
+share/doc/luakit/modules/lousy.mode.html
+share/doc/luakit/modules/lousy.pickle.html
+share/doc/luakit/modules/lousy.signal.html
+share/doc/luakit/modules/lousy.theme.html
+share/doc/luakit/modules/lousy.uri.html
+share/doc/luakit/modules/lousy.util.html
+share/doc/luakit/modules/lousy.widget.buf.html
+share/doc/luakit/modules/lousy.widget.common.html
+share/doc/luakit/modules/lousy.widget.hist.html
+share/doc/luakit/modules/lousy.widget.html
+share/doc/luakit/modules/lousy.widget.menu.html
+share/doc/luakit/modules/lousy.widget.progress.html
+share/doc/luakit/modules/lousy.widget.scroll.html
+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.uri.html
+share/doc/luakit/modules/luakit.html
+share/doc/luakit/modules/mixed_content.html
+share/doc/luakit/modules/msg.html
+share/doc/luakit/modules/newtab_chrome.html
+share/doc/luakit/modules/noscript.html
+share/doc/luakit/modules/open_editor.html
+share/doc/luakit/modules/proxy.html
+share/doc/luakit/modules/quickmarks.html
+share/doc/luakit/modules/referer_control_wm.html
+share/doc/luakit/modules/search.html
+share/doc/luakit/modules/select.html
+share/doc/luakit/modules/session.html
+share/doc/luakit/modules/soup.html
+share/doc/luakit/modules/styles.html
+share/doc/luakit/modules/tab_favicons.html
+share/doc/luakit/modules/tabhistory.html
+share/doc/luakit/modules/taborder.html
+share/doc/luakit/modules/tests.lib.html
+share/doc/luakit/modules/undoclose.html
+share/doc/luakit/modules/userscripts.html
+share/doc/luakit/modules/viewpdf.html
+share/doc/luakit/modules/webinspector.html
+share/doc/luakit/modules/xdg.html
+share/doc/luakit/pages/Authors.html
+share/doc/luakit/pages/Tests.html
+share/examples/luakit/binds.lua
+share/examples/luakit/globals.lua
+share/examples/luakit/modes.lua
+share/examples/luakit/rc.lua
+share/examples/luakit/theme.lua
+share/examples/luakit/webview.lua
+share/examples/luakit/webview_wm.lua
+share/examples/luakit/window.lua
+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/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/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/viewpdf.lua
+share/luakit/lib/webinspector.lua
+share/luakit/luakit.so
+share/luakit/resources/icons/COPYING
+share/luakit/resources/icons/tab-icon-chrome.png
+share/luakit/resources/icons/tab-icon-chrome%2x.png@localhost
+share/luakit/resources/icons/tab-icon-page.png
+share/luakit/resources/icons/tab-icon-page%2x.png@localhost
+share/luakit/resources/icons/tab-icon-private.png
+share/luakit/resources/icons/tab-icon-private%2x.png@localhost
+share/pixmaps/luakit.png
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
new file mode 100644
index 0000000000..e4bcc4834c
--- /dev/null
+++ b/luakit-git/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = c834bed7e95725f28f39d6e5f9bae2d190e3a48f
+RMD160 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = c829f11889a2e50e8a91b5c9553e84c0ded5fdd9
+SHA512 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = f493fde91e87b8bd40f3a90b558c4d297ed31bc00e6924660a5c1fa55aa35bfd2eb7c8a6a7ea1d6b9ef7d095d358659d350ca92fbc6f654a9df9a1544ce30fdf
+Size (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = 518360 bytes
+SHA1 (patch-Makefile) = aff51a8672e75d356435766b4c71314948375b3b
+SHA1 (patch-luakit.c) = 6cf1426a1a6b75ad70dbca82cc2496275d13ca86
diff --git a/luakit-git/patches/patch-Makefile b/luakit-git/patches/patch-Makefile
new file mode 100644
index 0000000000..ebf426d837
--- /dev/null
+++ b/luakit-git/patches/patch-Makefile
@@ -0,0 +1,36 @@
+$NetBSD$
+
+Install files under PREFIX.
+
+--- Makefile.orig 2017-06-05 19:43:00.000000000 +0000
++++ Makefile
+@@ -97,12 +97,12 @@ install: all
+ install luakit.so $(INSTALLDIR)/share/luakit/luakit.so
+ install -d $(INSTALLDIR)/bin
+ install luakit $(INSTALLDIR)/bin/luakit
+- install -d $(DESTDIR)/etc/xdg/luakit/
+- install -m644 config/*.lua $(DESTDIR)/etc/xdg/luakit/
+- install -d $(DESTDIR)/usr/share/pixmaps
+- install -m644 extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
+- install -d $(DESTDIR)/usr/share/applications
+- install -m644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
++ install -d $(INSTALLDIR)/share/examples/luakit
++ install -m644 config/*.lua $(INSTALLDIR)/share/examples/luakit/
++ install -d $(INSTALLDIR)/share/pixmaps
++ install -m644 extras/luakit.png $(INSTALLDIR)/share/pixmaps/
++ install -d $(INSTALLDIR)/share/applications
++ install -m644 extras/luakit.desktop $(INSTALLDIR)/share/applications/
+ install -d $(MANPREFIX)/man1/
+ install -m644 luakit.1.gz $(MANPREFIX)/man1/
+ mkdir -p resources
+@@ -111,8 +111,8 @@ install: all
+
+ uninstall:
+ rm -rf $(INSTALLDIR)/bin/luakit $(INSTALLDIR)/share/luakit
+- rm -rf $(MANPREFIX)/man1/luakit.1.gz $(DESTDIR)/etc/xdg/luakit
+- rm -rf $(DESTDIR)/usr/share/applications/luakit.desktop $(DESTDIR)/usr/share/pixmaps/luakit.png
++ rm -rf $(MANPREFIX)/man1/luakit.1.gz $(INSTALLDIR)/etc/xdg/luakit
++ rm -rf $(INSTALLDIR)/usr/share/applications/luakit.desktop $(INSTALLDIR)/usr/share/pixmaps/luakit.png
+
+ tests/util.so: tests/util.c Makefile
+ $(CC) -fpic $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) $< -o $@
diff --git a/luakit-git/patches/patch-luakit.c b/luakit-git/patches/patch-luakit.c
new file mode 100644
index 0000000000..cdbf1ba1da
--- /dev/null
+++ b/luakit-git/patches/patch-luakit.c
@@ -0,0 +1,49 @@
+$NetBSD$
+
+luakit is used to generate the API documentation, so allow
+it to run without GTK when DISPLAY is not set.
+
+--- luakit.c.orig 2017-06-05 03:20:23.000000000 +0000
++++ luakit.c
+@@ -171,13 +171,20 @@ glib_log_writer(GLogLevelFlags log_level
+ gint
+ main(gint argc, gchar *argv[])
+ {
++ char *display = NULL;
+ gboolean *nonblock = NULL;
++ gboolean havedisplay = TRUE;
+
+ globalconf.starttime = l_time();
+
++ display = getenv("DISPLAY");
++ if (display == NULL || strcmp(display, "") == 0)
++ havedisplay = FALSE;
++
+ /* set numeric locale to C (required for compatibility with
+ LuaJIT and luakit scripts) */
+- gtk_disable_setlocale();
++ if (havedisplay)
++ gtk_disable_setlocale();
+ setlocale(LC_ALL, "");
+ setlocale(LC_NUMERIC, "C");
+
+@@ -205,7 +212,8 @@ main(gint argc, gchar *argv[])
+ }
+ }
+
+- gtk_init(&argc, &argv);
++ if (havedisplay)
++ gtk_init(&argc, &argv);
+
+ #if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 50
+ g_log_set_writer_func(glib_log_writer, NULL, NULL);
+@@ -222,7 +230,8 @@ main(gint argc, gchar *argv[])
+ if (!globalconf.windows->len)
+ fatal("no windows spawned by rc file, exiting");
+
+- gtk_main();
++ if (havedisplay)
++ gtk_main();
+ return EXIT_SUCCESS;
+ }
+
Home |
Main Index |
Thread Index |
Old Index