From 4ae939a8938b4de7b40fb3d1d882d997314dda41 Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Sat, 19 Aug 2017 23:46:10 -0400 Subject: [PATCH] Carry mona patch forward --- www-client/netsurf/Manifest | 2 +- .../files/netsurf-9999-add-mona-family.patch | 153 ++++++++++----------- 2 files changed, 77 insertions(+), 78 deletions(-) diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest index bc0f6b1..57d8c81 100644 --- a/www-client/netsurf/Manifest +++ b/www-client/netsurf/Manifest @@ -1,4 +1,4 @@ -AUX netsurf-9999-add-mona-family.patch 10551 SHA256 68edc03b1dfaa058b0fa8ca46591cd0075af73347e2569ee688b907aee03d8a4 SHA512 753f2ccae8c0f253f817f455f0a0cf6b5cb0c175c94935a429c676b45886b37097847dd5d6bd97f46c37ff57ad99286d436934fabea189573765dd2dbed0fc85 WHIRLPOOL 5fbadaf530a756e4d149be082e1c388e67cbe3550662d88b3523dff05dcf93d03ff6fd3fc5216511dc7fff1f095c56723052471dc74bb9184596f3f378b9ad32 +AUX netsurf-9999-add-mona-family.patch 10593 SHA256 f30122a55df57df910247e6b1fd67a4179517dcdbbea3858d0edbd0dbf55e1c5 SHA512 53a8a5b397937026f199d7af8e4f4d76dbf6da7154c6ab715be9a660b79f7abfd19e5487509f160dd8e28f73935357e3990c475773dfed167351c9a930c706b2 WHIRLPOOL 45172c95a63fa3fa9c2723380e613ce9a2a0e2da26652c912dc27c2c4fd68f23f33c6810eae40097ddbd6c6279bd680f6217a8acec31b52b03b54a1aa58bb237 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 4905 SHA256 200e81862e3c98b1c689f3d284d6efb807b56937b0427f9c3b7afa9e98f50c0b SHA512 1c3761663b63303cd2fe94c46fdfd504f2124fea50c99c2296aab129976169493078df9366f4ffc39f365a0c0d30d3b5f2651faf168ec91480f6034ea45f98dd WHIRLPOOL cb9c6e4e1f2f57337601d148c23d8cd57d5d55d9fc269e14d86879ae12fb899224103521ffa5aec21f856313a2c7c26a0680c1932c803a23ab6e688308a65b67 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 607b2fe..34797fd 100644 --- a/www-client/netsurf/files/netsurf-9999-add-mona-family.patch +++ b/www-client/netsurf/files/netsurf-9999-add-mona-family.patch @@ -1,72 +1,3 @@ -diff --git a/Docs/BUILDING-Framebuffer b/Docs/BUILDING-Framebuffer -index 3c8858a32..f3683a249 100644 ---- a/Docs/BUILDING-Framebuffer -+++ b/Docs/BUILDING-Framebuffer -@@ -242,6 +242,7 @@ - NETSURF_FB_FONT_MONOSPACE_BOLD - NETSURF_FB_FONT_CURSIVE - NETSURF_FB_FONT_FANTASY -+ NETSURF_FB_FONT_MONA - - The font selection may be changed by placing truetype font files - in the resources path. The resource files will be the generic names -@@ -264,6 +265,7 @@ - fb_face_monospace_bold - The bold monospaced font - fb_face_cursive - The cursive font - fb_face_fantasy - The fantasy font -+ fb_face_mona - The mona font - - Old Freetype - -------------- -diff --git a/Docs/Options b/Docs/Options -index 89b881414..e29b60303 100644 ---- a/Docs/Options -+++ b/Docs/Options -@@ -54,6 +54,8 @@ General Options - | | | | | - | font_fantasy | string | NULL | Default fantasy font - | | | | | -+| font_mona | string | NULL | Default mona font -+| | | | | - | accept_language | string | NULL | Accept-Language header. - | | | | | - | accept_charset | string | NULL | Accept-Charset header. -diff --git a/Docs/USING-Framebuffer b/Docs/USING-Framebuffer -index 3af8f983f..b846b1821 100644 ---- a/Docs/USING-Framebuffer -+++ b/Docs/USING-Framebuffer -@@ -205,3 +205,4 @@ Configuring - fb_face_monospace_bold - The bold monospaced font - fb_face_cursive - The cursive font - fb_face_fantasy - The fantasy font -+ fb_face_mona - The mona font -diff --git a/Docs/netsurf-fb.1 b/Docs/netsurf-fb.1 -index e4c310075..dd7837b5c 100644 ---- a/Docs/netsurf-fb.1 -+++ b/Docs/netsurf-fb.1 -@@ -80,6 +80,9 @@ Family name of the cursive font. - .B \-\-font_fantasy - Family name of the fantasy font. - .TP -+.B \-\-font_mona -+Family name of the mona font. -+.TP - .B \-\-accept_language - Languages to accept. - .TP -diff --git a/Docs/netsurf-gtk.1 b/Docs/netsurf-gtk.1 -index 7b2f4f4f3..adcdbdeb1 100644 ---- a/Docs/netsurf-gtk.1 -+++ b/Docs/netsurf-gtk.1 -@@ -57,6 +57,8 @@ Family name of the monospace font. - Family name of the cursive font. - .It Fl -font_fantasy - Family name of the fantasy font. -+.It Fl -font_mona -+Family name of the mona font. - .It Fl -accept_language - Languages to accept. - .It Fl -accept_charset diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c index 1ad188cb8..7da1c6a0f 100644 --- a/content/handlers/css/dump.c @@ -109,8 +40,76 @@ index d91898c6e..7c077b4dc 100644 /** Accept-Language header. */ NSOPTION_STRING(accept_language, NULL) +diff --git a/docs/building-Framebuffer.md b/docs/building-Framebuffer.md +index 3c8858a32..f3683a249 100644 +--- a/docs/building-Framebuffer.md ++++ b/docs/building-Framebuffer.md +@@ -242,6 +242,7 @@ + NETSURF_FB_FONT_MONOSPACE_BOLD + NETSURF_FB_FONT_CURSIVE + NETSURF_FB_FONT_FANTASY ++ NETSURF_FB_FONT_MONA + + The font selection may be changed by placing truetype font files + in the resources path. The resource files will be the generic names +@@ -264,6 +265,7 @@ + fb_face_monospace_bold - The bold monospaced font + fb_face_cursive - The cursive font + fb_face_fantasy - The fantasy font ++ fb_face_mona - The mona font + + Old Freetype + -------------- +diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1 +index e4c310075..dd7837b5c 100644 +--- a/docs/netsurf-fb.1 ++++ b/docs/netsurf-fb.1 +@@ -80,6 +80,9 @@ Family name of the cursive font. + .B \-\-font_fantasy + Family name of the fantasy font. + .TP ++.B \-\-font_mona ++Family name of the mona font. ++.TP + .B \-\-accept_language + Languages to accept. + .TP +diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1 +index 7b2f4f4f3..adcdbdeb1 100644 +--- a/docs/netsurf-gtk.1 ++++ b/docs/netsurf-gtk.1 +@@ -57,6 +57,8 @@ Family name of the monospace font. + Family name of the cursive font. + .It Fl -font_fantasy + Family name of the fantasy font. ++.It Fl -font_mona ++Family name of the mona font. + .It Fl -accept_language + Languages to accept. + .It Fl -accept_charset +diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md +index 553813842..5f233d982 100644 +--- a/docs/netsurf-options.md ++++ b/docs/netsurf-options.md +@@ -37,6 +37,7 @@ General Options + font_mono | string | NULL | Default monospace font + font_cursive | string | NULL | Default cursive font + font_fantasy | string | NULL | Default fantasy font ++ font_mona | string | NULL | Default mona font + accept_language | string | NULL | Accept-Language header. + accept_charset | string | NULL | Accept-Charset header. + memory_cache_size | int | 12MiB | Preferred maximum size of memory cache in bytes. +diff --git a/docs/using-framebuffer.md b/docs/using-framebuffer.md +index 3af8f983f..b846b1821 100644 +--- a/docs/using-framebuffer.md ++++ b/docs/using-framebuffer.md +@@ -205,3 +205,4 @@ Configuring + fb_face_monospace_bold - The bold monospaced font + fb_face_cursive - The cursive font + fb_face_fantasy - The fantasy font ++ fb_face_mona - The mona font diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile -index 6d2acb079..cba1ced9e 100644 +index 760e85b25..e687933f0 100644 --- a/frontends/framebuffer/Makefile +++ b/frontends/framebuffer/Makefile @@ -19,6 +19,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE="$(NETSURF_FB_FONT_MONOSPACE)"' @@ -187,10 +186,10 @@ index eee6f4bc6..c3a565a1f 100644 /* * Local Variables: diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c -index 8d6b42234..641db3992 100644 +index a183e521f..d63a8738e 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c -@@ -217,6 +217,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")); @@ -199,10 +198,10 @@ index 8d6b42234..641db3992 100644 return NSERROR_OK; } diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c -index bad57d684..49c530fe1 100644 +index fb065b127..f58984cca 100644 --- a/frontends/gtk/layout_pango.c +++ b/frontends/gtk/layout_pango.c -@@ -272,6 +272,9 @@ nsfont_style_to_description(const plot_font_style_t *fstyle) +@@ -269,6 +269,9 @@ nsfont_style_to_description(const plot_font_style_t *fstyle) case PLOT_FONT_FAMILY_FANTASY: desc = pango_font_description_from_string(nsoption_charp(font_fantasy)); break; @@ -267,10 +266,10 @@ index 94ef877c7..6136ad33b 100644 default: plot = PLOT_FONT_FAMILY_SANS_SERIF; diff --git a/resources/FatMessages b/resources/FatMessages -index ead95fc06..c311eb393 100644 +index 99189dbe5..e847c7c2f 100644 --- a/resources/FatMessages +++ b/resources/FatMessages -@@ -2552,6 +2552,9 @@ nl.gtk.preferencesFonttypeCursive:Cursief +@@ -2559,6 +2559,9 @@ nl.gtk.preferencesFonttypeCursive:Cursief en.gtk.preferencesFonttypeFantasy:Fantasy fr.gtk.preferencesFonttypeFantasy:Fantasy nl.gtk.preferencesFonttypeFantasy:Fantasie @@ -280,7 +279,7 @@ index ead95fc06..c311eb393 100644 en.gtk.preferencesPrivacyTabtitle:Privacy fr.gtk.preferencesPrivacyTabtitle:Confidentialité nl.gtk.preferencesPrivacyTabtitle:Privacy -@@ -6137,6 +6140,11 @@ de.all.FontFantasy:Fantasy +@@ -6146,6 +6149,11 @@ de.all.FontFantasy:Fantasy fr.all.FontFantasy:Fantaisie it.all.FontFantasy:Fantasia nl.all.FontFantasy:Fantasie -- 2.11.4.GIT