January 2018 - netsurf-commits - listmaster.pepperfish.net

librufl: branch master updated. release/0.0.4-8-g1a62581

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/librufl.git/shortlog/1a62581accb099cf83c08... ...commit http://git.netsurf-browser.org/librufl.git/commit/1a62581accb099cf83c08de... ...tree http://git.netsurf-browser.org/librufl.git/tree/1a62581accb099cf83c08de9e... The branch, master has been updated via 1a62581accb099cf83c08de9e9f1535d807bebfc (commit) from b75b31437a21604a8f28ae6b5bd9e5cc182d289f (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/librufl.git/commit/?id=1a62581accb099cf83c... commit 1a62581accb099cf83c08de9e9f1535d807bebfc Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> "Old" FontManager: improve Encoding file parser. In a non-Unicode world, a (non-Base) encoding may define glyphs for up to 256 character codes. Ensure that at most 256 Encoding file entries are used (as, otherwise, the character code will overflow). In particular, if symbol fonts created for the Unicode Font Manager (which does not have a 256 character limit for an encoding) are installed on a non-Unicode-capable system, only the first 256 glyphs in the font are accessible although the Encoding file may have more than 256 entries. Note, however, that the first 32 character codes will never be used as they are considered control codes. Thus, at most 224 usable characters may be defined. A further wrinkle is that glyph names may map to multiple Unicode codepoints, thus consuming multiple slots in the unicode map (which itself has a fixed size of 256 entries). Thus, it is technically possible for the unicode map to further limit the number of usable characters in a font to fewer than 224. However, unless the font is particularly baroque, this isn't a problem in the real world, because there are only 12 glyph names which map to more than one Unicode codepoint (they map to 2, each, for a total of 24 unicode map entries, if they're all present). Thus, to run out of space in the unicode map, you'd need a font which defines at least 4 of those glyphs twice (and defines the others once, and also defines known glyphs for every other character code). Fixes #2577. diff --git a/src/rufl_init.c b/src/rufl_init.c index 9c80b0a..8cd0358 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -1011,6 +1011,12 @@ rufl_code rufl_init_scan_font_in_encoding(const char *font_name, rufl_code rufl_init_read_encoding(font_f font, struct rufl_unicode_map *umap) { + enum { + STATE_START, + STATE_COMMENT, + STATE_COLLECT, + } state = STATE_START; + bool emit = false; unsigned int u = 0; unsigned int i = 0; int c; @@ -1035,18 +1041,50 @@ rufl_code rufl_init_read_encoding(font_f font, if (!fp) return rufl_IO_ERROR; - while (!feof(fp) && u != 256) { + while (!feof(fp) && i < 256 && u < 256) { c = fgetc(fp); - if (c == '%') { - /* comment line */ - fgets(s, sizeof s, fp); - } else if (c == '/') { - /* character definition */ - if (i++ < 32) - continue; - n = fscanf(fp, "%100s", s); - if (n != 1) - break; + + if (state == STATE_START) { + if (c == '/') { + n = 0; + state = STATE_COLLECT; + } else if (c <= 0x20) { + /* Consume C0 and space */ + } else { + /* Comment, or garbage */ + state = STATE_COMMENT; + } + } else if (state == STATE_COMMENT) { + /* Consume until the next C0 */ + if (c < 0x20) { + state = STATE_START; + } + } else { + if ((c >= '0' && c <= '9') || + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') || + (c == '.') || (c == '_')) { + /* Printable: append */ + s[n++] = c; + if (n >= sizeof(s)) { + /* Too long: garbage */ + state = STATE_COMMENT; + } + } else if (c > 0x20) { + /* Garbage */ + state = STATE_COMMENT; + } else { + /* C0 or space: done */ + s[n] = '\0'; + if (n != 0) { + emit = true; + } + state = STATE_START; + } + } + + /* Ignore first 32 character codes (these are control chars) */ + if (emit && i > 31 && i < 256 && u < 256) { entry = bsearch(s, rufl_glyph_map, rufl_glyph_map_size, sizeof rufl_glyph_map[0], @@ -1059,13 +1097,18 @@ rufl_code rufl_init_read_encoding(font_f font, for (; strcmp(s, entry->glyph_name) == 0; entry++) { umap->map[u].u = entry->u; - umap->map[u].c = i - 1; + umap->map[u].c = i; u++; if (u == 256) break; } } } + + if (emit) { + i++; + emit = false; + } } if (fclose(fp) == EOF) diff --git a/test/data/Encoding b/test/data/Encoding new file mode 100644 index 0000000..e5b633e --- /dev/null +++ b/test/data/Encoding @@ -0,0 +1,7 @@ +% Encoding file for font 'Allerta' +/ +/x +/w + % xyz abc/y + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space /exclam /quotedbl /.notdef /dollar /percent /ampersand /quotesingle /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one /two /three /four /five /six /seven /eight /nine /colon /semicolon /less /equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash /bracketright /.notdef /.notdef /grave /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u /v /w /x /y /z /.notdef /bar /.notdef /.notdef /.notdef /Euro /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /quoteleft /quoteright /guilsinglleft /guilsinglright /quotedblleft /quotedblright /.notdef /endash /emdash /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space /exclamdown /cent /sterling /currency /yen /.notdef /.notdef /dieresis /.notdef /.notdef /guillemotleft /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /acute /.notdef /.notdef /.notdef /cedilla /.notdef /.notdef /guillemotright /.notdef /.notdef /.notdef /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /.notdef /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring /.notdef /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /.notdef /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis /dotlessi /Lslash /lslash /Scaron /scaron /Ydieresis /Zcaron /zcaron /circumflex /caron /breve /dotaccent /ring /ogonek /tilde /hungarumlaut + ----------------------------------------------------------------------- Summary of changes: src/rufl_init.c | 67 ++++++++++++++++++++++++++++++++++++++++++---------- test/data/Encoding | 7 ++++++ 2 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 test/data/Encoding diff --git a/src/rufl_init.c b/src/rufl_init.c index 9c80b0a..8cd0358 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -1011,6 +1011,12 @@ rufl_code rufl_init_scan_font_in_encoding(const char *font_name, rufl_code rufl_init_read_encoding(font_f font, struct rufl_unicode_map *umap) { + enum { + STATE_START, + STATE_COMMENT, + STATE_COLLECT, + } state = STATE_START; + bool emit = false; unsigned int u = 0; unsigned int i = 0; int c; @@ -1035,18 +1041,50 @@ rufl_code rufl_init_read_encoding(font_f font, if (!fp) return rufl_IO_ERROR; - while (!feof(fp) && u != 256) { + while (!feof(fp) && i < 256 && u < 256) { c = fgetc(fp); - if (c == '%') { - /* comment line */ - fgets(s, sizeof s, fp); - } else if (c == '/') { - /* character definition */ - if (i++ < 32) - continue; - n = fscanf(fp, "%100s", s); - if (n != 1) - break; + + if (state == STATE_START) { + if (c == '/') { + n = 0; + state = STATE_COLLECT; + } else if (c <= 0x20) { + /* Consume C0 and space */ + } else { + /* Comment, or garbage */ + state = STATE_COMMENT; + } + } else if (state == STATE_COMMENT) { + /* Consume until the next C0 */ + if (c < 0x20) { + state = STATE_START; + } + } else { + if ((c >= '0' && c <= '9') || + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') || + (c == '.') || (c == '_')) { + /* Printable: append */ + s[n++] = c; + if (n >= sizeof(s)) { + /* Too long: garbage */ + state = STATE_COMMENT; + } + } else if (c > 0x20) { + /* Garbage */ + state = STATE_COMMENT; + } else { + /* C0 or space: done */ + s[n] = '\0'; + if (n != 0) { + emit = true; + } + state = STATE_START; + } + } + + /* Ignore first 32 character codes (these are control chars) */ + if (emit && i > 31 && i < 256 && u < 256) { entry = bsearch(s, rufl_glyph_map, rufl_glyph_map_size, sizeof rufl_glyph_map[0], @@ -1059,13 +1097,18 @@ rufl_code rufl_init_read_encoding(font_f font, for (; strcmp(s, entry->glyph_name) == 0; entry++) { umap->map[u].u = entry->u; - umap->map[u].c = i - 1; + umap->map[u].c = i; u++; if (u == 256) break; } } } + + if (emit) { + i++; + emit = false; + } } if (fclose(fp) == EOF) diff --git a/test/data/Encoding b/test/data/Encoding new file mode 100644 index 0000000..e5b633e --- /dev/null +++ b/test/data/Encoding @@ -0,0 +1,7 @@ +% Encoding file for font 'Allerta' +/ +/x +/w + % xyz abc/y + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space /exclam /quotedbl /.notdef /dollar /percent /ampersand /quotesingle /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one /two /three /four /five /six /seven /eight /nine /colon /semicolon /less /equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash /bracketright /.notdef /.notdef /grave /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u /v /w /x /y /z /.notdef /bar /.notdef /.notdef /.notdef /Euro /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /quoteleft /quoteright /guilsinglleft /guilsinglright /quotedblleft /quotedblright /.notdef /endash /emdash /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space /exclamdown /cent /sterling /currency /yen /.notdef /.notdef /dieresis /.notdef /.notdef /guillemotleft /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /acute /.notdef /.notdef /.notdef /cedilla /.notdef /.notdef /guillemotright /.notdef /.notdef /.notdef /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /.notdef /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring /.notdef /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /.notdef /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis /dotlessi /Lslash /lslash /Scaron /scaron /Ydieresis /Zcaron /zcaron /circumflex /caron /breve /dotaccent /ring /ogonek /tilde /hungarumlaut + -- RISC OS Unicode Font Library

