pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

luakit: update to luakit-2.1

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Nov 25 12:53:31 2018 +0200
Changeset:	54e97b0da237f79c5097535f48eb6a56fe3427a2

Modified Files:
	luakit/Makefile
	luakit/PLIST
	luakit/distinfo
Added Files:
	luakit/patches/patch-lib_window.lua
Removed Files:
	luakit/patches/patch-config_window.lua

Log Message:
luakit: update to luakit-2.1

This brings wip/luakit up to date with wip/luakit-git.

Changelog:

=== Migrating from version 2017-08-10

 1. Remove the two `if unique then ... end` blocks from your `rc.lua`.
 2. Add `require "unique_instance"` to your `rc.lua`, before all other `require` statements.
 4. Remove all configuration files except `rc.lua` and `theme.lua`. Any changes to `globals.lua`
    need to be migrated to `rc.lua` and changed to use the `settings` API.

=== Added

 - Added `styles.new_style` function.
 - Added `styles.toggle_sheet` function.
 - Added `styles.watch_styles` function, and enabled live-editing of user styles.
 - Added `luakit.install_paths` table. `luakit.install_path` is now deprecated.
 - Added `Control-Y` readline binding.
 - Added ability to control whether links from secondary instances open in a new window.
 - Added `luakit.resource_path` property to control where luakit searches for resource files.
 - Added `lousy.util.find_resource` function.
 - Added `scroll` signal.
 - Added ability to bind actions to webview scroll events.
 - Added ability to set the default zoom level.
 - Added `webview` widget `"permission-request"` signal.
 - Added `webview` widget `hardware_acceleration_policy` property.
 - Added `webview` widget `allow_file_access_from_file_urls` and `allow_universal_access_from_file_urls` properties.
 - Added `settings` module and APIs. This replaces the `domain_props` module.
 - Added `tablist.always_visible` setting.
 - Added `utf8.len` (same as `string.wlen`) and `utf8.offset` methods.
 - Added `utf8.charpattern` property.
 - Added `:set` and `:seton` commands, for changing settings.
 - Added ability to always save session before exiting luakit.
 - Added `markup` option to window `set_prompt()` method.
 - Added `detach-tab` signal.
 - Added support for multi-byte characters in hints.
 - Added widget `replace` method.

=== Changed

 - It is no longer necessary to add bindings to tables with `lousy.bind.add_binds()`.
 - Readline bindings have been moved to `readline.lua`.
 - Readline bindings are now automatically bound when the input bar is visible.
 - Unique instance support has been moved to `unique_instance.lua`.
 - The `image` widget now uses `luakit.resource_path` to locate local files.
 - The log viewer now shows errors logged by a user-defined rc.lua failing to load.
 - Luakit will now remove its IPC socket file before restarting.
 - The editor command now defaults to using `xdg-open` to edit files.  The `default` builtin
   command has been renamed `autodetect`.
 - Changed `luakit://introspector/` to `luakit://binds/`.
 - URL completion now uses word-based fuzzy matching.
 - `:download` now uses the current page URI by default.
 - `gy` now accepts a count.
 - `:tabopen` will now only open local files when given an absolute path.
 - `:styles-list` now lists active styles first and disabled styles last.

=== Removed

 - Removed `domain_props` module. It is replaced by the `settings` module and its APIs.
 - Removed all configuration files except `rc.lua` and `theme.lua`.
 - Removed `enable_private_browsing` webview property.
 - Removed `w.closed_tabs` field. It is now private to the `undoclose` module.

=== Fixed

 - Fixed <luakit://help/> not finding documentation with custom DOCDIR
 - Various minor documentation fixes.
 - Fixed `Control-Scroll` and `Shift-Scroll` key bindings not working with smooth scrolling.
 - Fixed inability to switch focus between web page elements with `Tab` and `Shift-Tab`.
 - Fixed log page bug when logging messages with newlines.
 - Fixed `Up` and `Down` keybindings being broken on completion menu.
 - Fixed hardcoded path to luakit icon.
 - Fixed luakit:// pages not working and spewing errors when not using LuaJIT.
 - Fixed thumbnail hinting not retrieving thumbnail links correctly.
 - Fixed inability to bind `Modifier-Minus`.
 - Fixed readline handling of wide characters.
 - Fixed completion not suggesting history/bookmarks items without titles/tags.
 - Fixed `:dump` command not working due to use of a removed API.
 - Fixed follow hints being sometimes truncated by the viewport edge.
 - Follow mode now renders hints much faster.
 - Fixed Forward/Back keys not working due to outdated bind syntax.
 - Fixed opening local files with names containing spaces from `:tabopen` and the command-line.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=54e97b0da237f79c5097535f48eb6a56fe3427a2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 luakit/Makefile                        | 20 +++++++++++------
 luakit/PLIST                           | 40 ++++++++++++++++++++++++++++------
 luakit/distinfo                        | 10 ++++-----
 luakit/patches/patch-config_window.lua | 24 --------------------
 luakit/patches/patch-lib_window.lua    | 24 ++++++++++++++++++++
 5 files changed, 75 insertions(+), 43 deletions(-)

