June 2019 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch master updated. release/3.8-290-g43f8e77

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/43f8e77df7c36ceaa7b88... ...commit http://git.netsurf-browser.org/netsurf.git/commit/43f8e77df7c36ceaa7b8851... ...tree http://git.netsurf-browser.org/netsurf.git/tree/43f8e77df7c36ceaa7b8851b7... The branch, master has been updated via 43f8e77df7c36ceaa7b8851b779cf81661a686d3 (commit) from 6a53b447e5726bc7d7b8405b1b1dd958c701b007 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=43f8e77df7c36ceaa7b... commit 43f8e77df7c36ceaa7b8851b779cf81661a686d3 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> css/utils.c: Fix vw/vh handling in len2pt We were using integer multiplication rather than fixed-point multiplication when calculating point sizes relative to the viewport. This fixes that. Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org> diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c index cac777c..cf48e89 100644 --- a/content/handlers/css/utils.c +++ b/content/handlers/css/utils.c @@ -117,8 +117,8 @@ css_fixed nscss_len2pt( case CSS_UNIT_PT: return length; /* 1pc = 12pt */ case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12)); - case CSS_UNIT_VH: return FDIV(FMUL(FDIV((length * ctx->vh), F_100), F_72), F_96); - case CSS_UNIT_VW: return FDIV(FMUL(FDIV((length * ctx->vw), F_100), F_72), F_96); + case CSS_UNIT_VH: return FDIV(FMUL(FDIV(FMUL(length, ctx->vh), F_100), F_72), F_96); + case CSS_UNIT_VW: return FDIV(FMUL(FDIV(FMUL(length,ctx->vw), F_100), F_72), F_96); default: break; } ----------------------------------------------------------------------- Summary of changes: content/handlers/css/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c index cac777c..cf48e89 100644 --- a/content/handlers/css/utils.c +++ b/content/handlers/css/utils.c @@ -117,8 +117,8 @@ css_fixed nscss_len2pt( case CSS_UNIT_PT: return length; /* 1pc = 12pt */ case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12)); - case CSS_UNIT_VH: return FDIV(FMUL(FDIV((length * ctx->vh), F_100), F_72), F_96); - case CSS_UNIT_VW: return FDIV(FMUL(FDIV((length * ctx->vw), F_100), F_72), F_96); + case CSS_UNIT_VH: return FDIV(FMUL(FDIV(FMUL(length, ctx->vh), F_100), F_72), F_96); + case CSS_UNIT_VW: return FDIV(FMUL(FDIV(FMUL(length,ctx->vw), F_100), F_72), F_96); default: break; } -- NetSurf Browser