5 years, 1 month

1
0
0 / 0

librufl: branch master updated. release/0.0.4-7-gb75b314

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/librufl.git/shortlog/b75b31437a21604a8f28a... ...commit http://git.netsurf-browser.org/librufl.git/commit/b75b31437a21604a8f28ae6... ...tree http://git.netsurf-browser.org/librufl.git/tree/b75b31437a21604a8f28ae6b5... The branch, master has been updated via b75b31437a21604a8f28ae6b5bd9e5cc182d289f (commit) from beddccee444de799e271f7388fe480645f43f23b (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/librufl.git/commit/?id=b75b31437a21604a8f2... commit b75b31437a21604a8f28ae6b5bd9e5cc182d289f Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Fix typo diff --git a/src/rufl_init.c b/src/rufl_init.c index f865344..9c80b0a 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -987,7 +987,7 @@ rufl_code rufl_init_scan_font_in_encoding(const char *font_name, if (rufl_fm_error) { LOG("xfont_scan_string(\"%s\", U+%x, ...) (c=%x): 0x%x: %s", - buf, umap->map[i].u,, umap->map[i].c, + buf, umap->map[i].u, umap->map[i].c, rufl_fm_error->errnum, rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; } ----------------------------------------------------------------------- Summary of changes: src/rufl_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rufl_init.c b/src/rufl_init.c index f865344..9c80b0a 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -987,7 +987,7 @@ rufl_code rufl_init_scan_font_in_encoding(const char *font_name, if (rufl_fm_error) { LOG("xfont_scan_string(\"%s\", U+%x, ...) (c=%x): 0x%x: %s", - buf, umap->map[i].u,, umap->map[i].c, + buf, umap->map[i].u, umap->map[i].c, rufl_fm_error->errnum, rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; } -- RISC OS Unicode Font Library

5 years, 1 month

1
0
0 / 0

librufl: branch master updated. release/0.0.4-6-gbeddcce

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/librufl.git/shortlog/beddccee444de799e271f... ...commit http://git.netsurf-browser.org/librufl.git/commit/beddccee444de799e271f73... ...tree http://git.netsurf-browser.org/librufl.git/tree/beddccee444de799e271f7388... The branch, master has been updated via beddccee444de799e271f7388fe480645f43f23b (commit) from 66623d6f17657d77a7d436fa42095424d0a03b8b (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/librufl.git/commit/?id=beddccee444de799e27... commit beddccee444de799e271f7388fe480645f43f23b Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> "Old" FontManager: log character being scanned too. diff --git a/src/rufl_init.c b/src/rufl_init.c index c3ddac3..f865344 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -986,8 +986,8 @@ rufl_code rufl_init_scan_font_in_encoding(const char *font_name, xfont_lose_font(font); if (rufl_fm_error) { - LOG("xfont_scan_string(\"%s\", U+%x, ...): 0x%x: %s", - buf, umap->map[i].u, + LOG("xfont_scan_string(\"%s\", U+%x, ...) (c=%x): 0x%x: %s", + buf, umap->map[i].u,, umap->map[i].c, rufl_fm_error->errnum, rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; } ----------------------------------------------------------------------- Summary of changes: src/rufl_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rufl_init.c b/src/rufl_init.c index c3ddac3..f865344 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -986,8 +986,8 @@ rufl_code rufl_init_scan_font_in_encoding(const char *font_name, xfont_lose_font(font); if (rufl_fm_error) { - LOG("xfont_scan_string(\"%s\", U+%x, ...): 0x%x: %s", - buf, umap->map[i].u, + LOG("xfont_scan_string(\"%s\", U+%x, ...) (c=%x): 0x%x: %s", + buf, umap->map[i].u,, umap->map[i].c, rufl_fm_error->errnum, rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; } -- RISC OS Unicode Font Library

