oasis

commit: f303ccd2420acdbd4f902f2d0642ac96adeba3f6
parent f1e33bc0296f42d9489ca1cbde133bafb48f6d9b
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  7 Sep 2018 15:05:08 -0700

netsurf: Update to 3.8

Diffstat:
M
pkg/netsurf/gen.lua
40
+++++++++++++++++++++-------------------
M
pkg/netsurf/messages.awk
2
--
M
pkg/netsurf/rev
2
+-

3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
@@ -58,7 +58,7 @@ rule('nsgenbind', '$outdir/nsgenbind/nsgenbind -I $srcdir/content/handlers/javas
 local nsgenbind = expand{'$outdir/duktape/', lines('nsgenbind.txt')}
 build('nsgenbind', nsgenbind, {
 	'$srcdir/content/handlers/javascript/duktape/netsurf.bnd',
-	'|', '$outdir/nsgenbind/nsgenbind',
+	'|', '$outdir/nsgenbind/nsgenbind', '$dir/fetch',
 })
 
 pkg.deps = {
@@ -106,9 +106,17 @@ exe('netsurf', {sources, paths[[
 		llcache.c mimesniff.c urldb.c no_backing_store.c
 		fetchers/(curl.c data.c file.c about.c resource.c)
 		handlers/(
-			javascript/(fetcher.c content.c duktape/(dukky.c duktape.c))
-			css/(css.c dump.c internal.c hints.c select.c utils.c)
 			image/(image.c image_cache.c bmp.c gif.c ico.c jpeg.c png.c svg.c)
+			css/(css.c dump.c internal.c hints.c select.c utils.c)
+			javascript/(fetcher.c content.c duktape/(dukky.c duktape.c))
+			html/(
+				box.c box_construct.c box_normalise.c box_textarea.c
+				font.c form.c imagemap.c layout.c search.c table.c
+				html.c html_css.c html_css_fetcher.c html_script.c
+				html_interaction.c html_redraw.c html_redraw_border.c
+				html_forms.c html_object.c
+			)
+			text/textplain.c
 		)
 	)
 	utils/(
@@ -132,20 +140,14 @@ exe('netsurf', {sources, paths[[
 		utils.c
 		http/(
 			challenge.c generics.c primitives.c parameter.c
-			content-disposition.c content-type.c www-authenticate.c
+			content-disposition.c content-type.c
+			strict-transport-security.c www-authenticate.c
 		)
 		nsurl/(
 			nsurl.c
 			parse.c
 		)
 	)
-	render/(
-		box.c box_construct.c box_normalise.c box_textarea.c
-		font.c form.c imagemap.c layout.c search.c table.c textplain.c
-		html.c html_css.c html_css_fetcher.c html_script.c
-		html_interaction.c html_redraw.c html_redraw_border.c
-		html_forms.c html_object.c
-	)
 	$outdir/(
 		libcss/libcss.a.d
 		libdom/libdom.a.d
@@ -180,16 +182,16 @@ build('awk', '$outdir/Messages', {'$srcdir/resources/FatMessages', '|', '$dir/me
 })
 file('share/netsurf/Messages', '644', '$outdir/Messages')
 
-file('share/netsurf/adblock.css', '644', '$srcdir/!NetSurf/Resources/AdBlock,f79')
-file('share/netsurf/credits.html', '644', '$srcdir/!NetSurf/Resources/en/credits.html,faf')
-file('share/netsurf/default.css', '644', '$srcdir/!NetSurf/Resources/CSS,f79')
+file('share/netsurf/adblock.css', '644', '$srcdir/resources/adblock.css')
+file('share/netsurf/credits.html', '644', '$srcdir/resources/en/credits.html')
+file('share/netsurf/default.css', '644', '$srcdir/resources/default.css')
 file('share/netsurf/favicon.png', '644', '$srcdir/resources/favicon.png')
-file('share/netsurf/internal.css', '644', '$srcdir/!NetSurf/Resources/internal.css,f79')
-file('share/netsurf/licence.html', '644', '$srcdir/!NetSurf/Resources/en/licence.html,faf')
+file('share/netsurf/internal.css', '644', '$srcdir/resources/internal.css')
+file('share/netsurf/licence.html', '644', '$srcdir/resources/en/licence.html')
 sym('share/netsurf/maps.html', 'welcome.html')
-file('share/netsurf/netsurf.png', '644', '$srcdir/!NetSurf/Resources/netsurf.png,b60')
-file('share/netsurf/quirks.css', '644', '$srcdir/!NetSurf/Resources/Quirks,f79')
-file('share/netsurf/welcome.html', '644', '$srcdir/!NetSurf/Resources/en/welcome.html,faf')
+file('share/netsurf/netsurf.png', '644', '$srcdir/resources/netsurf.png')
+file('share/netsurf/quirks.css', '644', '$srcdir/resources/quirks.css')
+file('share/netsurf/welcome.html', '644', '$srcdir/resources/en/welcome.html')
 for icon in iterpaths[[back forward add remove home reload stop close up down]] do
 	file('share/netsurf/icons/'..icon..'.ff', '644', '$srcdir/frontends/tiny/res/icons/'..icon..'.ff')
 end
diff --git a/pkg/netsurf/messages.awk b/pkg/netsurf/messages.awk
@@ -1,5 +1,3 @@
-BEGIN {
-}
 /^(#|$)/ {next}
 {
 	i = index($0, ":")
diff --git a/pkg/netsurf/rev b/pkg/netsurf/rev
@@ -1 +1 @@
-19
+20