patches/luakit-2.3.1v1.diff

149 lines
5.8 KiB
Diff
Raw Normal View History

2023-01-11 10:10:34 +01:00
Index: www/luakit/Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- www/luakit/Makefile 31 Mar 2022 16:29:49 -0000 1.34
+++ www/luakit/Makefile 30 Aug 2022 18:07:30 -0000
@@ -3,8 +3,7 @@ COMMENT = fast, small, webkit based brow
GH_ACCOUNT = luakit
GH_PROJECT = luakit
# used in MAKE_FLAGS
-GH_TAGNAME = 2.3
-REVISION = 3
+GH_TAGNAME = 2.3.1
EPOCH = 1
Index: www/luakit/distinfo
===================================================================
RCS file: /cvs/ports/www/luakit/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- www/luakit/distinfo 21 Mar 2021 14:16:21 -0000 1.12
+++ www/luakit/distinfo 30 Aug 2022 18:07:30 -0000
@@ -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
Index: www/luakit/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile
--- www/luakit/patches/patch-Makefile 11 Mar 2022 20:10:05 -0000 1.5
+++ www/luakit/patches/patch-Makefile 30 Aug 2022 18:07:30 -0000
@@ -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
+
Index: www/luakit/patches/patch-common_luautil_c
===================================================================
RCS file: www/luakit/patches/patch-common_luautil_c
diff -N www/luakit/patches/patch-common_luautil_c
--- www/luakit/patches/patch-common_luautil_c 11 Mar 2022 20:10:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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, "");
- }
-
Index: www/luakit/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/luakit/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- www/luakit/pkg/PLIST 11 Mar 2022 20:10:05 -0000 1.10
+++ www/luakit/pkg/PLIST 30 Aug 2022 18:07:30 -0000
@@ -83,6 +83,7 @@ share/doc/luakit/modules/lousy.widget.ss
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
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-se
share/luakit/resources/icons/tab-icon-security-error@2x.png
share/pixmaps/
share/pixmaps/luakit.png
+share/pixmaps/luakit.svg
@tag update-desktop-database