4 years, 2 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-289-g6a53b44

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/6a53b447e5726bc7d7b84... ...commit http://git.netsurf-browser.org/netsurf.git/commit/6a53b447e5726bc7d7b8405... ...tree http://git.netsurf-browser.org/netsurf.git/tree/6a53b447e5726bc7d7b8405b1... The branch, master has been updated via 6a53b447e5726bc7d7b8405b1b1dd958c701b007 (commit) from 1c3ce67c62cccd8a32090e770f0cba62e9945f28 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6a53b447e5726bc7d7b... commit 6a53b447e5726bc7d7b8405b1b1dd958c701b007 Author: Michael Forney <mforney(a)mforney.org> Commit: Vincent Sanders <vince(a)kyllikki.org> Declare global variables as extern in headers Otherwise, each source file that includes the header will create a new definition, which are usually merged together by the linker. Multiple definitions of an object is not allowed in ISO C. diff --git a/frontends/amiga/search.h b/frontends/amiga/search.h index f30352c..1815ef9 100755 --- a/frontends/amiga/search.h +++ b/frontends/amiga/search.h @@ -22,7 +22,7 @@ struct gui_search_table; struct gui_window; -struct gui_search_table *amiga_search_table; +extern struct gui_search_table *amiga_search_table; /** * Change the displayed search status. diff --git a/frontends/atari/bitmap.h b/frontends/atari/bitmap.h index b0fa180..72bad55 100644 --- a/frontends/atari/bitmap.h +++ b/frontends/atari/bitmap.h @@ -54,7 +54,7 @@ */ #define MFDB_SIZE( bpp, stride, h ) ( ((stride >> 3) * h) * bpp ) -struct gui_bitmap_table *atari_bitmap_table; +extern struct gui_bitmap_table *atari_bitmap_table; struct bitmap { int width; diff --git a/frontends/atari/encoding.h b/frontends/atari/encoding.h index 784aa82..53db7b7 100644 --- a/frontends/atari/encoding.h +++ b/frontends/atari/encoding.h @@ -25,7 +25,7 @@ #include "utils/utf8.h" -struct gui_utf8_table *atari_utf8_table; +extern struct gui_utf8_table *atari_utf8_table; nserror utf8_to_local_encoding(const char *string, size_t len, char **result); nserror utf8_from_local_encoding(const char *string, size_t len, char **result); diff --git a/frontends/atari/file.h b/frontends/atari/file.h index b368567..3e56883 100644 --- a/frontends/atari/file.h +++ b/frontends/atari/file.h @@ -21,7 +21,7 @@ #include "utils/file.h" -struct gui_file_table *atari_file_table; +extern struct gui_file_table *atari_file_table; #endif /* FILE_C_INCLUDED */ diff --git a/frontends/atari/font.h b/frontends/atari/font.h index a01d000..c0eb99d 100644 --- a/frontends/atari/font.h +++ b/frontends/atari/font.h @@ -19,7 +19,7 @@ #ifndef NS_ATARI_FONT_H #define NS_ATARI_FONT_H -struct gui_layout_table *atari_layout_table; +extern struct gui_layout_table *atari_layout_table; #endif /* NETSURF_FB_FONT_H */ diff --git a/frontends/atari/search.h b/frontends/atari/search.h index 04dfed4..adac626 100644 --- a/frontends/atari/search.h +++ b/frontends/atari/search.h @@ -43,7 +43,7 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION; struct s_search_form_session * nsatari_search_session_create(OBJECT * obj, struct gui_window *gw); -struct gui_search_table *atari_search_table; +extern struct gui_search_table *atari_search_table; void nsatari_search_session_destroy(struct s_search_form_session *s); void nsatari_search_perform(struct s_search_form_session *s, OBJECT *obj, diff --git a/frontends/framebuffer/fetch.h b/frontends/framebuffer/fetch.h index 718b083..d00f3aa 100644 --- a/frontends/framebuffer/fetch.h +++ b/frontends/framebuffer/fetch.h @@ -20,6 +20,6 @@ #ifndef NETSURF_FB_FETCH_H #define NETSURF_FB_FETCH_H -struct gui_fetch_table *framebuffer_fetch_table; +extern struct gui_fetch_table *framebuffer_fetch_table; #endif diff --git a/frontends/gtk/download.h b/frontends/gtk/download.h index 0b10976..b720650 100644 --- a/frontends/gtk/download.h +++ b/frontends/gtk/download.h @@ -24,7 +24,7 @@ /** * download operation table for gtk */ -struct gui_download_table *nsgtk_download_table; +extern struct gui_download_table *nsgtk_download_table; /** * Initialise download window ready for use. diff --git a/frontends/gtk/fetch.h b/frontends/gtk/fetch.h index a095adb..9175ccd 100644 --- a/frontends/gtk/fetch.h +++ b/frontends/gtk/fetch.h @@ -19,7 +19,7 @@ #ifndef NETSURF_GTK_FETCH_H #define NETSURF_GTK_FETCH_H -struct gui_fetch_table *nsgtk_fetch_table; +extern struct gui_fetch_table *nsgtk_fetch_table; void gtk_fetch_filetype_init(const char *mimefile); void gtk_fetch_filetype_fin(void); diff --git a/frontends/gtk/search.h b/frontends/gtk/search.h index dd8c60d..b2162b8 100644 --- a/frontends/gtk/search.h +++ b/frontends/gtk/search.h @@ -19,7 +19,7 @@ #ifndef _NETSURF_GTK_SEARCH_H_ #define _NETSURF_GTK_SEARCH_H_ -struct gui_search_table *nsgtk_search_table; +extern struct gui_search_table *nsgtk_search_table; struct nsgtk_scaffolding; diff --git a/frontends/gtk/selection.h b/frontends/gtk/selection.h index 6463692..07716a0 100644 --- a/frontends/gtk/selection.h +++ b/frontends/gtk/selection.h @@ -19,6 +19,6 @@ #ifndef GTK_SELECTION_H #define GTK_SELECTION_H -struct gui_clipboard_table *nsgtk_clipboard_table; +extern struct gui_clipboard_table *nsgtk_clipboard_table; #endif diff --git a/frontends/monkey/fetch.h b/frontends/monkey/fetch.h index f146e2e..2881e92 100644 --- a/frontends/monkey/fetch.h +++ b/frontends/monkey/fetch.h @@ -19,6 +19,6 @@ #ifndef NS_MONKEY_FETCH_H #define NS_MONKEY_FETCH_H -struct gui_fetch_table *monkey_fetch_table; +extern struct gui_fetch_table *monkey_fetch_table; #endif /* NS_MONKEY_FETCH_H */ diff --git a/frontends/riscos/bitmap.h b/frontends/riscos/bitmap.h index 3aca30d..f66ebb3 100644 --- a/frontends/riscos/bitmap.h +++ b/frontends/riscos/bitmap.h @@ -25,7 +25,7 @@ struct hlcache_handle; struct bitmap; /** bitmap operations table */ -struct gui_bitmap_table *riscos_bitmap_table; +extern struct gui_bitmap_table *riscos_bitmap_table; /** save with full alpha channel (if not opaque) */ #define BITMAP_SAVE_FULL_ALPHA (1 << 0) diff --git a/frontends/riscos/font.h b/frontends/riscos/font.h index a29bad8..5a82f63 100644 --- a/frontends/riscos/font.h +++ b/frontends/riscos/font.h @@ -26,7 +26,7 @@ #include <rufl.h> struct plot_font_style; -struct gui_layout_table *riscos_layout_table; +extern struct gui_layout_table *riscos_layout_table; /** desktop font, size and style being used */ extern char ro_gui_desktop_font_family[]; diff --git a/frontends/riscos/gui.h b/frontends/riscos/gui.h index 65c85f9..d4ff9ce 100644 --- a/frontends/riscos/gui.h +++ b/frontends/riscos/gui.h @@ -167,7 +167,7 @@ nserror riscos_schedule(int t, void (*callback)(void *p), void *p); /* in search.c */ void ro_gui_search_init(void); void ro_gui_search_prepare(struct browser_window *g); -struct gui_search_table *riscos_search_table; +extern struct gui_search_table *riscos_search_table; /* in print.c */ void ro_gui_print_init(void); diff --git a/frontends/riscos/textselection.h b/frontends/riscos/textselection.h index 400e3dd..0d7cc16 100644 --- a/frontends/riscos/textselection.h +++ b/frontends/riscos/textselection.h @@ -25,7 +25,7 @@ #include "oslib/wimp.h" -struct gui_clipboard_table *riscos_clipboard_table; +extern struct gui_clipboard_table *riscos_clipboard_table; void gui_start_selection(struct gui_window *g); diff --git a/frontends/riscos/ucstables.h b/frontends/riscos/ucstables.h index e5d8382..31db5d8 100644 --- a/frontends/riscos/ucstables.h +++ b/frontends/riscos/ucstables.h @@ -21,7 +21,7 @@ * This is only used if nothing claims Service_International,8 */ -struct gui_utf8_table *riscos_utf8_table; +extern struct gui_utf8_table *riscos_utf8_table; nserror utf8_to_local_encoding(const char *string, size_t len, char **result); nserror utf8_from_local_encoding(const char *string, size_t len, char **result); diff --git a/frontends/windows/bitmap.h b/frontends/windows/bitmap.h index c723159..c57061d 100644 --- a/frontends/windows/bitmap.h +++ b/frontends/windows/bitmap.h @@ -20,7 +20,7 @@ #ifndef _NETSURF_WINDOWS_BITMAP_H_ #define _NETSURF_WINDOWS_BITMAP_H_ -struct gui_bitmap_table *win32_bitmap_table; +extern struct gui_bitmap_table *win32_bitmap_table; struct bitmap { HBITMAP windib; diff --git a/frontends/windows/clipboard.h b/frontends/windows/clipboard.h index c707c24..92f096b 100644 --- a/frontends/windows/clipboard.h +++ b/frontends/windows/clipboard.h @@ -22,6 +22,6 @@ /** * The clipboard operation function table for win32 */ -struct gui_clipboard_table *win32_clipboard_table; +extern struct gui_clipboard_table *win32_clipboard_table; #endif diff --git a/frontends/windows/fetch.h b/frontends/windows/fetch.h index 20984f1..e85402a 100644 --- a/frontends/windows/fetch.h +++ b/frontends/windows/fetch.h @@ -22,7 +22,7 @@ /** * win32 API fetch operation table */ -struct gui_fetch_table *win32_fetch_table; +extern struct gui_fetch_table *win32_fetch_table; /** * Translate resource to win32 resource data. diff --git a/frontends/windows/file.h b/frontends/windows/file.h index 5262dde..19dfba3 100644 --- a/frontends/windows/file.h +++ b/frontends/windows/file.h @@ -24,6 +24,6 @@ #ifndef _NETSURF_WINDOWS_FILE_H_ #define _NETSURF_WINDOWS_FILE_H_ -struct gui_file_table *win32_file_table; +extern struct gui_file_table *win32_file_table; #endif diff --git a/frontends/windows/font.h b/frontends/windows/font.h index ec2c262..8219e4c 100644 --- a/frontends/windows/font.h +++ b/frontends/windows/font.h @@ -35,8 +35,8 @@ struct font_desc { const char *encoding; }; -struct gui_layout_table *win32_layout_table; -struct gui_utf8_table *win32_utf8_table; +extern struct gui_layout_table *win32_layout_table; +extern struct gui_utf8_table *win32_utf8_table; /** * convert from utf-8 to win32 font encoding. diff --git a/utils/file.h b/utils/file.h index 5ee13b5..0282c35 100644 --- a/utils/file.h +++ b/utils/file.h @@ -117,7 +117,7 @@ struct gui_file_table { }; /** Default (posix) file operation table. */ -struct gui_file_table *default_file_table; +extern struct gui_file_table *default_file_table; /** * Generate a path from one or more component elemnts. ----------------------------------------------------------------------- Summary of changes: frontends/amiga/search.h | 2 +- frontends/atari/bitmap.h | 2 +- frontends/atari/encoding.h | 2 +- frontends/atari/file.h | 2 +- frontends/atari/font.h | 2 +- frontends/atari/search.h | 2 +- frontends/framebuffer/fetch.h | 2 +- frontends/gtk/download.h | 2 +- frontends/gtk/fetch.h | 2 +- frontends/gtk/search.h | 2 +- frontends/gtk/selection.h | 2 +- frontends/monkey/fetch.h | 2 +- frontends/riscos/bitmap.h | 2 +- frontends/riscos/font.h | 2 +- frontends/riscos/gui.h | 2 +- frontends/riscos/textselection.h | 2 +- frontends/riscos/ucstables.h | 2 +- frontends/windows/bitmap.h | 2 +- frontends/windows/clipboard.h | 2 +- frontends/windows/fetch.h | 2 +- frontends/windows/file.h | 2 +- frontends/windows/font.h | 4 ++-- utils/file.h | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/frontends/amiga/search.h b/frontends/amiga/search.h index f30352c..1815ef9 100755 --- a/frontends/amiga/search.h +++ b/frontends/amiga/search.h @@ -22,7 +22,7 @@ struct gui_search_table; struct gui_window; -struct gui_search_table *amiga_search_table; +extern struct gui_search_table *amiga_search_table; /** * Change the displayed search status. diff --git a/frontends/atari/bitmap.h b/frontends/atari/bitmap.h index b0fa180..72bad55 100644 --- a/frontends/atari/bitmap.h +++ b/frontends/atari/bitmap.h @@ -54,7 +54,7 @@ */ #define MFDB_SIZE( bpp, stride, h ) ( ((stride >> 3) * h) * bpp ) -struct gui_bitmap_table *atari_bitmap_table; +extern struct gui_bitmap_table *atari_bitmap_table; struct bitmap { int width; diff --git a/frontends/atari/encoding.h b/frontends/atari/encoding.h index 784aa82..53db7b7 100644 --- a/frontends/atari/encoding.h +++ b/frontends/atari/encoding.h @@ -25,7 +25,7 @@ #include "utils/utf8.h" -struct gui_utf8_table *atari_utf8_table; +extern struct gui_utf8_table *atari_utf8_table; nserror utf8_to_local_encoding(const char *string, size_t len, char **result); nserror utf8_from_local_encoding(const char *string, size_t len, char **result); diff --git a/frontends/atari/file.h b/frontends/atari/file.h index b368567..3e56883 100644 --- a/frontends/atari/file.h +++ b/frontends/atari/file.h @@ -21,7 +21,7 @@ #include "utils/file.h" -struct gui_file_table *atari_file_table; +extern struct gui_file_table *atari_file_table; #endif /* FILE_C_INCLUDED */ diff --git a/frontends/atari/font.h b/frontends/atari/font.h index a01d000..c0eb99d 100644 --- a/frontends/atari/font.h +++ b/frontends/atari/font.h @@ -19,7 +19,7 @@ #ifndef NS_ATARI_FONT_H #define NS_ATARI_FONT_H -struct gui_layout_table *atari_layout_table; +extern struct gui_layout_table *atari_layout_table; #endif /* NETSURF_FB_FONT_H */ diff --git a/frontends/atari/search.h b/frontends/atari/search.h index 04dfed4..adac626 100644 --- a/frontends/atari/search.h +++ b/frontends/atari/search.h @@ -43,7 +43,7 @@ typedef struct s_search_form_session * SEARCH_FORM_SESSION; struct s_search_form_session * nsatari_search_session_create(OBJECT * obj, struct gui_window *gw); -struct gui_search_table *atari_search_table; +extern struct gui_search_table *atari_search_table; void nsatari_search_session_destroy(struct s_search_form_session *s); void nsatari_search_perform(struct s_search_form_session *s, OBJECT *obj, diff --git a/frontends/framebuffer/fetch.h b/frontends/framebuffer/fetch.h index 718b083..d00f3aa 100644 --- a/frontends/framebuffer/fetch.h +++ b/frontends/framebuffer/fetch.h @@ -20,6 +20,6 @@ #ifndef NETSURF_FB_FETCH_H #define NETSURF_FB_FETCH_H -struct gui_fetch_table *framebuffer_fetch_table; +extern struct gui_fetch_table *framebuffer_fetch_table; #endif diff --git a/frontends/gtk/download.h b/frontends/gtk/download.h index 0b10976..b720650 100644 --- a/frontends/gtk/download.h +++ b/frontends/gtk/download.h @@ -24,7 +24,7 @@ /** * download operation table for gtk */ -struct gui_download_table *nsgtk_download_table; +extern struct gui_download_table *nsgtk_download_table; /** * Initialise download window ready for use. diff --git a/frontends/gtk/fetch.h b/frontends/gtk/fetch.h index a095adb..9175ccd 100644 --- a/frontends/gtk/fetch.h +++ b/frontends/gtk/fetch.h @@ -19,7 +19,7 @@ #ifndef NETSURF_GTK_FETCH_H #define NETSURF_GTK_FETCH_H -struct gui_fetch_table *nsgtk_fetch_table; +extern struct gui_fetch_table *nsgtk_fetch_table; void gtk_fetch_filetype_init(const char *mimefile); void gtk_fetch_filetype_fin(void); diff --git a/frontends/gtk/search.h b/frontends/gtk/search.h index dd8c60d..b2162b8 100644 --- a/frontends/gtk/search.h +++ b/frontends/gtk/search.h @@ -19,7 +19,7 @@ #ifndef _NETSURF_GTK_SEARCH_H_ #define _NETSURF_GTK_SEARCH_H_ -struct gui_search_table *nsgtk_search_table; +extern struct gui_search_table *nsgtk_search_table; struct nsgtk_scaffolding; diff --git a/frontends/gtk/selection.h b/frontends/gtk/selection.h index 6463692..07716a0 100644 --- a/frontends/gtk/selection.h +++ b/frontends/gtk/selection.h @@ -19,6 +19,6 @@ #ifndef GTK_SELECTION_H #define GTK_SELECTION_H -struct gui_clipboard_table *nsgtk_clipboard_table; +extern struct gui_clipboard_table *nsgtk_clipboard_table; #endif diff --git a/frontends/monkey/fetch.h b/frontends/monkey/fetch.h index f146e2e..2881e92 100644 --- a/frontends/monkey/fetch.h +++ b/frontends/monkey/fetch.h @@ -19,6 +19,6 @@ #ifndef NS_MONKEY_FETCH_H #define NS_MONKEY_FETCH_H -struct gui_fetch_table *monkey_fetch_table; +extern struct gui_fetch_table *monkey_fetch_table; #endif /* NS_MONKEY_FETCH_H */ diff --git a/frontends/riscos/bitmap.h b/frontends/riscos/bitmap.h index 3aca30d..f66ebb3 100644 --- a/frontends/riscos/bitmap.h +++ b/frontends/riscos/bitmap.h @@ -25,7 +25,7 @@ struct hlcache_handle; struct bitmap; /** bitmap operations table */ -struct gui_bitmap_table *riscos_bitmap_table; +extern struct gui_bitmap_table *riscos_bitmap_table; /** save with full alpha channel (if not opaque) */ #define BITMAP_SAVE_FULL_ALPHA (1 << 0) diff --git a/frontends/riscos/font.h b/frontends/riscos/font.h index a29bad8..5a82f63 100644 --- a/frontends/riscos/font.h +++ b/frontends/riscos/font.h @@ -26,7 +26,7 @@ #include <rufl.h> struct plot_font_style; -struct gui_layout_table *riscos_layout_table; +extern struct gui_layout_table *riscos_layout_table; /** desktop font, size and style being used */ extern char ro_gui_desktop_font_family[]; diff --git a/frontends/riscos/gui.h b/frontends/riscos/gui.h index 65c85f9..d4ff9ce 100644 --- a/frontends/riscos/gui.h +++ b/frontends/riscos/gui.h @@ -167,7 +167,7 @@ nserror riscos_schedule(int t, void (*callback)(void *p), void *p); /* in search.c */ void ro_gui_search_init(void); void ro_gui_search_prepare(struct browser_window *g); -struct gui_search_table *riscos_search_table; +extern struct gui_search_table *riscos_search_table; /* in print.c */ void ro_gui_print_init(void); diff --git a/frontends/riscos/textselection.h b/frontends/riscos/textselection.h index 400e3dd..0d7cc16 100644 --- a/frontends/riscos/textselection.h +++ b/frontends/riscos/textselection.h @@ -25,7 +25,7 @@ #include "oslib/wimp.h" -struct gui_clipboard_table *riscos_clipboard_table; +extern struct gui_clipboard_table *riscos_clipboard_table; void gui_start_selection(struct gui_window *g); diff --git a/frontends/riscos/ucstables.h b/frontends/riscos/ucstables.h index e5d8382..31db5d8 100644 --- a/frontends/riscos/ucstables.h +++ b/frontends/riscos/ucstables.h @@ -21,7 +21,7 @@ * This is only used if nothing claims Service_International,8 */ -struct gui_utf8_table *riscos_utf8_table; +extern struct gui_utf8_table *riscos_utf8_table; nserror utf8_to_local_encoding(const char *string, size_t len, char **result); nserror utf8_from_local_encoding(const char *string, size_t len, char **result); diff --git a/frontends/windows/bitmap.h b/frontends/windows/bitmap.h index c723159..c57061d 100644 --- a/frontends/windows/bitmap.h +++ b/frontends/windows/bitmap.h @@ -20,7 +20,7 @@ #ifndef _NETSURF_WINDOWS_BITMAP_H_ #define _NETSURF_WINDOWS_BITMAP_H_ -struct gui_bitmap_table *win32_bitmap_table; +extern struct gui_bitmap_table *win32_bitmap_table; struct bitmap { HBITMAP windib; diff --git a/frontends/windows/clipboard.h b/frontends/windows/clipboard.h index c707c24..92f096b 100644 --- a/frontends/windows/clipboard.h +++ b/frontends/windows/clipboard.h @@ -22,6 +22,6 @@ /** * The clipboard operation function table for win32 */ -struct gui_clipboard_table *win32_clipboard_table; +extern struct gui_clipboard_table *win32_clipboard_table; #endif diff --git a/frontends/windows/fetch.h b/frontends/windows/fetch.h index 20984f1..e85402a 100644 --- a/frontends/windows/fetch.h +++ b/frontends/windows/fetch.h @@ -22,7 +22,7 @@ /** * win32 API fetch operation table */ -struct gui_fetch_table *win32_fetch_table; +extern struct gui_fetch_table *win32_fetch_table; /** * Translate resource to win32 resource data. diff --git a/frontends/windows/file.h b/frontends/windows/file.h index 5262dde..19dfba3 100644 --- a/frontends/windows/file.h +++ b/frontends/windows/file.h @@ -24,6 +24,6 @@ #ifndef _NETSURF_WINDOWS_FILE_H_ #define _NETSURF_WINDOWS_FILE_H_ -struct gui_file_table *win32_file_table; +extern struct gui_file_table *win32_file_table; #endif diff --git a/frontends/windows/font.h b/frontends/windows/font.h index ec2c262..8219e4c 100644 --- a/frontends/windows/font.h +++ b/frontends/windows/font.h @@ -35,8 +35,8 @@ struct font_desc { const char *encoding; }; -struct gui_layout_table *win32_layout_table; -struct gui_utf8_table *win32_utf8_table; +extern struct gui_layout_table *win32_layout_table; +extern struct gui_utf8_table *win32_utf8_table; /** * convert from utf-8 to win32 font encoding. diff --git a/utils/file.h b/utils/file.h index 5ee13b5..0282c35 100644 --- a/utils/file.h +++ b/utils/file.h @@ -117,7 +117,7 @@ struct gui_file_table { }; /** Default (posix) file operation table. */ -struct gui_file_table *default_file_table; +extern struct gui_file_table *default_file_table; /** * Generate a path from one or more component elemnts. -- NetSurf Browser