5 years, 1 month

1
0
0 / 0

toolchains: branch chris/gcc6-os3 updated. 4f49273829fe3275c937a836af5aa9f679823b08

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/4f49273829fe3275c9... ...commit http://git.netsurf-browser.org/toolchains.git/commit/4f49273829fe3275c937... ...tree http://git.netsurf-browser.org/toolchains.git/tree/4f49273829fe3275c937a8... The branch, chris/gcc6-os3 has been updated via 4f49273829fe3275c937a836af5aa9f679823b08 (commit) from c94d05177c52fd510dff17269c84caadce626bd9 (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=4f49273829fe3275... commit 4f49273829fe3275c937a836af5aa9f679823b08 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> m68k-amigaos => m68k-unknown-amigaos This function is causing gcc to use ridiculous paths like /opt/netsurf/m68k-unknown-amigaos/cross/m68k-amigaos/clib2/lib//opt/netsurf/m68k-unknown-amigaos/cross/lib/gcc/m68k-unknown-amigaos/6.4.0/../../../../m68k-unknown-amigaos/lib/ncrt0.o which don't work. diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index a727fd3..25088ee 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -9848,7 +9848,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + if (p) + { + p[1] = 0; -+ p = concat(glp, "m68k-amigaos/", NULL); ++ p = concat(glp, "m68k-unknown-amigaos/", NULL); + } + } + } ----------------------------------------------------------------------- Summary of changes: m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index a727fd3..25088ee 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -9848,7 +9848,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + if (p) + { + p[1] = 0; -+ p = concat(glp, "m68k-amigaos/", NULL); ++ p = concat(glp, "m68k-unknown-amigaos/", NULL); + } + } + } -- Cross-compilation toolchains and environments

5 years, 1 month

1
0
0 / 0

librufl: branch master updated. release/0.0.4-5-g66623d6

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/librufl.git/shortlog/66623d6f17657d77a7d43... ...commit http://git.netsurf-browser.org/librufl.git/commit/66623d6f17657d77a7d436f... ...tree http://git.netsurf-browser.org/librufl.git/tree/66623d6f17657d77a7d436fa4... The branch, master has been updated via 66623d6f17657d77a7d436fa42095424d0a03b8b (commit) via f3241e99a07530ef6c67bea4a011d65736649333 (commit) via 30b5997d61f875591460fe0a7feda1b7f04fea66 (commit) from 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce (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/librufl.git/commit/?id=66623d6f17657d77a7d... commit 66623d6f17657d77a7d436fa42095424d0a03b8b Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Fix typo in log message diff --git a/src/rufl_init.c b/src/rufl_init.c index de4c4de..c3ddac3 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -239,7 +239,7 @@ rufl_code rufl_init(void) code = rufl_init_family_menu(); if (code != rufl_OK) { - LOG("rufl_init_substitution_table: 0x%x", code); + LOG("rufl_init_family_menu: 0x%x", code); rufl_quit(); xhourglass_off(); return code; commitdiff http://git.netsurf-browser.org/librufl.git/commit/?id=f3241e99a07530ef6c6... commit f3241e99a07530ef6c67bea4a011d65736649333 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Old FontManager: ignore fonts with no mappings Ordinarily, this shouldn't happen but, if it does, we don't want to pollute the cache with a blank charset for the font (as we'd prefer to rescan the font next time around in case whatever caused it to have no mappings got fixed in the interim). Existing caches containing blank charsets for such fonts will remain untouched -- this is all best effort, so forcing a rescan by bumping the cache version is not worth doing here. diff --git a/src/rufl_init.c b/src/rufl_init.c index f9ff55f..de4c4de 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -877,6 +877,13 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) } } + if (num_umaps == 0) { + /* No mappings found: font is empty or couldn't be found */ + free(umap); + free(charset); + return rufl_OK; + } + /* shrink-wrap */ charset->size = offsetof(struct rufl_character_set, block) + 32 * last_used; commitdiff http://git.netsurf-browser.org/librufl.git/commit/?id=30b5997d61f87559146... commit 30b5997d61f875591460fe0a7feda1b7f04fea66 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Accept FontEncodingNotFound for symbol fonts, too. diff --git a/src/rufl_init.c b/src/rufl_init.c index e37b36f..f9ff55f 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -861,9 +861,11 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) /* Not finding the font isn't fatal */ if (code != rufl_FONT_MANAGER_ERROR || (rufl_fm_error->errnum != - error_FONT_NOT_FOUND && + error_FONT_NOT_FOUND && + rufl_fm_error->errnum != + error_FILE_NOT_FOUND && rufl_fm_error->errnum != - error_FILE_NOT_FOUND)) { + error_FONT_ENCODING_NOT_FOUND)) { free(charset); for (i = 0; i < num_umaps; i++) free((umap + i)->encoding); ----------------------------------------------------------------------- Summary of changes: src/rufl_init.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/rufl_init.c b/src/rufl_init.c index e37b36f..c3ddac3 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -239,7 +239,7 @@ rufl_code rufl_init(void) code = rufl_init_family_menu(); if (code != rufl_OK) { - LOG("rufl_init_substitution_table: 0x%x", code); + LOG("rufl_init_family_menu: 0x%x", code); rufl_quit(); xhourglass_off(); return code; @@ -861,9 +861,11 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) /* Not finding the font isn't fatal */ if (code != rufl_FONT_MANAGER_ERROR || (rufl_fm_error->errnum != - error_FONT_NOT_FOUND && + error_FONT_NOT_FOUND && + rufl_fm_error->errnum != + error_FILE_NOT_FOUND && rufl_fm_error->errnum != - error_FILE_NOT_FOUND)) { + error_FONT_ENCODING_NOT_FOUND)) { free(charset); for (i = 0; i < num_umaps; i++) free((umap + i)->encoding); @@ -875,6 +877,13 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) } } + if (num_umaps == 0) { + /* No mappings found: font is empty or couldn't be found */ + free(umap); + free(charset); + return rufl_OK; + } + /* shrink-wrap */ charset->size = offsetof(struct rufl_character_set, block) + 32 * last_used; -- RISC OS Unicode Font Library

