Update luakit 2.3 => 2.3.1

Added
* Added command :userscripts-reload to reload lua scripts.
* The tabgroup plugin is now included in luakit (:tabmenu).
* Allow configuration of shortcuts that should be passed through (#921).
* Added scalable SVG desktop icon version.

Changed
* Allow functions to be bound to more than one key (#913).

Fixed
* No more gdk_keymap_get_default() compiler warning.
* Fixed an issue where links were hinted, but then could not be followed.
* Fixed the paging on the the bookmarks page.
* Fixed build on Solaris.
* Fixed relocation errors on Sparc64.
* Fixed proxymenu to show default entries when proxymenu file is not present.
* The command mode cursor is now drawn in the user-specified foreground color.

OK rsadowski@
This commit is contained in:
sdk 2022-08-30 20:13:10 +00:00
parent f7ed7efe81
commit 3b3db97fd2
5 changed files with 12 additions and 51 deletions

View File

@ -3,8 +3,7 @@ COMMENT = fast, small, webkit based browser written in lua
GH_ACCOUNT = luakit
GH_PROJECT = luakit
# used in MAKE_FLAGS
GH_TAGNAME = 2.3
REVISION = 3
GH_TAGNAME = 2.3.1
EPOCH = 1

View File

@ -1,2 +1,2 @@
SHA256 (luakit-2.3.tar.gz) = xwJrTwvfpE9DeYuA+HVI0+etVvW5I/xDuccSvxhJYJU=
SIZE (luakit-2.3.tar.gz) = 497471
SHA256 (luakit-2.3.1.tar.gz) = E4/tHqzKuAH66MMv8r7Gy82GSp9SfFx3rR3kAs4aEw4=
SIZE (luakit-2.3.1.tar.gz) = 506988

View File

@ -1,38 +1,12 @@
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

View File

@ -1,17 +0,0 @@
Don't use printf %n.
Index: common/luautil.c
--- common/luautil.c.orig
+++ common/luautil.c
@@ -72,7 +72,10 @@ luaH_traceback(lua_State *L, lua_State *T, gint min_le
} else {
const char *src = AR_SRC(ar);
int n;
- g_string_append_printf(tb, "%s:%d%n", src, ar.currentline, &n);
+ char tmp[10] = "";
+ snprintf(tmp, sizeof(tmp), "%d", ar.currentline);
+ n = strlen(src) + strlen(tmp) + 1;
+ g_string_append_printf(tb, "%s:%d", src, ar.currentline);
g_string_append_printf(tb, "%*.*s", loc_pad-n, loc_pad-n, "");
}

View File

@ -83,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
@ -105,6 +106,7 @@ 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
@ -195,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
@ -214,6 +217,7 @@ 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
@ -244,4 +248,5 @@ share/luakit/resources/icons/tab-icon-security-error.png
share/luakit/resources/icons/tab-icon-security-error@2x.png
share/pixmaps/
share/pixmaps/luakit.png
share/pixmaps/luakit.svg
@tag update-desktop-database