4 years, 2 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-288-g1c3ce67

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1c3ce67c62cccd8a32090... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1c3ce67c62cccd8a32090e7... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1c3ce67c62cccd8a32090e770... The branch, master has been updated via 1c3ce67c62cccd8a32090e770f0cba62e9945f28 (commit) from ca2cbac232f0d048eadc948e60f91f09471f6ac9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1c3ce67c62cccd8a320... commit 1c3ce67c62cccd8a32090e770f0cba62e9945f28 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> HTML: Viewport width/height in length context are fixed point. diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c index ba80ad1..57f2e42 100644 --- a/content/handlers/html/html.c +++ b/content/handlers/html/html.c @@ -1536,8 +1536,8 @@ static void html_reformat(struct content *c, int width, int height) htmlc->reflowing = true; - htmlc->len_ctx.vw = nscss_pixels_physical_to_css(width); - htmlc->len_ctx.vh = nscss_pixels_physical_to_css(height); + htmlc->len_ctx.vw = nscss_pixels_physical_to_css(INTTOFIX(width)); + htmlc->len_ctx.vh = nscss_pixels_physical_to_css(INTTOFIX(height)); htmlc->len_ctx.root_style = htmlc->layout->style; layout_document(htmlc, width, height); ----------------------------------------------------------------------- Summary of changes: content/handlers/html/html.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c index ba80ad1..57f2e42 100644 --- a/content/handlers/html/html.c +++ b/content/handlers/html/html.c @@ -1536,8 +1536,8 @@ static void html_reformat(struct content *c, int width, int height) htmlc->reflowing = true; - htmlc->len_ctx.vw = nscss_pixels_physical_to_css(width); - htmlc->len_ctx.vh = nscss_pixels_physical_to_css(height); + htmlc->len_ctx.vw = nscss_pixels_physical_to_css(INTTOFIX(width)); + htmlc->len_ctx.vh = nscss_pixels_physical_to_css(INTTOFIX(height)); htmlc->len_ctx.root_style = htmlc->layout->style; layout_document(htmlc, width, height); -- NetSurf Browser

