From c459fed77a5a0e721f009701082ba6c37f12004c Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Sun, 29 May 2016 00:34:03 -0400 Subject: [PATCH] Carry mona patch forward --- www-client/netsurf/Manifest | 2 +- .../files/netsurf-9999-add-mona-family.patch | 56 +++++++++++++++++----- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest index 7819dcd..527938f 100644 --- a/www-client/netsurf/Manifest +++ b/www-client/netsurf/Manifest @@ -1,4 +1,4 @@ -AUX netsurf-9999-add-mona-family.patch 10309 SHA256 11c72180aaf0584459b94d310ca7596e44d82020bee5fe81f1d61865d7c5f197 SHA512 48eccc97ada08854c0ec38fdd07b1937692184bbdcd512b745070de01b26d58645b8b07031c0fdd98ace5ff6059a92cb60b94bea503c6be3722e24f40c4a7756 WHIRLPOOL bdb7b3ded66f13d2b06fc62c3d69d1ef2cc8906d23142cc285bff893d80128466dc4b844cf9bf5a7bb17b44dc8f19492ce5c2ed249ec946d3e449758f6857767 +AUX netsurf-9999-add-mona-family.patch 11669 SHA256 8f4b81b0d974ce795264e62331075f992dfc68316e1a12cc9812f416e0c8a917 SHA512 36ce9b1206fdffb48a546710755be1cd408d439ff0fd3b671be96590d72b507cd4482f4a556c23a7ba85dc2345292597022d18902f85373d1a4fc0750d35b55b WHIRLPOOL fe4e9c8af1c1f60929ecae14b83b0fda6cbb4357f4e44dd4d0532c9992df014a6172e7ffe62de3ae64a158f4847a6c2f9cfa66e637db4b34b79c23172573ba77 AUX netsurf-9999-reenable-glib-deprecated.patch 466 SHA256 ffa95568f269178d703c32ca8a212f5de270a218c9ab8b36ab023e73b9cd2060 SHA512 244cf76f6647c17810e406df191384c60c08c0855e7bdc7a082aceaccc0f6cbebda655529fe69c8f05cce350a78c811d79022a54823468ec7dadfb90735d4c20 WHIRLPOOL 369a8492229f3ea9efa18e524dfd53ee1b0d3235e7da5b68627f461bde296a9246644c262245fb40c4e58b2b0da3400c7b09e214ed1883d5e01b8d92f5090009 DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767 EBUILD netsurf-9999.ebuild 4995 SHA256 e97f8afa1880e5dcedc13d789e9d4d02915f436d17ca251c5936ab0fa39de07d SHA512 ce3eb7f964203b9750da25fd2ab356d50570a87626d89a04e727b7a8234ffdc24a10339ace7c42dfe3f1e1993b359bcea6b0584aed20ce98589389fdccc81ba3 WHIRLPOOL 360ac86dd28cfb23192b91166af58db026e87ad095a746be226b8267e3ca03ef75c949f7329c8203a49517498ccaf987962927bb61973f5f82526d6c85ffe907 diff --git a/www-client/netsurf/files/netsurf-9999-add-mona-family.patch b/www-client/netsurf/files/netsurf-9999-add-mona-family.patch index cb30e44..c30b9bf 100644 --- a/www-client/netsurf/files/netsurf-9999-add-mona-family.patch +++ b/www-client/netsurf/files/netsurf-9999-add-mona-family.patch @@ -1,3 +1,30 @@ +From 31752d332b4798d377800e68854955847ab2bd8e Mon Sep 17 00:00:00 2001 +From: "S. Gilles" +Date: Sun, 29 May 2016 00:28:55 -0400 +Subject: [PATCH] Hardcode `mona' font until all arbitrary fonts hit + +--- + Docs/BUILDING-Framebuffer | 2 ++ + Docs/Options | 2 ++ + Docs/USING-Framebuffer | 1 + + Docs/netsurf-fb.1 | 3 +++ + Docs/netsurf-gtk.1 | 2 ++ + content/handlers/css/dump.c | 3 +++ + content/handlers/css/select.c | 3 +++ + desktop/options.h | 3 +++ + desktop/plot_style.h | 1 + + frontends/framebuffer/Makefile | 1 + + frontends/framebuffer/Makefile.defaults | 1 + + frontends/framebuffer/font_freetype.c | 16 ++++++++++++++++ + frontends/framebuffer/options.h | 1 + + frontends/gtk/gui.c | 1 + + frontends/gtk/layout_pango.c | 3 +++ + frontends/gtk/res/options.gtk2.ui | 3 +++ + frontends/gtk/res/options.gtk3.ui | 3 +++ + render/font.c | 3 +++ + resources/FatMessages | 8 ++++++++ + 19 files changed, 60 insertions(+) + diff --git a/Docs/BUILDING-Framebuffer b/Docs/BUILDING-Framebuffer index 3c8858a..f3683a2 100644 --- a/Docs/BUILDING-Framebuffer @@ -67,11 +94,11 @@ index 7b2f4f4..adcdbde 100644 .It Fl -accept_language Languages to accept. .It Fl -accept_charset -diff --git a/css/dump.c b/css/dump.c -index d3ebc94..cd0cb1e 100644 ---- a/css/dump.c -+++ b/css/dump.c -@@ -810,6 +810,9 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) +diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c +index 125b133..0648d7d 100644 +--- a/content/handlers/css/dump.c ++++ b/content/handlers/css/dump.c +@@ -896,6 +896,9 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style) case CSS_FONT_FAMILY_MONOSPACE: fprintf(stream, " monospace "); break; @@ -81,10 +108,10 @@ index d3ebc94..cd0cb1e 100644 } } -diff --git a/css/select.c b/css/select.c -index a929cf1..2e19633 100644 ---- a/css/select.c -+++ b/css/select.c +diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c +index ea324e7..452e010 100644 +--- a/content/handlers/css/select.c ++++ b/content/handlers/css/select.c @@ -1801,6 +1801,9 @@ css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint) case PLOT_FONT_FAMILY_FANTASY: hint->status = CSS_FONT_FAMILY_FANTASY; @@ -199,10 +226,10 @@ index eee6f4b..c3a565a 100644 /* * Local Variables: diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c -index e705918..5035a15 100644 +index 6430f9d..e06a81c 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c -@@ -219,6 +219,7 @@ static nserror set_defaults(struct nsoption_s *defaults) +@@ -218,6 +218,7 @@ static nserror set_defaults(struct nsoption_s *defaults) nsoption_set_charp(font_mono, strdup("Monospace")); nsoption_set_charp(font_cursive, strdup("Serif")); nsoption_set_charp(font_fantasy, strdup("Serif")); @@ -253,10 +280,10 @@ index 2a3516f..4a98971 100644 diff --git a/render/font.c b/render/font.c -index 0b059a2..4214f86 100644 +index 831097e..8ad3dac 100644 --- a/render/font.c +++ b/render/font.c -@@ -52,6 +52,9 @@ static plot_font_generic_family_t plot_font_generic_family( +@@ -51,6 +51,9 @@ static plot_font_generic_family_t plot_font_generic_family( case CSS_FONT_FAMILY_FANTASY: plot = PLOT_FONT_FAMILY_FANTASY; break; @@ -292,3 +319,6 @@ index 9a86234..c14b6de 100644 en.ami.FontFallback:Preferred fallback de.ami.FontFallback:Preferred fallback fr.ami.FontFallback:Police de caractères de secour préférée +-- +2.8.3 + -- 2.11.4.GIT