5 years, 1 month

1
0
0 / 0

librufl: branch master updated. release/0.0.4-2-g8b5ee93

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/librufl.git/shortlog/8b5ee930f2b3ff52ef7bf... ...commit http://git.netsurf-browser.org/librufl.git/commit/8b5ee930f2b3ff52ef7bfee... ...tree http://git.netsurf-browser.org/librufl.git/tree/8b5ee930f2b3ff52ef7bfee65... The branch, master has been updated via 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce (commit) from 34730bbeca0e9eba305102f0b2911cff16b57509 (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/librufl.git/commit/?id=8b5ee930f2b3ff52ef7... commit 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Tolerate FontEncodingNotFound from "old" FM. Additionally, log the FontManager version. diff --git a/src/rufl_init.c b/src/rufl_init.c index aed3886..e37b36f 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -151,9 +151,6 @@ rufl_code rufl_init(void) xfont_lose_font(font); } - LOG("%s font manager%s", - rufl_old_font_manager ? "old" : "new", - rufl_broken_font_enumerate_characters ? " (broken fec)" : ""); /* test if the font manager supports background blending */ rufl_fm_error = xfont_cache_addr(&fm_version, 0, 0); @@ -166,6 +163,11 @@ rufl_code rufl_init(void) if (fm_version >= 335) rufl_can_background_blend = true; + LOG("%s font manager (v %d.%d)%s", + rufl_old_font_manager ? "old" : "new", + fm_version / 100, fm_version % 100, + rufl_broken_font_enumerate_characters ? " (broken fec)" : ""); + code = rufl_init_font_list(); if (code != rufl_OK) { LOG("rufl_init_font_list: 0x%x", code); @@ -795,9 +797,11 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) /* Not finding the font isn't fatal */ if (code != rufl_FONT_MANAGER_ERROR || (rufl_fm_error->errnum != - error_FONT_NOT_FOUND && + error_FONT_NOT_FOUND && rufl_fm_error->errnum != - error_FILE_NOT_FOUND)) { + error_FILE_NOT_FOUND && + rufl_fm_error->errnum != + error_FONT_ENCODING_NOT_FOUND)) { free(charset); for (i = 0; i < num_umaps; i++) free((umap + i)->encoding); ----------------------------------------------------------------------- Summary of changes: src/rufl_init.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/rufl_init.c b/src/rufl_init.c index aed3886..e37b36f 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -151,9 +151,6 @@ rufl_code rufl_init(void) xfont_lose_font(font); } - LOG("%s font manager%s", - rufl_old_font_manager ? "old" : "new", - rufl_broken_font_enumerate_characters ? " (broken fec)" : ""); /* test if the font manager supports background blending */ rufl_fm_error = xfont_cache_addr(&fm_version, 0, 0); @@ -166,6 +163,11 @@ rufl_code rufl_init(void) if (fm_version >= 335) rufl_can_background_blend = true; + LOG("%s font manager (v %d.%d)%s", + rufl_old_font_manager ? "old" : "new", + fm_version / 100, fm_version % 100, + rufl_broken_font_enumerate_characters ? " (broken fec)" : ""); + code = rufl_init_font_list(); if (code != rufl_OK) { LOG("rufl_init_font_list: 0x%x", code); @@ -795,9 +797,11 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) /* Not finding the font isn't fatal */ if (code != rufl_FONT_MANAGER_ERROR || (rufl_fm_error->errnum != - error_FONT_NOT_FOUND && + error_FONT_NOT_FOUND && rufl_fm_error->errnum != - error_FILE_NOT_FOUND)) { + error_FILE_NOT_FOUND && + rufl_fm_error->errnum != + error_FONT_ENCODING_NOT_FOUND)) { free(charset); for (i = 0; i < num_umaps; i++) free((umap + i)->encoding); -- RISC OS Unicode Font Library

5 years, 1 month

1
0
0 / 0