4 years, 2 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-287-gca2cbac

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/ca2cbac232f0d048eadc9... ...commit http://git.netsurf-browser.org/netsurf.git/commit/ca2cbac232f0d048eadc948... ...tree http://git.netsurf-browser.org/netsurf.git/tree/ca2cbac232f0d048eadc948e6... The branch, master has been updated via ca2cbac232f0d048eadc948e60f91f09471f6ac9 (commit) from 4368c4c04268f6528eb8bcc1ff83ee679f6f13bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ca2cbac232f0d048ead... commit ca2cbac232f0d048eadc948e60f91f09471f6ac9 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> fix freetype pkg-config usage in atari frontend diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 125a958..ee493ee 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -33,10 +33,31 @@ endif # non-pkgconfig components -FREETYPE_FONT_CFLAGS := $(shell $(FT2CF) --cflags) -DWITH_FREETYPE_FONT_DRIVER SPIDERMONKEY_CFLAGS := -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE -$(eval $(call feature_enabled,ATARI_FREETYPE_FONT,$(FREETYPE_FONT_CFLAGS),-lfreetype,(Freetype))) +# freetype is optional but older versions do not use pkg-config +ifeq ($(NETSURF_USE_ATARI_FREETYPE_FONT),YES) + NETSURF_USE_FREETYPE2 := AUTO + NETSURF_FEATURE_FREETYPE2_CFLAGS := -DWITH_FREETYPE_FONT_DRIVER + + $(eval $(call pkg_config_find_and_add_enabled,FREETYPE2,freetype2,freetype2)) + + # try and use non pkg-config method + ifeq ($(NETSURF_USE_FREETYPE2),NO) + FREETYPE_CONFIG_EXISTS := $(shell $(FT2CF) --cflags >/dev/null && echo yes) + ifeq ($(FREETYPE_CONFIG_EXISTS),yes) + NETSURF_USE_FREETYPE2 := YES + CFLAGS += $(shell $(FT2CF) --cflags) $(NETSURF_FEATURE_FREETYPE2_CFLAGS) + LDFLAGS += $(shell $(FT2CF) --libs) + $(info FT2.CNFG: freetype2 (freetype2) enabled) + else + $(info FT2.CNFG: freetype2 (freetype2) failed) + $(error Unable to find library for: freetype2) + endif + endif +endif + + $(eval $(call feature_enabled,ATARI_NETSURF_FONT,-DWITH_INTERNAL_FONT_DRIVER,,(Internal Font))) $(eval $(call feature_enabled,ATARI_VDI_FONT,-DWITH_VDI_FONT_DRIVER,,(VDI Font))) $(eval $(call feature_enabled,ATARI_8BPP_SUPPORT,-DWITH_8BPP_SUPPORT,,(Indexed screen format support))) ----------------------------------------------------------------------- Summary of changes: frontends/atari/Makefile | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 125a958..ee493ee 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -33,10 +33,31 @@ endif # non-pkgconfig components -FREETYPE_FONT_CFLAGS := $(shell $(FT2CF) --cflags) -DWITH_FREETYPE_FONT_DRIVER SPIDERMONKEY_CFLAGS := -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE -$(eval $(call feature_enabled,ATARI_FREETYPE_FONT,$(FREETYPE_FONT_CFLAGS),-lfreetype,(Freetype))) +# freetype is optional but older versions do not use pkg-config +ifeq ($(NETSURF_USE_ATARI_FREETYPE_FONT),YES) + NETSURF_USE_FREETYPE2 := AUTO + NETSURF_FEATURE_FREETYPE2_CFLAGS := -DWITH_FREETYPE_FONT_DRIVER + + $(eval $(call pkg_config_find_and_add_enabled,FREETYPE2,freetype2,freetype2)) + + # try and use non pkg-config method + ifeq ($(NETSURF_USE_FREETYPE2),NO) + FREETYPE_CONFIG_EXISTS := $(shell $(FT2CF) --cflags >/dev/null && echo yes) + ifeq ($(FREETYPE_CONFIG_EXISTS),yes) + NETSURF_USE_FREETYPE2 := YES + CFLAGS += $(shell $(FT2CF) --cflags) $(NETSURF_FEATURE_FREETYPE2_CFLAGS) + LDFLAGS += $(shell $(FT2CF) --libs) + $(info FT2.CNFG: freetype2 (freetype2) enabled) + else + $(info FT2.CNFG: freetype2 (freetype2) failed) + $(error Unable to find library for: freetype2) + endif + endif +endif + + $(eval $(call feature_enabled,ATARI_NETSURF_FONT,-DWITH_INTERNAL_FONT_DRIVER,,(Internal Font))) $(eval $(call feature_enabled,ATARI_VDI_FONT,-DWITH_VDI_FONT_DRIVER,,(VDI Font))) $(eval $(call feature_enabled,ATARI_8BPP_SUPPORT,-DWITH_8BPP_SUPPORT,,(Indexed screen format support))) -- NetSurf Browser

