netsurf: Update to 3.9

17 files changed, 15 insertions, 177 deletions

diff --git a/.gitmodules b/.gitmodules
index 76c46a10..941632a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -158,7 +158,6 @@
 [submodule "pkg/netsurf/libcss/src"]
 	path = pkg/netsurf/libcss/src
 	url = git://git.netsurf-browser.org/libcss.git
-	ignore = all
 [submodule "pkg/netsurf/libdom/src"]
 	path = pkg/netsurf/libdom/src
 	url = git://git.netsurf-browser.org/libdom.git
diff --git a/pkg/netsurf/config.h b/pkg/netsurf/config.h
index d8abfeed..ed8ab585 100644
--- a/pkg/netsurf/config.h
+++ b/pkg/netsurf/config.h
@@ -1,4 +1,6 @@
 #define nstiny
+#define NETSURF_BUILTIN_LOG_FILTER "level:WARNING"
+#define NETSURF_BUILTIN_VERBOSE_FILTER "level:DEBUG"
 #define NETSURF_HOMEPAGE "https://duckduckgo.com/html"
 #define TINY_RESPATH "/share/netsurf:/share/fonts"
 
diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
index ecc0e3db..79fb5cfb 100644
--- a/pkg/netsurf/gen.lua
+++ b/pkg/netsurf/gen.lua
@@ -125,7 +125,7 @@ exe('netsurf', [[
 		utils.c
 		http/(
 			challenge.c generics.c primitives.c parameter.c
-			content-disposition.c content-type.c
+			cache-control.c content-disposition.c content-type.c
 			strict-transport-security.c www-authenticate.c
 		)
 		nsurl/(
diff --git a/pkg/netsurf/libcss/gen.lua b/pkg/netsurf/libcss/gen.lua
index 768a53e0..80a1925d 100644
--- a/pkg/netsurf/libcss/gen.lua
+++ b/pkg/netsurf/libcss/gen.lua
@@ -1,4 +1,5 @@
 cflags{
+	[[-D '_ALIGNED=__attribute__((aligned))']],
 	'-I $srcdir/include',
 	'-I $srcdir/src',
 	'-I pkg/netsurf/libparserutils/src/include',
@@ -25,7 +26,7 @@ lib('libcss.a', [[src/(
 	charset/detect.c
 	lex/lex.c
 	parse/(
-		parse.c language.c important.c propstrings.c font_face.c
+		parse.c language.c important.c propstrings.c font_face.c mq.c
 		properties/(
 			azimuth.c
 			background.c
diff --git a/pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch b/pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
deleted file mode 100644
index 62693b0b..00000000
--- a/pkg/netsurf/libcss/patch/0001-Remove-_ALIGNED-after-struct-definition.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c56708515c29edf097bcf1f021728dacf4173d69 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 19 Jun 2019 21:36:22 -0700
-Subject: [PATCH] Remove _ALIGNED after struct definition
-
----
- src/stylesheet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/stylesheet.h b/src/stylesheet.h
-index 18e077e..59632cc 100644
---- a/src/stylesheet.h
-+++ b/src/stylesheet.h
-@@ -120,7 +120,7 @@ struct css_rule {
- 		     index : 16,		/**< index in sheet */
- 		     items :  8,		/**< # items in rule */
- 		     ptype :  1;		/**< css_rule_parent_type */
--} _ALIGNED;
-+};
- 
- typedef struct css_rule_selector {
- 	css_rule base;
--- 
-2.20.1
-
diff --git a/pkg/netsurf/libcss/src b/pkg/netsurf/libcss/src
-Subproject 4591e4851068ab16afdecbaef5eccacc71344ff
+Subproject ba1d79992750773e3decdf485b40b283d81837a
diff --git a/pkg/netsurf/libcss/ver b/pkg/netsurf/libcss/ver
index 368b3d7e..96bd60a6 100644
--- a/pkg/netsurf/libcss/ver
+++ b/pkg/netsurf/libcss/ver
@@ -1 +1 @@
-0.8.0 r1
+0.9.0 r0
diff --git a/pkg/netsurf/libdom/patch/0002-Remove-empty-top-level-declarations.patch b/pkg/netsurf/libdom/patch/0001-Remove-empty-top-level-declarations.patch
index a6ee4733..9c3852a2 100644
--- a/pkg/netsurf/libdom/patch/0002-Remove-empty-top-level-declarations.patch
+++ b/pkg/netsurf/libdom/patch/0001-Remove-empty-top-level-declarations.patch
@@ -1,4 +1,4 @@
-From 60941b7bdcf436b022a23d5f80767c49abb65d72 Mon Sep 17 00:00:00 2001
+From 64cefc96a96ea5cade24179ee17bc3dfb3c90187 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 1 Jul 2019 22:57:10 -0700
 Subject: [PATCH] Remove empty top-level declarations
@@ -370,7 +370,7 @@ index 40cb99c..216f7b8 100644
  /* Public APIs */
  
 diff --git a/src/html/html_label_element.c b/src/html/html_label_element.c
-index 3864cc4..dbd5428 100644
+index 777144a..9b69c55 100644
 --- a/src/html/html_label_element.c
 +++ b/src/html/html_label_element.c
 @@ -214,6 +214,6 @@ dom_exception dom_html_label_element_set_##attr(			\
@@ -434,7 +434,7 @@ index 20cb042..7b9b90f 100644
 +SIMPLE_GET_SET(date_time)
  
 diff --git a/src/html/html_object_element.c b/src/html/html_object_element.c
-index e926aef..b145a63 100644
+index b51e3a0..e9f02cb 100644
 --- a/src/html/html_object_element.c
 +++ b/src/html/html_object_element.c
 @@ -187,19 +187,19 @@ dom_exception _dom_html_object_element_copy_internal(
@@ -529,10 +529,10 @@ index cf3e0c5..e42d153 100644
 +SIMPLE_GET_SET(cite)
  
 diff --git a/src/html/html_script_element.c b/src/html/html_script_element.c
-index d20d727..8c21cf1 100644
+index e8dfb1d..369cb2a 100644
 --- a/src/html/html_script_element.c
 +++ b/src/html/html_script_element.c
-@@ -184,11 +184,11 @@ dom_exception dom_html_script_element_set_##attr(			\
+@@ -186,11 +186,11 @@ dom_exception dom_html_script_element_set_##attr(			\
  
  #define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr)
  
diff --git a/pkg/netsurf/libdom/patch/0001-String-remove-innards-from-public-header.patch b/pkg/netsurf/libdom/patch/0001-String-remove-innards-from-public-header.patch
deleted file mode 100644
index 8a40e04a..00000000
--- a/pkg/netsurf/libdom/patch/0001-String-remove-innards-from-public-header.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 23f34c5aa0b0773bad6c6c41d4f9acc84be09af6 Mon Sep 17 00:00:00 2001
-From: John-Mark Bell <jmb@netsurf-browser.org>
-Date: Sat, 29 Jun 2019 16:40:03 +0000
-Subject: [PATCH] String: remove innards from public header.
-
-A dom_string is the first member of the underlying
-dom_string_internal and thus their addresses are equivalent. We
-shouldn't be exposing the internal alignment requirements through
-the public header at all, so remove the bogus _ALIGNED and cast
-through void internally to tell the compiler that we know what
-we're doing.
----
- include/dom/core/string.h |  2 +-
- src/core/string.c         | 26 +++++++++++++-------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/dom/core/string.h b/include/dom/core/string.h
-index f2a6122..4c2da97 100644
---- a/include/dom/core/string.h
-+++ b/include/dom/core/string.h
-@@ -18,7 +18,7 @@
- typedef struct dom_string dom_string;
- struct dom_string {
- 	uint32_t refcnt;
--} _ALIGNED;
-+};
- 
- 
- /* Claim a reference on a DOM string */
-diff --git a/src/core/string.c b/src/core/string.c
-index 1f0fdd5..f140a3a 100644
---- a/src/core/string.c
-+++ b/src/core/string.c
-@@ -56,7 +56,7 @@ static const dom_string_internal empty_string = {
- 
- void dom_string_destroy(dom_string *str)
- {
--	dom_string_internal *istr = (dom_string_internal *)str;
-+	dom_string_internal *istr = (void *) str;
- 	if (str != NULL) {
- 		assert(istr->base.refcnt == 0);
- 		switch (istr->type) {
-@@ -175,7 +175,7 @@ dom_exception dom_string_create_interned(const uint8_t *ptr, size_t len,
- dom_exception dom_string_intern(dom_string *str, 
- 		struct lwc_string_s **lwcstr)
- {
--	dom_string_internal *istr = (dom_string_internal *) str;
-+	dom_string_internal *istr = (void *) str;
- 	/* If this string is already interned, do nothing */
- 	if (istr->type != DOM_STRING_INTERNED) {
- 		lwc_string *ret;
-@@ -209,8 +209,8 @@ dom_exception dom_string_intern(dom_string *str,
- bool dom_string_isequal(const dom_string *s1, const dom_string *s2)
- {
- 	size_t len;
--	const dom_string_internal *is1 = (dom_string_internal *) s1;
--	const dom_string_internal *is2 = (dom_string_internal *) s2;
-+	const dom_string_internal *is1 = (void *) s1;
-+	const dom_string_internal *is2 = (void *) s2;
- 
- 	if (s1 == NULL)
- 		is1 = &empty_string;
-@@ -258,8 +258,8 @@ bool dom_string_caseless_isequal(const dom_string *s1, const dom_string *s2)
- 	const uint8_t *d1 = NULL;
- 	const uint8_t *d2 = NULL;
- 	size_t len;
--	const dom_string_internal *is1 = (dom_string_internal *) s1;
--	const dom_string_internal *is2 = (dom_string_internal *) s2;
-+	const dom_string_internal *is1 = (void *) s1;
-+	const dom_string_internal *is2 = (void *) s2;
- 
- 	if (s1 == NULL)
- 		is1 = &empty_string;
-@@ -311,7 +311,7 @@ bool dom_string_caseless_isequal(const dom_string *s1, const dom_string *s2)
- bool dom_string_lwc_isequal(const dom_string *s1, lwc_string *s2)
- {
- 	size_t len;
--	dom_string_internal *is1 = (dom_string_internal *) s1;
-+	dom_string_internal *is1 = (void *) s1;
- 
- 	if (s1 == NULL || s2 == NULL)
- 		return false;
-@@ -348,7 +348,7 @@ bool dom_string_caseless_lwc_isequal(const dom_string *s1, lwc_string *s2)
- 	size_t len;
- 	const uint8_t *d1 = NULL;
- 	const uint8_t *d2 = NULL;
--	dom_string_internal *is1 = (dom_string_internal *) s1;
-+	dom_string_internal *is1 = (void *) s1;
- 
- 	if (s1 == NULL || s2 == NULL)
- 		return false;
-@@ -897,7 +897,7 @@ dom_exception _dom_exception_from_lwc_error(lwc_error err)
-  */
- const char *dom_string_data(const dom_string *str)
- {
--	dom_string_internal *istr = (dom_string_internal *) str;
-+	dom_string_internal *istr = (void *) str;
- 	if (istr->type == DOM_STRING_CDATA) {
- 		return (const char *) istr->data.cdata.ptr;
- 	} else {
-@@ -911,7 +911,7 @@ const char *dom_string_data(const dom_string *str)
-  */
- size_t dom_string_byte_length(const dom_string *str)
- {
--	dom_string_internal *istr = (dom_string_internal *) str;
-+	dom_string_internal *istr = (void *) str;
- 	if (istr->type == DOM_STRING_CDATA) {
- 		return istr->data.cdata.len;
- 	} else {
-@@ -954,7 +954,7 @@ dom_string_toupper(dom_string *source, bool ascii_only, dom_string **upper)
- 		index++;
- 	}
- 	
--	if (((dom_string_internal*)source)->type == DOM_STRING_CDATA) {
-+	if (((dom_string_internal *) ((void *) source))->type == DOM_STRING_CDATA) {
- 		exc = dom_string_create(copy_s, nbytes, upper);
- 	} else {
- 		exc = dom_string_create_interned(copy_s, nbytes, upper);
-@@ -978,7 +978,7 @@ dom_string_toupper(dom_string *source, bool ascii_only, dom_string **upper)
- dom_exception
- dom_string_tolower(dom_string *source, bool ascii_only, dom_string **lower)
- {
--	dom_string_internal *isource = (dom_string_internal *)source;
-+	dom_string_internal *isource = (void *) source;
- 	dom_exception exc = DOM_NO_ERR;
- 
- 	if (ascii_only == false)
-@@ -1106,7 +1106,7 @@ dom_exception dom_string_whitespace_op(dom_string *s,
- 	len = temp_pos - temp;
- 
- 	/* Make new string */
--	if (((dom_string_internal *) s)->type == DOM_STRING_CDATA) {
-+	if (((dom_string_internal *) ((void *) s))->type == DOM_STRING_CDATA) {
- 		exc = dom_string_create(temp, len, ret);
- 	} else {
- 		exc = dom_string_create_interned(temp, len, ret);
--- 
-2.22.0
-
diff --git a/pkg/netsurf/libdom/src b/pkg/netsurf/libdom/src
-Subproject e437bb9126df49de815a06ff86edf4d6c4d252a
+Subproject 3939dbe39d2bd7ef4d34757b3162ac54597d9fb
diff --git a/pkg/netsurf/libdom/ver b/pkg/netsurf/libdom/ver
index d4ccbc68..b5f83ec1 100644
--- a/pkg/netsurf/libdom/ver
+++ b/pkg/netsurf/libdom/ver
@@ -1 +1 @@
-0.3.3 r2
+0.4.0 r0
diff --git a/pkg/netsurf/libhubbub/src b/pkg/netsurf/libhubbub/src
-Subproject 9199df40bc95d4d54a954d2d2d4d0ec74b0e516
+Subproject 050c36d483378d52cd8330fd0dcf3dfd4119ec7
diff --git a/pkg/netsurf/libhubbub/ver b/pkg/netsurf/libhubbub/ver
index c2c0004f..7cd04e59 100644
--- a/pkg/netsurf/libhubbub/ver
+++ b/pkg/netsurf/libhubbub/ver
@@ -1 +1 @@
-0.3.5
+0.3.6 r0
diff --git a/pkg/netsurf/libwapcaplet/src b/pkg/netsurf/libwapcaplet/src
-Subproject cedd6b600078828db294d9398851f4aa481b60f
+Subproject 130c1dec2842b5a7f1256816b58ea4d41726c95
diff --git a/pkg/netsurf/libwapcaplet/ver b/pkg/netsurf/libwapcaplet/ver
index 40abca36..6052ecdc 100644
--- a/pkg/netsurf/libwapcaplet/ver
+++ b/pkg/netsurf/libwapcaplet/ver
@@ -1 +1 @@
-0.4.1 r2
+0.4.2 r0
diff --git a/pkg/netsurf/src b/pkg/netsurf/src
-Subproject 918542a790f9415f9c67162ca7f4d1f9da3d5eb
+Subproject c0485dc7fe5bb90cc0bb04f6c9e06305c04d190
diff --git a/pkg/netsurf/ver b/pkg/netsurf/ver
index 43135c60..39a28b1e 100644
--- a/pkg/netsurf/ver
+++ b/pkg/netsurf/ver
@@ -1 +1 @@
-3.8 r4
+3.9 r0