From 74b163a34c93dccf1940758375d2959c79b21135 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 25 May 2020 17:21:56 -0700 Subject: netsurf: Update to 3.10 --- pkg/netsurf/gen.lua | 50 +++++++-- pkg/netsurf/libcss/src | 2 +- pkg/netsurf/libcss/ver | 2 +- pkg/netsurf/libdom/gen.lua | 84 ++++++++++----- pkg/netsurf/libdom/src | 2 +- pkg/netsurf/libdom/ver | 2 +- pkg/netsurf/libhubbub/src | 2 +- pkg/netsurf/libhubbub/ver | 2 +- pkg/netsurf/libnsbmp/src | 2 +- pkg/netsurf/libnsbmp/ver | 2 +- pkg/netsurf/libnsutils/src | 2 +- pkg/netsurf/libnsutils/ver | 2 +- ...static-inline-functions-instead-of-macros.patch | 120 +++++++++++---------- pkg/netsurf/libwapcaplet/src | 2 +- pkg/netsurf/libwapcaplet/ver | 2 +- pkg/netsurf/src | 2 +- pkg/netsurf/ver | 2 +- 17 files changed, 175 insertions(+), 107 deletions(-) (limited to 'pkg/netsurf') diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua index d086ff6b..0eb09602 100644 --- a/pkg/netsurf/gen.lua +++ b/pkg/netsurf/gen.lua @@ -78,28 +78,54 @@ exe('netsurf', [[ desktop/( cookie_manager.c knockout.c hotlist.c mouse.c plot_style.c print.c search.c searchweb.c scrollbar.c - sslcert_viewer.c textarea.c version.c system_colour.c - local_history.c global_history.c treeview.c + textarea.c version.c system_colour.c + local_history.c global_history.c treeview.c page-info.c - browser.c browser_history.c download.c frames.c netsurf.c + browser.c browser_window.c browser_history.c + download.c frames.c netsurf.c cw_helper.c save_complete.c save_text.c selection.c textinput.c gui_factory.c save_pdf.c font_haru.c ) frontends/tiny/(download.c fetch.c icons.c gui.c render.c schedule.c ui.c wl.c) content/( - content.c content_factory.c dirlist.c fetch.c hlcache.c - llcache.c mimesniff.c urldb.c no_backing_store.c + content.c + content_factory.c + dirlist.c + fetch.c + hlcache.c + llcache.c + mimesniff.c + textsearch.c + urldb.c + no_backing_store.c fetchers/(curl.c data.c file.c about.c resource.c) handlers/( 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 none/none.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 + box_construct.c + box_inspect.c + box_manipulate.c + box_normalise.c + box_special.c + box_textarea.c + css.c + css_fetcher.c + dom_event.c + font.c + form.c + forms.c + html.c + imagemap.c + interaction.c + layout.c + object.c + redraw.c + redraw_border.c + script.c + table.c + textselection.c ) text/textplain.c ) @@ -110,13 +136,16 @@ exe('netsurf', [[ file.c filename.c filepath.c + hashmap.c hashtable.c idna.c libdom.c log.c messages.c + nscolour.c nsoption.c punycode.c + ssl_certs.c talloc.c time.c url.c @@ -174,7 +203,6 @@ 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/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/resources/netsurf.png') file('share/netsurf/quirks.css', '644', '$srcdir/resources/quirks.css') file('share/netsurf/welcome.html', '644', '$srcdir/resources/en/welcome.html') diff --git a/pkg/netsurf/libcss/src b/pkg/netsurf/libcss/src index ba1d7999..385769d6 160000 --- a/pkg/netsurf/libcss/src +++ b/pkg/netsurf/libcss/src @@ -1 +1 @@ -Subproject commit ba1d79992750773e3decdf485b40b283d81837a9 +Subproject commit 385769d6554d2d3a9c2c35a04cf5dde706cefb6b diff --git a/pkg/netsurf/libcss/ver b/pkg/netsurf/libcss/ver index 96bd60a6..b9651fc4 100644 --- a/pkg/netsurf/libcss/ver +++ b/pkg/netsurf/libcss/ver @@ -1 +1 @@ -0.9.0 r0 +0.9.1 r0 diff --git a/pkg/netsurf/libdom/gen.lua b/pkg/netsurf/libdom/gen.lua index c8a51847..2ef669ce 100644 --- a/pkg/netsurf/libdom/gen.lua +++ b/pkg/netsurf/libdom/gen.lua @@ -38,35 +38,71 @@ lib('libdom.a', [[ ui_event.c mouse_multi_wheel_event.c mutation_name_event.c ) html/( - html_document.c html_collection.c html_options_collection.c - html_element.c html_html_element.c html_head_element.c - html_link_element.c html_title_element.c html_meta_element.c - html_base_element.c html_style_element.c - html_body_element.c html_form_element.c html_select_element.c - html_button_element.c html_input_element.c html_text_area_element.c - html_opt_group_element.c html_option_element.c html_hr_element.c - html_dlist_element.c html_directory_element.c html_menu_element.c - html_fieldset_element.c html_legend_element.c html_div_element.c - html_paragraph_element.c html_heading_element.c html_quote_element.c - html_pre_element.c html_br_element.c html_label_element.c - html_ulist_element.c html_olist_element.c html_li_element.c - html_font_element.c html_mod_element.c html_anchor_element.c - html_basefont_element.c html_image_element.c html_object_element.c - html_param_element.c html_applet_element.c html_area_element.c - html_map_element.c html_script_element.c html_tablecaption_element.c - html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c - html_table_element.c html_tablerow_element.c html_frameset_element.c - html_frame_element.c html_iframe_element.c html_isindex_element.c + html_applet_element.c + html_area_element.c + html_anchor_element.c + html_basefont_element.c + html_base_element.c + html_body_element.c + html_button_element.c + html_canvas_element.c + html_collection.c + html_document.c + html_element.c + html_dlist_element.c + html_directory_element.c + html_options_collection.c + html_html_element.c + html_head_element.c + html_link_element.c + html_title_element.c + html_meta_element.c + html_style_element.c + html_form_element.c + html_select_element.c + html_input_element.c + html_text_area_element.c + html_opt_group_element.c + html_option_element.c + html_hr_element.c + html_menu_element.c + html_fieldset_element.c + html_legend_element.c + html_div_element.c + html_paragraph_element.c + html_heading_element.c + html_quote_element.c + html_pre_element.c + html_br_element.c + html_label_element.c + html_ulist_element.c + html_olist_element.c + html_li_element.c + html_font_element.c + html_mod_element.c + html_image_element.c + html_object_element.c + html_param_element.c + html_map_element.c + html_script_element.c + html_tablecaption_element.c + html_tablecell_element.c + html_tablecol_element.c + html_tablesection_element.c + html_table_element.c + html_tablerow_element.c + html_frameset_element.c + html_frame_element.c + html_iframe_element.c + html_isindex_element.c ) utils/(namespace.c hashtable.c character_valid.c validate.c) ) bindings/hubbub/parser.c bindings/xml/expat_xmlparser.c - $builddir/pkg/( - expat/libexpat.a.d - netsurf/libhubbub/libhubbub.a.d - netsurf/libwapcaplet/libwapcaplet.a - ) + $builddir/pkg/expat/libexpat.a.d + $builddir/pkg/netsurf/libhubbub/libhubbub.a.d + $builddir/pkg/netsurf/libwapcaplet/libwapcaplet.a ]]) fetch 'git' diff --git a/pkg/netsurf/libdom/src b/pkg/netsurf/libdom/src index 3939dbe3..93b8a9bb 160000 --- a/pkg/netsurf/libdom/src +++ b/pkg/netsurf/libdom/src @@ -1 +1 @@ -Subproject commit 3939dbe39d2bd7ef4d34757b3162ac54597d9fba +Subproject commit 93b8a9bba18fc3166dd158484188b1730afdd382 diff --git a/pkg/netsurf/libdom/ver b/pkg/netsurf/libdom/ver index b5f83ec1..a13025c8 100644 --- a/pkg/netsurf/libdom/ver +++ b/pkg/netsurf/libdom/ver @@ -1 +1 @@ -0.4.0 r0 +0.4.1 r0 diff --git a/pkg/netsurf/libhubbub/src b/pkg/netsurf/libhubbub/src index 050c36d4..41b3e0e6 160000 --- a/pkg/netsurf/libhubbub/src +++ b/pkg/netsurf/libhubbub/src @@ -1 +1 @@ -Subproject commit 050c36d483378d52cd8330fd0dcf3dfd4119ec78 +Subproject commit 41b3e0e617cfce96de85d4d031c4d131e3dc4cf4 diff --git a/pkg/netsurf/libhubbub/ver b/pkg/netsurf/libhubbub/ver index 7cd04e59..b59824ca 100644 --- a/pkg/netsurf/libhubbub/ver +++ b/pkg/netsurf/libhubbub/ver @@ -1 +1 @@ -0.3.6 r0 +0.3.7 r0 diff --git a/pkg/netsurf/libnsbmp/src b/pkg/netsurf/libnsbmp/src index b35d554a..3155a7e9 160000 --- a/pkg/netsurf/libnsbmp/src +++ b/pkg/netsurf/libnsbmp/src @@ -1 +1 @@ -Subproject commit b35d554a2d6fb4bd184a8e2364bdf28338236b8d +Subproject commit 3155a7e9db2d7d7c2349a12bc892fa9ff68c2338 diff --git a/pkg/netsurf/libnsbmp/ver b/pkg/netsurf/libnsbmp/ver index 9faa1b7a..c946ee61 100644 --- a/pkg/netsurf/libnsbmp/ver +++ b/pkg/netsurf/libnsbmp/ver @@ -1 +1 @@ -0.1.5 +0.1.6 diff --git a/pkg/netsurf/libnsutils/src b/pkg/netsurf/libnsutils/src index ae5a9650..142a7945 160000 --- a/pkg/netsurf/libnsutils/src +++ b/pkg/netsurf/libnsutils/src @@ -1 +1 @@ -Subproject commit ae5a9650cd01eb096e3c896a0cc467d47269f45d +Subproject commit 142a7945fb9fe477324f8df5e9645ef161042483 diff --git a/pkg/netsurf/libnsutils/ver b/pkg/netsurf/libnsutils/ver index bbdeab62..6e8bf73a 100644 --- a/pkg/netsurf/libnsutils/ver +++ b/pkg/netsurf/libnsutils/ver @@ -1 +1 @@ -0.0.5 +0.1.0 diff --git a/pkg/netsurf/libwapcaplet/patch/0001-Use-static-inline-functions-instead-of-macros.patch b/pkg/netsurf/libwapcaplet/patch/0001-Use-static-inline-functions-instead-of-macros.patch index 482094b3..c294e982 100644 --- a/pkg/netsurf/libwapcaplet/patch/0001-Use-static-inline-functions-instead-of-macros.patch +++ b/pkg/netsurf/libwapcaplet/patch/0001-Use-static-inline-functions-instead-of-macros.patch @@ -1,27 +1,32 @@ -From 9781465ad7e57508b23614d5552b9305e3353fa3 Mon Sep 17 00:00:00 2001 +From f0f43a3ad6ee46d6e6378325fc03b1adadd35c41 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 1 Jul 2019 23:13:26 -0700 Subject: [PATCH] Use static inline functions instead of macros --- - include/libwapcaplet/libwapcaplet.h | 116 ++++++++++++++++------------ - 1 file changed, 67 insertions(+), 49 deletions(-) + include/libwapcaplet/libwapcaplet.h | 102 +++++++++++----------------- + 1 file changed, 39 insertions(+), 63 deletions(-) diff --git a/include/libwapcaplet/libwapcaplet.h b/include/libwapcaplet/libwapcaplet.h -index d8cc841..59ab14c 100644 +index 57e2e48..96dd7aa 100644 --- a/include/libwapcaplet/libwapcaplet.h +++ b/include/libwapcaplet/libwapcaplet.h -@@ -133,7 +133,21 @@ extern lwc_error lwc_string_tolower(lwc_string *str, lwc_string **ret); +@@ -133,17 +133,21 @@ extern lwc_error lwc_string_tolower(lwc_string *str, lwc_string **ret); * @note Use this if copying the string and intending both sides to retain * ownership. */ +-#if defined(STMTEXPR) -#define lwc_string_ref(str) ({lwc_string *__lwc_s = (str); assert(__lwc_s != NULL); __lwc_s->refcnt++; __lwc_s;}) +-#else +-static inline lwc_string * +-lwc_string_ref(lwc_string *str) +static inline lwc_string *lwc_string_ref(lwc_string *str) -+{ -+ assert(str != NULL); -+ str->refcnt++; -+ return str; -+} + { + assert(str != NULL); + str->refcnt++; + return str; + } +-#endif + +/** + * Destroy an unreffed lwc_string. @@ -34,7 +39,7 @@ index d8cc841..59ab14c 100644 /** * Release a reference on an lwc_string. -@@ -146,23 +160,14 @@ extern lwc_error lwc_string_tolower(lwc_string *str, lwc_string **ret); +@@ -156,23 +160,14 @@ lwc_string_ref(lwc_string *str) * freed. (Ref count of 1 where string is its own insensitve match * will also result in the string being freed.) */ @@ -66,7 +71,7 @@ index d8cc841..59ab14c 100644 /** * Check if two interned strings are equal. -@@ -173,35 +178,13 @@ extern void lwc_string_destroy(lwc_string *str); +@@ -183,8 +178,12 @@ extern void lwc_string_destroy(lwc_string *str); * @return Result of operation, if not ok then value pointed to * by \a ret will not be valid. */ @@ -79,15 +84,20 @@ index d8cc841..59ab14c 100644 + return lwc_error_ok; +} --/** -- * Check if two interned strings are case-insensitively equal. -- * -- * @param _str1 The first string in the comparison. -- * @param _str2 The second string in the comparison. -- * @param _ret A pointer to a boolean to be filled out with the result. -- * @return Result of operation, if not ok then value pointed to by \a ret will -- * not be valid. -- */ + /** + * Intern a caseless copy of the passed string. +@@ -200,7 +199,6 @@ extern void lwc_string_destroy(lwc_string *str); + extern lwc_error + lwc__intern_caseless_string(lwc_string *str); + +-#if defined(STMTEXPR) + /** + * Check if two interned strings are case-insensitively equal. + * +@@ -210,33 +208,6 @@ lwc__intern_caseless_string(lwc_string *str); + * @return Result of operation, if not ok then value pointed to by \a ret will + * not be valid. + */ -#define lwc_string_caseless_isequal(_str1,_str2,_ret) ({ \ - lwc_error __lwc_err = lwc_error_ok; \ - lwc_string *__lwc_str1 = (_str1); \ @@ -105,44 +115,38 @@ index d8cc841..59ab14c 100644 - __lwc_err; \ - }) - - /** - * Intern a caseless copy of the passed string. - * -@@ -215,6 +198,29 @@ extern void lwc_string_destroy(lwc_string *str); - */ - extern lwc_error - lwc__intern_caseless_string(lwc_string *str); -+ -+/** -+ * Check if two interned strings are case-insensitively equal. -+ * -+ * @param _str1 The first string in the comparison. -+ * @param _str2 The second string in the comparison. -+ * @param _ret A pointer to a boolean to be filled out with the result. -+ * @return Result of operation, if not ok then value pointed to by \a ret will -+ * not be valid. -+ */ -+static inline lwc_error lwc_string_caseless_isequal( -+ lwc_string *str1, lwc_string *str2, bool *ret) -+{ -+ lwc_error err = lwc_error_ok; -+ -+ if (str1->insensitive == NULL) -+ err = lwc__intern_caseless_string(str1); -+ if (err == lwc_error_ok && str2->insensitive == NULL) -+ err = lwc__intern_caseless_string(str2); -+ if (err == lwc_error_ok) -+ *ret = (str1->insensitive == str2->insensitive); -+ return err; -+} +-#else +-/** +- * Check if two interned strings are case-insensitively equal. +- * +- * @param str1 The first string in the comparison. +- * @param str2 The second string in the comparison. +- * @param ret A pointer to a boolean to be filled out with the result. +- * @return Result of operation, if not ok then value pointed to by \a ret will +- * not be valid. +- */ + static inline lwc_error + lwc_string_caseless_isequal(lwc_string *str1, lwc_string *str2, bool *ret) + { +@@ -251,13 +222,6 @@ lwc_string_caseless_isequal(lwc_string *str1, lwc_string *str2, bool *ret) + *ret = (str1->insensitive == str2->insensitive); + return err; + } +-#endif +- +-#if defined(STMTEXPR) +-#define lwc__assert_and_expr(str, expr) ({assert(str != NULL); expr;}) +-#else +-#define lwc__assert_and_expr(str, expr) (expr) +-#endif /** * Retrieve the data pointer for an interned string. -@@ -228,7 +234,11 @@ lwc__intern_caseless_string(lwc_string *str); +@@ -271,7 +235,11 @@ lwc_string_caseless_isequal(lwc_string *str1, lwc_string *str2, bool *ret) * in future. Any code relying on it currently should be * modified to use ::lwc_string_length if possible. */ --#define lwc_string_data(str) ({assert(str != NULL); (const char *)((str)+1);}) +-#define lwc_string_data(str) lwc__assert_and_expr(str, (const char *)((str)+1)) +static inline const char *lwc_string_data(lwc_string *str) +{ + assert(str != NULL); @@ -151,11 +155,11 @@ index d8cc841..59ab14c 100644 /** * Retrieve the data length for an interned string. -@@ -236,7 +246,11 @@ lwc__intern_caseless_string(lwc_string *str); +@@ -279,7 +247,11 @@ lwc_string_caseless_isequal(lwc_string *str1, lwc_string *str2, bool *ret) * @param str The string to retrieve the length of. * @return The length of \a str. */ --#define lwc_string_length(str) ({assert(str != NULL); (str)->len;}) +-#define lwc_string_length(str) lwc__assert_and_expr(str, (str)->len) +static inline size_t lwc_string_length(lwc_string *str) +{ + assert(str != NULL); @@ -164,11 +168,11 @@ index d8cc841..59ab14c 100644 /** * Retrieve (or compute if unavailable) a hash value for the content of the string. -@@ -250,7 +264,11 @@ lwc__intern_caseless_string(lwc_string *str); +@@ -293,7 +265,11 @@ lwc_string_caseless_isequal(lwc_string *str1, lwc_string *str2, bool *ret) * to be stable between invocations of the program. Never use the hash * value as a way to directly identify the value of the string. */ --#define lwc_string_hash_value(str) ({assert(str != NULL); (str)->hash;}) +-#define lwc_string_hash_value(str) lwc__assert_and_expr(str, (str)->hash) +static inline lwc_hash lwc_string_hash_value(lwc_string *str) +{ + assert(str != NULL); @@ -178,5 +182,5 @@ index d8cc841..59ab14c 100644 /** * Retrieve a hash value for the caseless content of the string. -- -2.22.0 +2.26.2 diff --git a/pkg/netsurf/libwapcaplet/src b/pkg/netsurf/libwapcaplet/src index 130c1dec..b5e42b12 160000 --- a/pkg/netsurf/libwapcaplet/src +++ b/pkg/netsurf/libwapcaplet/src @@ -1 +1 @@ -Subproject commit 130c1dec2842b5a7f1256816b58ea4d41726c950 +Subproject commit b5e42b12211a92339b0b62cb90f1a86a397e146e diff --git a/pkg/netsurf/libwapcaplet/ver b/pkg/netsurf/libwapcaplet/ver index 6052ecdc..0d996695 100644 --- a/pkg/netsurf/libwapcaplet/ver +++ b/pkg/netsurf/libwapcaplet/ver @@ -1 +1 @@ -0.4.2 r0 +0.4.3 r0 diff --git a/pkg/netsurf/src b/pkg/netsurf/src index e63a6fc6..c91eab6f 160000 --- a/pkg/netsurf/src +++ b/pkg/netsurf/src @@ -1 +1 @@ -Subproject commit e63a6fc645f61f9245e2712df61b3a1bb2ff95db +Subproject commit c91eab6f295c6ed5e9dbe9b22098e8831a566959 diff --git a/pkg/netsurf/ver b/pkg/netsurf/ver index 78a1e3e4..0bf8150e 100644 --- a/pkg/netsurf/ver +++ b/pkg/netsurf/ver @@ -1 +1 @@ -3.9 r2 +3.10 r0 -- cgit v1.2.3