4 years, 2 months

1
0
0 / 0

libdom: branch master updated. release/0.3.4-1-ge2b00b3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/e2b00b3f3cb8bd29607cd0... ...commit http://git.netsurf-browser.org/libdom.git/commit/e2b00b3f3cb8bd29607cd082... ...tree http://git.netsurf-browser.org/libdom.git/tree/e2b00b3f3cb8bd29607cd08265... The branch, master has been updated via e2b00b3f3cb8bd29607cd08265312d2bb79b2d9d (commit) from b39698ced94eac2fb4d874ae836484b8ab785883 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=e2b00b3f3cb8bd29607c... commit e2b00b3f3cb8bd29607cd08265312d2bb79b2d9d Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> 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. 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); ----------------------------------------------------------------------- Summary of changes: 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); -- Document Object Model library

4 years, 2 months

1
0
0 / 0

toolchains: branch master updated. 5f1dae2067f165626cde842d5035d714840a72a5

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/5f1dae2067f165626c... ...commit http://git.netsurf-browser.org/toolchains.git/commit/5f1dae2067f165626cde... ...tree http://git.netsurf-browser.org/toolchains.git/tree/5f1dae2067f165626cde84... The branch, master has been updated via 5f1dae2067f165626cde842d5035d714840a72a5 (commit) from 41fa38327c9f58f26ada8834820f9150f2a09519 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=5f1dae2067f16562... commit 5f1dae2067f165626cde842d5035d714840a72a5 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> update SDK upstream library versions diff --git a/sdk/Makefile b/sdk/Makefile index 1a7c643..b826999 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -23,23 +23,36 @@ ifeq ($(GCCSDK_INSTALL_CROSSBIN),) endif # Upstream package versions +# https://zlib.net/ VERSION_ZLIB := 1.2.11 +# https://www.gnu.org/software/libiconv/ VERSION_LIBICONV := 1.15 +# https://laurikari.net/tre/ VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.1.0j -VERSION_LIBPNG := 1.6.36 +# https://www.openssl.org/ +VERSION_OPENSSL := 1.1.0k +# http://www.libpng.org/pub/png/libpng.html +VERSION_LIBPNG := 1.6.37 +# http://libjpeg.sourceforge.net/ VERSION_LIBJPEG := 8d +# https://libjpeg-turbo.org/ +# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.0.2 VERSION_LIBJPEG_TURBO := 1.5.3 +# https://c-ares.haxx.se/ VERSION_LIBCARES := 1.15.0 -VERSION_LIBCURL := 7.64.1 +# https://curl.haxx.se/ +VERSION_LIBCURL := 7.65.1 VERSION_LIBGNURX := 2.5.1 +# http://mission-base.com/peter/source/ VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 -VERSION_LIBEXPAT := 2.2.1 +# https://github.com/libexpat/libexpat +VERSION_LIBEXPAT := 2.2.7 VERSION_LDG := 2.32 VERSION_WINDOM := 2.0.1 VERSION_HERMES := 1.3.3 -VERSION_FREETYPE := 2.7.1 +# https://www.freetype.org/ +VERSION_FREETYPE := 2.9.1 # Path path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH) @@ -132,6 +145,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos) LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" + LIBEXPAT_ENV := LDFLAGS="-lm" endif ifeq ($(SDK_ITEMS),) @@ -472,8 +486,8 @@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2: $(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d mkdir -p $(BUILDDIR)/libexpat cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 - cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared - cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) make install + cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) $(LIBEXPAT_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared + cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) $(LIBEXPAT_ENV) make install touch $@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 ----------------------------------------------------------------------- Summary of changes: sdk/Makefile | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/sdk/Makefile b/sdk/Makefile index 1a7c643..b826999 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -23,23 +23,36 @@ ifeq ($(GCCSDK_INSTALL_CROSSBIN),) endif # Upstream package versions +# https://zlib.net/ VERSION_ZLIB := 1.2.11 +# https://www.gnu.org/software/libiconv/ VERSION_LIBICONV := 1.15 +# https://laurikari.net/tre/ VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.1.0j -VERSION_LIBPNG := 1.6.36 +# https://www.openssl.org/ +VERSION_OPENSSL := 1.1.0k +# http://www.libpng.org/pub/png/libpng.html +VERSION_LIBPNG := 1.6.37 +# http://libjpeg.sourceforge.net/ VERSION_LIBJPEG := 8d +# https://libjpeg-turbo.org/ +# libjpeg turbo have dropped autotools support VERSION_LIBJPEG_TURBO := 2.0.2 VERSION_LIBJPEG_TURBO := 1.5.3 +# https://c-ares.haxx.se/ VERSION_LIBCARES := 1.15.0 -VERSION_LIBCURL := 7.64.1 +# https://curl.haxx.se/ +VERSION_LIBCURL := 7.65.1 VERSION_LIBGNURX := 2.5.1 +# http://mission-base.com/peter/source/ VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 -VERSION_LIBEXPAT := 2.2.1 +# https://github.com/libexpat/libexpat +VERSION_LIBEXPAT := 2.2.7 VERSION_LDG := 2.32 VERSION_WINDOM := 2.0.1 VERSION_HERMES := 1.3.3 -VERSION_FREETYPE := 2.7.1 +# https://www.freetype.org/ +VERSION_FREETYPE := 2.9.1 # Path path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH) @@ -132,6 +145,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos) LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" + LIBEXPAT_ENV := LDFLAGS="-lm" endif ifeq ($(SDK_ITEMS),) @@ -472,8 +486,8 @@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2: $(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d mkdir -p $(BUILDDIR)/libexpat cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 - cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared - cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) make install + cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) $(LIBEXPAT_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared + cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) $(LIBEXPAT_ENV) make install touch $@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 -- Cross-compilation toolchains and environments