toolchains: branch chris/gcc6-os3 updated. c94d05177c52fd510dff17269c84caadce626bd9

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/c94d05177c52fd510d... ...commit http://git.netsurf-browser.org/toolchains.git/commit/c94d05177c52fd510dff... ...tree http://git.netsurf-browser.org/toolchains.git/tree/c94d05177c52fd510dff17... The branch, chris/gcc6-os3 has been updated via c94d05177c52fd510dff17269c84caadce626bd9 (commit) via 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6 (commit) via aa2ab120411cb6db9f19af7469576239a4e98a9c (commit) via 9754ee0f2a14dbcbb5fe9eac33519a0afd516163 (commit) via 64f3c0b0b1f62a19080d88117b4981c775218e14 (commit) via e31690436647c2c2b32cc154127015fb6034607a (commit) from 7b6bafd386a75887df7d5bcacc5b2cc3f0147bc6 (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=c94d05177c52fd51... commit c94d05177c52fd510dff17269c84caadce626bd9 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Revert "Try to fix some paths" This reverts commit 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6. diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index 6664a04..a727fd3 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -5861,7 +5861,7 @@ index bf3f32da08ac..7aa190620911 100644 ;; +m68k*-*-amigaosvasm*) + default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h" ++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" + tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_AMIGAOS_VASM TARGET_CPU_DEFAULT=0" + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" + tm_p_file="${tm_p_file} m68k/amigaos-protos.h" @@ -5871,7 +5871,7 @@ index bf3f32da08ac..7aa190620911 100644 + ;; +m68k*-*-amigaos*) + default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h" ++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" + tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_CPU_DEFAULT=0" + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" + tm_p_file="${tm_p_file} m68k/amigaos-protos.h" @@ -8687,7 +8687,7 @@ index 000000000000..3f3aafc5f254 + "-isystem %:sdk_root(libnix/include) " \ + "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix" +#define CPP_CLIB2_SPEC \ -+ "-isystem %:sdk_root(include) " \ ++ "-isystem %:sdk_root(clib2/include) " \ + "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2" + +/* Define __HAVE_68881__ in preprocessor according to the -m flags. @@ -8774,7 +8774,7 @@ index 000000000000..3f3aafc5f254 + ")" + +#define STARTFILE_CLIB2_SPEC \ -+ "%:sdk_root(lib/ " \ ++ "%:sdk_root(clib2/lib/ " \ + "%{resident32:nr32crt0.o%s}" \ + "%{!resident32:" \ + "%{fbaserel32:nb32crt0.o%s}" \ @@ -8871,7 +8871,7 @@ index 000000000000..3f3aafc5f254 + +#define LINK_IXEMUL_SPEC "" +#define LINK_LIBNIX_SPEC "-L%:sdk_root(libnix/lib) -fl libnix" -+#define LINK_CLIB2_SPEC "-L%:sdk_root(lib)" ++#define LINK_CLIB2_SPEC "-L%:sdk_root(clib2/lib)" + +/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD + compatible debug hunk. @@ -9833,7 +9833,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 +#ifdef TARGET_AMIGA +const char * amiga_m68k_prefix_func(int argc, const char ** argv) { + char * p = 0; -+ /* if (standard_libexec_prefix) ++ if (standard_libexec_prefix) + { + char * glp = concat(standard_libexec_prefix, "", NULL); + p = strrchr(glp, '/'); @@ -9848,12 +9848,12 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + if (p) + { + p[1] = 0; -+ p = concat(glp, "m68k-unknown-amigaos/", NULL); ++ p = concat(glp, "m68k-amigaos/", NULL); + } + } + } + free(glp); -+ }*/ ++ } + if (!p) + p = concat("../../../../", "", NULL); + @@ -9862,7 +9862,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + free(p); + p = q; + } -+ //*p = 0; ++// printf("amiga_m68k_prefix_func='%s'\n", p); + return p; +} +#endif commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=69e959540abcdd8c... commit 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Try to fix some paths Revert back to the old amigaos.h file diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index a727fd3..6664a04 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -5861,7 +5861,7 @@ index bf3f32da08ac..7aa190620911 100644 ;; +m68k*-*-amigaosvasm*) + default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" ++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h" + tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_AMIGAOS_VASM TARGET_CPU_DEFAULT=0" + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" + tm_p_file="${tm_p_file} m68k/amigaos-protos.h" @@ -5871,7 +5871,7 @@ index bf3f32da08ac..7aa190620911 100644 + ;; +m68k*-*-amigaos*) + default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" ++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h" + tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_CPU_DEFAULT=0" + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" + tm_p_file="${tm_p_file} m68k/amigaos-protos.h" @@ -8687,7 +8687,7 @@ index 000000000000..3f3aafc5f254 + "-isystem %:sdk_root(libnix/include) " \ + "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix" +#define CPP_CLIB2_SPEC \ -+ "-isystem %:sdk_root(clib2/include) " \ ++ "-isystem %:sdk_root(include) " \ + "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2" + +/* Define __HAVE_68881__ in preprocessor according to the -m flags. @@ -8774,7 +8774,7 @@ index 000000000000..3f3aafc5f254 + ")" + +#define STARTFILE_CLIB2_SPEC \ -+ "%:sdk_root(clib2/lib/ " \ ++ "%:sdk_root(lib/ " \ + "%{resident32:nr32crt0.o%s}" \ + "%{!resident32:" \ + "%{fbaserel32:nb32crt0.o%s}" \ @@ -8871,7 +8871,7 @@ index 000000000000..3f3aafc5f254 + +#define LINK_IXEMUL_SPEC "" +#define LINK_LIBNIX_SPEC "-L%:sdk_root(libnix/lib) -fl libnix" -+#define LINK_CLIB2_SPEC "-L%:sdk_root(clib2/lib)" ++#define LINK_CLIB2_SPEC "-L%:sdk_root(lib)" + +/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD + compatible debug hunk. @@ -9833,7 +9833,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 +#ifdef TARGET_AMIGA +const char * amiga_m68k_prefix_func(int argc, const char ** argv) { + char * p = 0; -+ if (standard_libexec_prefix) ++ /* if (standard_libexec_prefix) + { + char * glp = concat(standard_libexec_prefix, "", NULL); + p = strrchr(glp, '/'); @@ -9848,12 +9848,12 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + if (p) + { + p[1] = 0; -+ p = concat(glp, "m68k-amigaos/", NULL); ++ p = concat(glp, "m68k-unknown-amigaos/", NULL); + } + } + } + free(glp); -+ } ++ }*/ + if (!p) + p = concat("../../../../", "", NULL); + @@ -9862,7 +9862,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + free(p); + p = q; + } -+// printf("amiga_m68k_prefix_func='%s'\n", p); ++ //*p = 0; + return p; +} +#endif commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=aa2ab120411cb6db... commit aa2ab120411cb6db9f19af7469576239a4e98a9c Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Revert removal of path code diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index 86e283b..a727fd3 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -8848,7 +8848,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(lib_libnix)} " \ + "%{mcrt=ixemul:%(lib_ixemul)} " \ + "%{mcrt=clib2:%(lib_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(lib_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(lib_clib2)}}" +#endif + +#define LIBGCC_IXEMUL_SPEC "" @@ -8975,10 +8975,10 @@ index 000000000000..3f3aafc5f254 + "%{T*} }}}}}} " +#endif + -+/*extern const char * amiga_m68k_prefix_func(int, const char **);*/ ++extern const char * amiga_m68k_prefix_func(int, const char **); + -+/*#define EXTRA_SPEC_FUNCTIONS \ -+ { "sdk_root", amiga_m68k_prefix_func },*/ ++#define EXTRA_SPEC_FUNCTIONS \ ++ { "sdk_root", amiga_m68k_prefix_func }, + +/* This macro defines names of additional specifications to put in the specs + that can be used in various specifications like CC1_SPEC. Its definition @@ -9821,6 +9821,51 @@ index 6942a504127f..ebe3e1c37121 100644 #include "stringpool.h" #include "expmed.h" #include "optabs.h" +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 85ea19bd3a09..a4da7d515ce5 100644 +--- gcc/gcc.c ++++ gcc/gcc.c +@@ -10107,3 +10107,40 @@ driver_get_configure_time_options (void (*cb) (const char *option, + obstack_free (&obstack, NULL); + n_switches = 0; + } ++ ++#ifdef TARGET_AMIGA ++const char * amiga_m68k_prefix_func(int argc, const char ** argv) { ++ char * p = 0; ++ if (standard_libexec_prefix) ++ { ++ char * glp = concat(standard_libexec_prefix, "", NULL); ++ p = strrchr(glp, '/'); ++ if (p) ++ { ++ *p = 0; ++ p = strrchr(glp, '/'); ++ if (p) ++ { ++ *p = 0; ++ p = strrchr(glp, '/'); ++ if (p) ++ { ++ p[1] = 0; ++ p = concat(glp, "m68k-amigaos/", NULL); ++ } ++ } ++ } ++ free(glp); ++ } ++ if (!p) ++ p = concat("../../../../", "", NULL); ++ ++ for (int i = 0; i < argc; ++i) { ++ char * q = concat(p, argv[i], NULL); ++ free(p); ++ p = q; ++ } ++// printf("amiga_m68k_prefix_func='%s'\n", p); ++ return p; ++} ++#endif diff --git a/gcc/gcse.c b/gcc/gcse.c index 5b2c96ecb5a6..f74e733f9337 100644 --- gcc/gcse.c commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=9754ee0f2a14dbcb... commit 9754ee0f2a14dbcbb5fe9eac33519a0afd516163 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Remove EXTRA_SPECS_FUNCTIONS diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index 956c635..86e283b 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -8975,10 +8975,10 @@ index 000000000000..3f3aafc5f254 + "%{T*} }}}}}} " +#endif + -+extern const char * amiga_m68k_prefix_func(int, const char **); ++/*extern const char * amiga_m68k_prefix_func(int, const char **);*/ + -+#define EXTRA_SPEC_FUNCTIONS \ -+ { "sdk_root", amiga_m68k_prefix_func }, ++/*#define EXTRA_SPEC_FUNCTIONS \ ++ { "sdk_root", amiga_m68k_prefix_func },*/ + +/* This macro defines names of additional specifications to put in the specs + that can be used in various specifications like CC1_SPEC. Its definition commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=64f3c0b0b1f62a19... commit 64f3c0b0b1f62a19080d88117b4981c775218e14 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Attempt to default to clib2 diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index bac72b5..956c635 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -8717,7 +8717,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(cpp_libnix)} " \ + "%{mcrt=ixemul:%(cpp_ixemul)} " \ + "%{mcrt=clib2:%(cpp_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(cpp_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(cpp_clib2)}}" + +/* Various -m flags require special flags to the assembler. */ + @@ -8795,7 +8795,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(startfile_libnix)} " \ + "%{mcrt=ixemul:%(startfile_ixemul)} " \ + "%{mcrt=clib2:%(startfile_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(startfile_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(startfile_clib2)}}" +#endif + +#define ENDFILE_IXEMUL_SPEC "" @@ -8808,7 +8808,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(endfile_libnix)} " \ + "%{mcrt=ixemul:%(endfile_ixemul)} " \ + "%{mcrt=clib2:%(endfile_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(endfile_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(endfile_clib2)}}" + + +/* Automatically search libamiga.a for AmigaOS specific functions. Note @@ -8861,7 +8861,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(libgcc_libnix)} " \ + "%{mcrt=ixemul:%(libgcc_ixemul)} " \ + "%{mcrt=clib2:%(libgcc_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(libgcc_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(libgcc_clib2)}}" + + +/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD @@ -8884,7 +8884,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(link_libnix)} " \ + "%{mcrt=ixemul:%(link_ixemul)} " \ + "%{mcrt=clib2:%(link_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \ ++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \ + "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ + "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \ + "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ @@ -8904,7 +8904,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(link_libnix)} " \ + "%{mcrt=ixemul:%(link_ixemul)} " \ + "%{mcrt=clib2:%(link_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \ ++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \ + "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ + "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \ + "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=e31690436647c2c2... commit e31690436647c2c2b32cc154127015fb6034607a Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Update libs to same as we are using for ppc-amigaos toolchain Remove a patch that was giving us incorrect paths diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 89b9139..8a54b86 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -12,18 +12,18 @@ UPSTREAM_BINUTILS_VERSION := 2.14 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION) UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTI... -UPSTREAM_GMP_VERSION := 4.3.2 +UPSTREAM_GMP_VERSION := 6.1.2 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) # Would use 3.0.0, but that dislikes in-tree gmp sources -UPSTREAM_MPFR_VERSION := 2.4.2 +UPSTREAM_MPFR_VERSION := 3.1.6 UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2 UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL) -UPSTREAM_MPC_VERSION := 0.8.2 +UPSTREAM_MPC_VERSION := 1.0.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz -UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL) +UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL) UPSTREAM_CLIB2_VERSION := 1_214 UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index 8b4d30c..bac72b5 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -9821,51 +9821,6 @@ index 6942a504127f..ebe3e1c37121 100644 #include "stringpool.h" #include "expmed.h" #include "optabs.h" -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 85ea19bd3a09..a4da7d515ce5 100644 ---- gcc/gcc.c -+++ gcc/gcc.c -@@ -10107,3 +10107,40 @@ driver_get_configure_time_options (void (*cb) (const char *option, - obstack_free (&obstack, NULL); - n_switches = 0; - } -+ -+#ifdef TARGET_AMIGA -+const char * amiga_m68k_prefix_func(int argc, const char ** argv) { -+ char * p = 0; -+ if (standard_libexec_prefix) -+ { -+ char * glp = concat(standard_libexec_prefix, "", NULL); -+ p = strrchr(glp, '/'); -+ if (p) -+ { -+ *p = 0; -+ p = strrchr(glp, '/'); -+ if (p) -+ { -+ *p = 0; -+ p = strrchr(glp, '/'); -+ if (p) -+ { -+ p[1] = 0; -+ p = concat(glp, "m68k-amigaos/", NULL); -+ } -+ } -+ } -+ free(glp); -+ } -+ if (!p) -+ p = concat("../../../../", "", NULL); -+ -+ for (int i = 0; i < argc; ++i) { -+ char * q = concat(p, argv[i], NULL); -+ free(p); -+ p = q; -+ } -+// printf("amiga_m68k_prefix_func='%s'\n", p); -+ return p; -+} -+#endif diff --git a/gcc/gcse.c b/gcc/gcse.c index 5b2c96ecb5a6..f74e733f9337 100644 --- gcc/gcse.c ----------------------------------------------------------------------- Summary of changes: m68k-unknown-amigaos/Makefile | 8 ++++---- m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 89b9139..8a54b86 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -12,18 +12,18 @@ UPSTREAM_BINUTILS_VERSION := 2.14 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION) UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTI... -UPSTREAM_GMP_VERSION := 4.3.2 +UPSTREAM_GMP_VERSION := 6.1.2 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) # Would use 3.0.0, but that dislikes in-tree gmp sources -UPSTREAM_MPFR_VERSION := 2.4.2 +UPSTREAM_MPFR_VERSION := 3.1.6 UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2 UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL) -UPSTREAM_MPC_VERSION := 0.8.2 +UPSTREAM_MPC_VERSION := 1.0.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz -UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL) +UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL) UPSTREAM_CLIB2_VERSION := 1_214 UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index 8b4d30c..a727fd3 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -8717,7 +8717,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(cpp_libnix)} " \ + "%{mcrt=ixemul:%(cpp_ixemul)} " \ + "%{mcrt=clib2:%(cpp_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(cpp_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(cpp_clib2)}}" + +/* Various -m flags require special flags to the assembler. */ + @@ -8795,7 +8795,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(startfile_libnix)} " \ + "%{mcrt=ixemul:%(startfile_ixemul)} " \ + "%{mcrt=clib2:%(startfile_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(startfile_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(startfile_clib2)}}" +#endif + +#define ENDFILE_IXEMUL_SPEC "" @@ -8808,7 +8808,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(endfile_libnix)} " \ + "%{mcrt=ixemul:%(endfile_ixemul)} " \ + "%{mcrt=clib2:%(endfile_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(endfile_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(endfile_clib2)}}" + + +/* Automatically search libamiga.a for AmigaOS specific functions. Note @@ -8848,7 +8848,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(lib_libnix)} " \ + "%{mcrt=ixemul:%(lib_ixemul)} " \ + "%{mcrt=clib2:%(lib_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(lib_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(lib_clib2)}}" +#endif + +#define LIBGCC_IXEMUL_SPEC "" @@ -8861,7 +8861,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(libgcc_libnix)} " \ + "%{mcrt=ixemul:%(libgcc_ixemul)} " \ + "%{mcrt=clib2:%(libgcc_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(libgcc_libnix)}}" ++ "%{!noixemul:%{!mcrt*:%(libgcc_clib2)}}" + + +/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD @@ -8884,7 +8884,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(link_libnix)} " \ + "%{mcrt=ixemul:%(link_ixemul)} " \ + "%{mcrt=clib2:%(link_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \ ++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \ + "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ + "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \ + "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ @@ -8904,7 +8904,7 @@ index 000000000000..3f3aafc5f254 + "%{mcrt=nix*:%(link_libnix)} " \ + "%{mcrt=ixemul:%(link_ixemul)} " \ + "%{mcrt=clib2:%(link_clib2)} " \ -+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \ ++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \ + "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ + "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \ + "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ -- Cross-compilation toolchains and environments