diffs:
diff --git a/luakit/Makefile b/luakit/Makefile
index 4d987b02df..0f22a2111e 100644
--- a/luakit/Makefile
+++ b/luakit/Makefile
@@ -1,9 +1,12 @@
 # $NetBSD$
 
-DISTNAME=	luakit-2017.08.10
-PKGREVISION=	1
+PKGNAME=	luakit-${GITHUB_TAG}
+DISTNAME=	${GITHUB_TAG}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=luakit/}
+GITHUB_PROJECT=	luakit
+GITHUB_TAG=	2.1
+DIST_SUBDIR=	${PKGBASE}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://luakit.org/
@@ -13,11 +16,11 @@ LICENSE=	gnu-gpl-v3
 USE_TOOLS+=	gmake pkg-config
 
 LUAKIT_MAKE_FLAGS+=	DEVELOPMENT_PATHS=0
-LUAKIT_MAKE_FLAGS+=	APPDIR=${DESTDIR}${PREFIX}/share/applications
-LUAKIT_MAKE_FLAGS+=	DOCDIR=${DESTDIR}${PREFIX}/share/doc/luakit
-LUAKIT_MAKE_FLAGS+=	MANPREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
-LUAKIT_MAKE_FLAGS+=	PIXMAPDIR=${DESTDIR}${PREFIX}/share/pixmaps
-LUAKIT_MAKE_FLAGS+=	XDGPREFIX=${DESTDIR}${PREFIX}/etc/xdg
+LUAKIT_MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
+LUAKIT_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
+LUAKIT_MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
+LUAKIT_MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
+LUAKIT_MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
 LUAKIT_MAKE_FLAGS+=	USE_LUAJIT=0
 BUILD_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
@@ -52,6 +55,9 @@ teardownx:
 pre-build:	setupx
 post-build:	teardownx
 