4 years, 2 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-286-g4368c4c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/4368c4c04268f6528eb8b... ...commit http://git.netsurf-browser.org/netsurf.git/commit/4368c4c04268f6528eb8bcc... ...tree http://git.netsurf-browser.org/netsurf.git/tree/4368c4c04268f6528eb8bcc1f... The branch, master has been updated via 4368c4c04268f6528eb8bcc1ff83ee679f6f13bf (commit) from a57940a468e7abd65cc2d69d3f8a167b0f4e4dfc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4368c4c04268f6528eb... commit 4368c4c04268f6528eb8bcc1ff83ee679f6f13bf Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> attempt to make monkeyfarmer process exit detection more reliable diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py index b863721..9494343 100644 --- a/test/monkeyfarmer.py +++ b/test/monkeyfarmer.py @@ -64,18 +64,18 @@ class MonkeyFarmer(asyncore.dispatcher): def handle_close(self): # the pipe to the monkey process has closed - # ensure the child process is finished and report the exit self.close() - if self.monkey.poll() is None: - self.monkey.terminate() - self.monkey.wait() - self.lines.insert(0, "GENERIC EXIT {}".format(self.monkey.returncode).encode('utf-8')) def handle_read(self): got = self.recv(8192) if not got: self.deadmonkey = True + # ensure the child process is finished and report the exit + if self.monkey.poll() is None: + self.monkey.terminate() + self.monkey.wait() + self.lines.insert(0, "GENERIC EXIT {}".format(self.monkey.returncode).encode('utf-8')) return self.incoming += got if b"\n" in self.incoming: ----------------------------------------------------------------------- Summary of changes: test/monkeyfarmer.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py index b863721..9494343 100644 --- a/test/monkeyfarmer.py +++ b/test/monkeyfarmer.py @@ -64,18 +64,18 @@ class MonkeyFarmer(asyncore.dispatcher): def handle_close(self): # the pipe to the monkey process has closed - # ensure the child process is finished and report the exit self.close() - if self.monkey.poll() is None: - self.monkey.terminate() - self.monkey.wait() - self.lines.insert(0, "GENERIC EXIT {}".format(self.monkey.returncode).encode('utf-8')) def handle_read(self): got = self.recv(8192) if not got: self.deadmonkey = True + # ensure the child process is finished and report the exit + if self.monkey.poll() is None: + self.monkey.terminate() + self.monkey.wait() + self.lines.insert(0, "GENERIC EXIT {}".format(self.monkey.returncode).encode('utf-8')) return self.incoming += got if b"\n" in self.incoming: -- NetSurf Browser