5 years, 1 month

1
0
0 / 0

netsurf-wiki: branch master updated. cff988a4f7fd0a24954d9cc7f1661d4f0e5091f7

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/cff988a4f7fd0a24... ...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/cff988a4f7fd0a2495... ...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/cff988a4f7fd0a24954d... The branch, master has been updated via cff988a4f7fd0a24954d9cc7f1661d4f0e5091f7 (commit) from df71fb3b4c23b83598bc4346cc5063542b71a6c0 (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-wiki.git/commit/?id=cff988a4f7fd0a... commit cff988a4f7fd0a24954d9cc7f1661d4f0e5091f7 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Final bits for devday diff --git a/developer-weekend/jan-2018.mdwn b/developer-weekend/jan-2018.mdwn index 9d30bda..d328375 100644 --- a/developer-weekend/jan-2018.mdwn +++ b/developer-weekend/jan-2018.mdwn @@ -37,6 +37,7 @@ Daniel * Began creation of `HTMLFormControlsCollection` and `RadioNodeList` for libdom. * Reached a stopping point on that, asked jmb to review. +* Daniel read a lot about forms Michael ------- @@ -44,6 +45,7 @@ Michael * Helped John-Mark with `#2534` * Fixed layout crash `#2561` * Added LibNSLog support to LibCSS, currently on a branch. +* Fixed some warnings in the framebuffer frontend John-Mark --------- @@ -58,12 +60,15 @@ John-Mark * Bison-related insanity in `nsgenbind` * Fixed issue with clicking _back_ on newly minted browser windows. * Also flex-related warning fix in `libnslog` +* RuFL logging enablement and verbosity +* Also closed `#2266` Vincent Sanders --------------- * Much work on `libnspdf` * CI +* Discussion of Omnibox. Frontends ========= ----------------------------------------------------------------------- Summary of changes: developer-weekend/jan-2018.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/developer-weekend/jan-2018.mdwn b/developer-weekend/jan-2018.mdwn index 9d30bda..d328375 100644 --- a/developer-weekend/jan-2018.mdwn +++ b/developer-weekend/jan-2018.mdwn @@ -37,6 +37,7 @@ Daniel * Began creation of `HTMLFormControlsCollection` and `RadioNodeList` for libdom. * Reached a stopping point on that, asked jmb to review. +* Daniel read a lot about forms Michael ------- @@ -44,6 +45,7 @@ Michael * Helped John-Mark with `#2534` * Fixed layout crash `#2561` * Added LibNSLog support to LibCSS, currently on a branch. +* Fixed some warnings in the framebuffer frontend John-Mark --------- @@ -58,12 +60,15 @@ John-Mark * Bison-related insanity in `nsgenbind` * Fixed issue with clicking _back_ on newly minted browser windows. * Also flex-related warning fix in `libnslog` +* RuFL logging enablement and verbosity +* Also closed `#2266` Vincent Sanders --------------- * Much work on `libnspdf` * CI +* Discussion of Omnibox. Frontends ========= -- NetSurf Developer Wiki Backing Store

5 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.7-56-g89baae1

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/89baae16b47fad0dcb504... ...commit http://git.netsurf-browser.org/netsurf.git/commit/89baae16b47fad0dcb50402... ...tree http://git.netsurf-browser.org/netsurf.git/tree/89baae16b47fad0dcb50402e9... The branch, master has been updated via 89baae16b47fad0dcb50402e9a2ba887b05242c0 (commit) via 29e36cdf1a6f4404f804e5c2b46d38dad929416d (commit) from 08c275ed2c843441aad23d38646083de7a130753 (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=89baae16b47fad0dcb5... commit 89baae16b47fad0dcb50402e9a2ba887b05242c0 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Framebuffer: Squash fallthrough warnings in internal font handling. diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c index 3b8a1c4..ff3471d 100644 --- a/frontends/framebuffer/font_internal.c +++ b/frontends/framebuffer/font_internal.c @@ -270,6 +270,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ case FB_BOLD: section = fb_bold_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -280,6 +281,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ case FB_ITALIC: section = fb_italic_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -290,6 +292,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ case FB_REGULAR: section = fb_regular_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -300,6 +303,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ default: glyph_data = get_codepoint(ucs4, style & FB_ITALIC); break; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=29e36cdf1a6f4404f80... commit 29e36cdf1a6f4404f804e5c2b46d38dad929416d Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Framebuffer: Tweak comment to avoid fallthrough warning. diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c index e252f25..8bbaedc 100644 --- a/frontends/framebuffer/gui.c +++ b/frontends/framebuffer/gui.c @@ -951,8 +951,7 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi) browser_window_key_press(gw->bw, NS_KEY_REDO); break; } - /* Z or Y pressed but not undo or redo; - * Fall through to default handling */ + /* Z or Y pressed but not undo or redo; Fall through */ default: ucs4 = fbtk_keycode_to_ucs4(cbi->event->value.keycode, ----------------------------------------------------------------------- Summary of changes: frontends/framebuffer/font_internal.c | 4 ++++ frontends/framebuffer/gui.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c index 3b8a1c4..ff3471d 100644 --- a/frontends/framebuffer/font_internal.c +++ b/frontends/framebuffer/font_internal.c @@ -270,6 +270,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ case FB_BOLD: section = fb_bold_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -280,6 +281,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ case FB_ITALIC: section = fb_italic_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -290,6 +292,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ case FB_REGULAR: section = fb_regular_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -300,6 +303,7 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } + /* Fall through. */ default: glyph_data = get_codepoint(ucs4, style & FB_ITALIC); break; diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c index e252f25..8bbaedc 100644 --- a/frontends/framebuffer/gui.c +++ b/frontends/framebuffer/gui.c @@ -951,8 +951,7 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi) browser_window_key_press(gw->bw, NS_KEY_REDO); break; } - /* Z or Y pressed but not undo or redo; - * Fall through to default handling */ + /* Z or Y pressed but not undo or redo; Fall through */ default: ucs4 = fbtk_keycode_to_ucs4(cbi->event->value.keycode, -- NetSurf Browser

5 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.7-54-g08c275e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/08c275ed2c843441aad23... ...commit http://git.netsurf-browser.org/netsurf.git/commit/08c275ed2c843441aad23d3... ...tree http://git.netsurf-browser.org/netsurf.git/tree/08c275ed2c843441aad23d386... The branch, master has been updated via 08c275ed2c843441aad23d38646083de7a130753 (commit) from 790d30b7888d5818a4e2521aabe2f31f04d59341 (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=08c275ed2c843441aad... commit 08c275ed2c843441aad23d38646083de7a130753 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> RISC OS: translate resource paths. Fixes #2266. diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index cfc513f..be1bc8d 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -195,6 +195,7 @@ static struct static nsurl *gui_get_resource_url(const char *path) { static const char base_url[] = "file:///NetSurf:/Resources/"; + const char *lang; size_t path_len, length; char *raw; nsurl *url = NULL; @@ -220,8 +221,12 @@ static nsurl *gui_get_resource_url(const char *path) path_len = strlen(path); + lang = ro_gui_default_language(); + /* Find max URL length */ - length = SLEN(base_url) + SLEN("xx/") + path_len + 1; + length = SLEN(base_url) + + strlen(lang) + 1 + /* <lang> + / */ + path_len + 1; /* + NUL */ raw = malloc(length); if (raw != NULL) { @@ -230,13 +235,11 @@ static nsurl *gui_get_resource_url(const char *path) ptr += SLEN(base_url); /* Add language directory to URL, for translated files */ - /* TODO: handle non-en langauages - * handle non-html translated files */ + /* TODO: handle non-html translated files */ if (path_len > SLEN(".html") && strncmp(path + path_len - SLEN(".html"), ".html", SLEN(".html")) == 0) { - memcpy(ptr, "en/", SLEN("en/")); - ptr += SLEN("en/"); + ptr += sprintf(ptr, "%s/", lang); } /* Add filename to URL */ ----------------------------------------------------------------------- Summary of changes: frontends/riscos/gui.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index cfc513f..be1bc8d 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -195,6 +195,7 @@ static struct static nsurl *gui_get_resource_url(const char *path) { static const char base_url[] = "file:///NetSurf:/Resources/"; + const char *lang; size_t path_len, length; char *raw; nsurl *url = NULL; @@ -220,8 +221,12 @@ static nsurl *gui_get_resource_url(const char *path) path_len = strlen(path); + lang = ro_gui_default_language(); + /* Find max URL length */ - length = SLEN(base_url) + SLEN("xx/") + path_len + 1; + length = SLEN(base_url) + + strlen(lang) + 1 + /* <lang> + / */ + path_len + 1; /* + NUL */ raw = malloc(length); if (raw != NULL) { @@ -230,13 +235,11 @@ static nsurl *gui_get_resource_url(const char *path) ptr += SLEN(base_url); /* Add language directory to URL, for translated files */ - /* TODO: handle non-en langauages - * handle non-html translated files */ + /* TODO: handle non-html translated files */ if (path_len > SLEN(".html") && strncmp(path + path_len - SLEN(".html"), ".html", SLEN(".html")) == 0) { - memcpy(ptr, "en/", SLEN("en/")); - ptr += SLEN("en/"); + ptr += sprintf(ptr, "%s/", lang); } /* Add filename to URL */ -- NetSurf Browser

5 years, 1 month

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits January 2018