+pre-install:
+	${RM} -f ${WRKSRC}/lib/*.orig
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
diff --git a/luakit/PLIST b/luakit/PLIST
index 73a082ac60..cb3c4f2ae3 100644
--- a/luakit/PLIST
+++ b/luakit/PLIST
@@ -1,11 +1,8 @@
 @comment $NetBSD$
 bin/luakit
-etc/xdg/luakit/globals.lua
 etc/xdg/luakit/rc.lua
 etc/xdg/luakit/theme.lua
-etc/xdg/luakit/webview.lua
-etc/xdg/luakit/webview_wm.lua
-etc/xdg/luakit/window.lua
+lib/luakit/luakit.so
 man/man1/luakit.1
 share/applications/luakit.desktop
 share/doc/luakit/AUTHORS
@@ -38,6 +35,7 @@ share/doc/luakit/index.html
 share/doc/luakit/modules/adblock.html
 share/doc/luakit/modules/adblock_chrome.html
 share/doc/luakit/modules/binds.html
+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
@@ -61,6 +59,7 @@ 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/keysym.html
 share/doc/luakit/modules/log_chrome.html
 share/doc/luakit/modules/lousy.bind.html
 share/doc/luakit/modules/lousy.load.html
@@ -70,8 +69,21 @@ 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/lousy.widget.zoom.html
 share/doc/luakit/modules/luakit.html
+share/doc/luakit/modules/luakit.unique.html
 share/doc/luakit/modules/modes.html
 share/doc/luakit/modules/msg.html
 share/doc/luakit/modules/newtab_chrome.html
@@ -79,11 +91,14 @@ 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/readline.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/select_wm.html
 share/doc/luakit/modules/session.html
+share/doc/luakit/modules/settings.html
+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
@@ -91,12 +106,15 @@ 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/unique.html
+share/doc/luakit/modules/unique_instance.html
 share/doc/luakit/modules/userscripts.html
+share/doc/luakit/modules/utf8.html
 share/doc/luakit/modules/vertical_tabs.html
 share/doc/luakit/modules/view_source.html
 share/doc/luakit/modules/viewpdf.html
 share/doc/luakit/modules/webinspector.html
+share/doc/luakit/modules/webview.html
+share/doc/luakit/modules/window.html
 share/doc/luakit/modules/xdg.html
 share/doc/luakit/pages/01-authors.html
 share/doc/luakit/pages/02-faq.html
@@ -104,10 +122,12 @@ share/doc/luakit/pages/03-quick-start-guide.html
 share/doc/luakit/pages/04-migration-guide.html
 share/doc/luakit/pages/05-configuration.html
 share/doc/luakit/pages/06-tests.html
+share/doc/luakit/pages/07-build-debian-package.html
 share/luakit/lib/adblock.lua
 share/luakit/lib/adblock_chrome.lua
 share/luakit/lib/adblock_wm.lua
 share/luakit/lib/binds.lua
+share/luakit/lib/binds_chrome.lua
 share/luakit/lib/bookmarks.lua
 share/luakit/lib/bookmarks_chrome.lua
 share/luakit/lib/chrome.lua
@@ -136,7 +156,7 @@ share/luakit/lib/history_chrome.lua
 share/luakit/lib/image_css.lua
 share/luakit/lib/image_css_wm.lua
 share/luakit/lib/introspector_chrome.lua
-share/luakit/lib/jquery.min.js
+share/luakit/lib/keysym.lua
 share/luakit/lib/log_chrome.lua
 share/luakit/lib/lousy/bind.lua
 share/luakit/lib/lousy/init.lua
@@ -167,22 +187,28 @@ share/luakit/lib/noscript.lua
 share/luakit/lib/open_editor.lua
 share/luakit/lib/proxy.lua
 share/luakit/lib/quickmarks.lua
+share/luakit/lib/readline.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/settings.lua
+share/luakit/lib/settings_chrome.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/unique_instance.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/lib/webview.lua
+share/luakit/lib/webview_wm.lua
+share/luakit/lib/window.lua
 share/luakit/resources/icons/COPYING
 share/luakit/resources/icons/tab-icon-chrome.png
 share/luakit/resources/icons/tab-icon-chrome%2x.png@localhost
diff --git a/luakit/distinfo b/luakit/distinfo
index 103bd3c22c..c2a12e68e6 100644
--- a/luakit/distinfo
+++ b/luakit/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (luakit-2017.08.10.tar.gz) = 9700901e09ec91f598df188e82972c0d2578aaed
-RMD160 (luakit-2017.08.10.tar.gz) = 144c400c408bdfc3385ee1c3b569351f1f0ae1af
-SHA512 (luakit-2017.08.10.tar.gz) = 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
-Size (luakit-2017.08.10.tar.gz) = 399564 bytes
-SHA1 (patch-config_window.lua) = 68676f1a203c2f6790ea6e502218449824b9bc80
+SHA1 (luakit/2.1.tar.gz) = fe0d7d52e76aae598639ff6f2b4834cdc5670740
+RMD160 (luakit/2.1.tar.gz) = a462c13895d62ad2f45c10805fdb39cf84307bdb
+SHA512 (luakit/2.1.tar.gz) = 1daee7fe4bf5fad0f2c70d714c316914c601467facafdb22e4f27c18a691e249cefd5680ede834bcc555041afdc5d7e70610e2cd5e33db1ad8d9f2fe0327ccac
+Size (luakit/2.1.tar.gz) = 485605 bytes
+SHA1 (patch-lib_window.lua) = 7a2a41610b20cc18e8ff5a4bd7f0ed06994c2ce8
 SHA1 (patch-widgets_webview.c) = 25550c4dc7fcacf6a8e486afdbe38e19a8df3bb4
diff --git a/luakit/patches/patch-config_window.lua b/luakit/patches/patch-config_window.lua
deleted file mode 100644
index fb1a208705..0000000000
--- a/luakit/patches/patch-config_window.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Do not destroy() the current view.
-
-When just one tab is present it leads to an high CPU usage and luakit completely
-stuck (although start luakit via `--log=DEBUG' option shows that it responds to
-events). To workaround this problem avoid to call view:destroy().
-
-XXX: I'm not sure if it's the correct fix.
-
-Reported uptsream via:
-
- <https://github.com/luakit/luakit/pull/726>
-
---- config/window.lua.orig	2017-08-10 09:50:15.000000000 +0000
-+++ config/window.lua
-@@ -519,7 +519,6 @@ window.methods = {
-         view = view or w.view
-         w:emit_signal("close-tab", view)
-         w:detach_tab(view, blank_last)
--        view:destroy()
-     end,
- 
-     attach_tab = function (w, view, switch, order)
diff --git a/luakit/patches/patch-lib_window.lua b/luakit/patches/patch-lib_window.lua
new file mode 100644
index 0000000000..8fbb5f093f
--- /dev/null
+++ b/luakit/patches/patch-lib_window.lua
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Do not destroy() the current view.
+
+When just one tab is present it leads to an high CPU usage and luakit completely
+stuck (although start luakit via `--log=DEBUG' option shows that it responds to
+events). To workaround this problem avoid to call view:destroy().
+
+XXX: I'm not sure if it's the correct fix.
+
+Reported uptsream via:
+
+ <https://github.com/luakit/luakit/pull/726>
+
+--- lib/window.lua.orig	2017-08-10 09:50:15.000000000 +0000
++++ lib/window.lua
+@@ -519,7 +519,6 @@ window.methods = {
+         view = view or w.view
+         w:emit_signal("close-tab", view)
+         w:detach_tab(view, blank_last)
+-        view:destroy()
+     end,
+ 
+     attach_tab = function (w, view, switch, order)
Home | Main Index | Thread Index | Old Index