4 years, 2 months

1
0
0 / 0

libnsfb: annotated tag release/0.2.1 created. release/0.2.1

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsfb.git/shortlog/19c75b3d6620185cd1220... ...commit http://git.netsurf-browser.org/libnsfb.git/commit/19c75b3d6620185cd1220cd... ...tree http://git.netsurf-browser.org/libnsfb.git/tree/19c75b3d6620185cd1220cdb3... The annotated tag, release/0.2.1 has been created at 19c75b3d6620185cd1220cdb34b30676055b685c (tag) tagging ffc7d20558295fea7a9d48352087822575968a0f (commit) replaces release/0.2.0 tagged by Vincent Sanders on Wed Jun 26 21:56:08 2019 +0100 - Log ----------------------------------------------------------------- Official Release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEER2Lxrm9ACEGlKtFtebDHosvZO54FAl0T2+gACgkQebDHosvZ O57H5BAAreCgBJXwLfv7An5399l3sFEarTY+S2MD9IqqPbAqjBNDblsuQevKh5HI a3hac01bmqaIGMgxyEFymaIctiNnFzbM59I6a2qYLvDBrFJoBTQewzA6JtDU95iZ 04tL0xt71oNahJf9BcfKtwtJF49vbAxPQFQjsyWYsyVrd0+QLeNzpiO0iou/tI3J nvPaH3jFRKv+0yeZivQWC2ZbXrB1if8rqMZj7NIy+kUAEzKxtDEFt4GrvOxcti4r vf+eMwbEycj2xL1+c0ISz/Qxa+fMEY6rmai8IC2L2UUl75Kxtox5lKENONgzWdJy JnhKJPL3ouLGwN9iwWghWva8wfsFazfNr2P8OFTWv6UJ3DE8TUCXKmMxzZwRWbUe Brg67IOOwD8UKaENEr8m8VTYUxU8WdJ5ZPGho3X526VCj5SPN+z8O+lbm9LKEgHV t4KoNdhbbpMzblXOaCH7SNUlYnveh5L6OwtWCcV//IGvmsvdHJbc2jqf9Rfg3WCi 4HLk1ux2dnrbBVNLjMd5OLtf4tvUrbMv2S19tW+/3l7KYoya8rRGoQsuSWJW3C9r UmzfAyM1QM5++PTX84mjK7b8CLChOg9KUUhCT2xkAfLFaSdAXVkka/FmvMESsH27 huSFuOF3mXvKQ8J1mmtC7KTPuDJp+Quehzc7CH1AW+fg4bjuZ7E= =pRXQ -----END PGP SIGNATURE----- Vincent Sanders (4): fix compile on freebsd fix dumb typo freebsd uses single underscore byte ordering macro Update Component version for release ----------------------------------------------------------------------- -- NetSurf Framebuffer library

4 years, 2 months

1
0
0 / 0

libnsfb: branch master updated. release/0.2.0-4-gffc7d20

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsfb.git/shortlog/ffc7d20558295fea7a9d4... ...commit http://git.netsurf-browser.org/libnsfb.git/commit/ffc7d20558295fea7a9d483... ...tree http://git.netsurf-browser.org/libnsfb.git/tree/ffc7d20558295fea7a9d48352... The branch, master has been updated via ffc7d20558295fea7a9d48352087822575968a0f (commit) from 71d24289c2826b7af51f3001c25fa824ccd043a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libnsfb.git/commit/?id=ffc7d20558295fea7a9... commit ffc7d20558295fea7a9d48352087822575968a0f Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> Update Component version for release diff --git a/Makefile b/Makefile index 95cb27e..dd6bbac 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # Component settings COMPONENT := nsfb -COMPONENT_VERSION := 0.2.0 +COMPONENT_VERSION := 0.2.1 # Default to a static library COMPONENT_TYPE ?= lib-static ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 95cb27e..dd6bbac 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # Component settings COMPONENT := nsfb -COMPONENT_VERSION := 0.2.0 +COMPONENT_VERSION := 0.2.1 # Default to a static library COMPONENT_TYPE ?= lib-static -- NetSurf Framebuffer library

4 years, 2 months

1
0
0 / 0

nsgenbind: annotated tag release/0.7 created. release/0.7

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/2c51db47c677f9ca972... ...commit http://git.netsurf-browser.org/nsgenbind.git/commit/2c51db47c677f9ca972f6... ...tree http://git.netsurf-browser.org/nsgenbind.git/tree/2c51db47c677f9ca972f604... The annotated tag, release/0.7 has been created at 2c51db47c677f9ca972f604c813090cc897c358d (tag) tagging 81198cd635beb60913d26878ce51c48e9d73c624 (commit) replaces release/0.6 tagged by Vincent Sanders on Wed Jun 26 21:54:50 2019 +0100 - Log ----------------------------------------------------------------- Official Release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEER2Lxrm9ACEGlKtFtebDHosvZO54FAl0T25oACgkQebDHosvZ O54MXRAA2z3CUhUXG+iNzmIc4LBuNa1/kf1iX3QOQDDt1jdVztj58cb3dPO/zX7s uTGIkNoLLsor30BXzLdRoq4qKilYMxQRuFhmIpBgngpMdOUt+lGTqMF15kxQ1T4f Ki/RYB8ZQYK5V4DxaJxT4sRiIDNMPqmh7dCZQC0eFjeIWD8DTKc5kcrtXAlXxj1/ bEcE3wZOgMzmiiqjJKRLO/PZnA2W4ZhkKiPQby9CJxUKBjZCLhl/GjnzQERogFPB yRhWnX6Pjxi2f3/Lf6Fm2LmknrCX7wLA2KFwIX0Z7PA2KILh3mUBdx+XJJbA6nL7 gyUl1XS8702Y6f/jnlpdc9nYC/EFJnjcY51nV9j4z1g1fj5TPlyNdJ+LvNxTLz4r Qc8xwb5RYJM2fd1eNVuhYIZDGntvY2wdejZiEZcMQmSQoVekIBOdhZmA7uQ7+WAk NgDen0v0bJYIAnSN4mPlscTDbfDiMsncuYmSLBxKHRgzLGmhgz8Mdehvr1LAB+/U UOsDrD6VQdYZSnPI25DIsEzAT4P2yXc3rHP5RuEKMsfMKikVqNyWI+dwZvmWX2jw 5jVA1KW72sdX2awDlHyyLWj03qV0QIaeNc3y2oI0LXZd6YLGwGKzkkf7Ha64UZia ba4me/PtuvKvADBmNzhyE7QIeO335AaFrBjMEz3DpgWQ5M9pe14= =zcow -----END PGP SIGNATURE----- Daniel Silverstone (4): DUKKY: Switch to using NSLOG rather than old LOG or JS_LOG duk-libdom: Use PrimaryGlobal for Window to change method private Generate all EventHandler kind outputs When operating on Window event attributes, pass NULL to dukky Samuel Holland (1): Global variable errtxt is defined in two separate files. Vincent Sanders (3): Make file output use a common interface add a mainpage to docs and outstanding todo entries Update Component version for release ----------------------------------------------------------------------- -- NetSurf Generator for JavaScript bindings

4 years, 2 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits June 2019