From 35a8abcbe709202b254aa4cdfea81d18d91049ba Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Sun, 15 Jul 2018 13:39:14 -0400 Subject: [PATCH] www-client/netsurf: kill old patch, take it to /etc/portage/patches if you want to keep carrying --- www-client/netsurf/Manifest | 11 +- .../files/netsurf-9999-add-mona-family.patch | 293 --------------------- www-client/netsurf/netsurf-9999.ebuild | 1 - 3 files changed, 5 insertions(+), 300 deletions(-) rewrite www-client/netsurf/Manifest (100%) delete mode 100644 www-client/netsurf/files/netsurf-9999-add-mona-family.patch diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest dissimilarity index 100% index 07b6126..866e42e 100644 --- a/www-client/netsurf/Manifest +++ b/www-client/netsurf/Manifest @@ -1,6 +1,5 @@ -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 4908 SHA256 aa880e5b8993fade64225920f20de58e88f68021e76f3e2bd24f769a9ea5ead2 SHA512 9476e6737061d7f597f211440d7b054345d3a59d97d6bd054cfce56132aa8f98aed29ca2d8bdfd26d2181e131ec062d1b1678305aa9b3b27b0c64e2cda59e33e WHIRLPOOL 6b811e2cb069fc0c277543301f93a529a49d672f77aa478432ca2699ddf5b063879bb57fb696a26335f4ec0c90ceb52e778729b2bdface73d25debc3de5d66ba -MISC ChangeLog 1987 SHA256 a89f0e759799148331beede8edc6ae2521401520eea8bfa5770c6222525e7c18 SHA512 10767ac215f11823d66c7c72e76424984e7adcb3a3e5b0ccf00b9b23cebb395dbcb05838894e1fcd897054e9d00f30e5bf5d49b985ad787a6229092ed0170f1d WHIRLPOOL 06cab18947d6edf2414bc212074be253d6b067dceef1ee3645dd436e509ba3977c68b6898034c235400062ff961968c996140e1feb242fc824460954b539afb7 -MISC metadata.xml 1577 SHA256 f53de90c2188f6b757c2fdd700eaf1c25c642f708786c552449bd54c57da40f6 SHA512 4003d28e9ef15fe3f3a46080a2584986e166148a43f060cbc90bbcc46ffe130becca495b65ee3e0d3bd348f78fdd42bccfd0e1fa90a7176a8ff5d01151a4ffc8 WHIRLPOOL 8d6c7941d0731d8280e6ee016cbc500137cd5087523dd637657fbe1c668814bdf093b66bd68f89c9d12a2dedc71719e49e873cb935b006fa93c188af12424cc1 +AUX netsurf-9999-reenable-glib-deprecated.patch 466 BLAKE2B 65b838e7c3cd0ffc9fbe0b91db7e062d3c2ea55bb8e60b9dac1114bef5a10030595e16cd7cebfbe1d88aa75a69b097c39a3da466dfc71fc94707860a22f2455a SHA512 244cf76f6647c17810e406df191384c60c08c0855e7bdc7a082aceaccc0f6cbebda655529fe69c8f05cce350a78c811d79022a54823468ec7dadfb90735d4c20 +DIST netsurf-fb.modes-example.gz 4586 BLAKE2B 89c76fde1ddc79e46f22d9f628f8d75ec57be2a29d31383550137e3b502aa4d8c0a733b755731c916d4d544679a4253323bc343528c5e2c4f145c3318ac1d86d SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 +EBUILD netsurf-9999.ebuild 4866 BLAKE2B 3d890738c55e8a289f47c4186cea87dce185ef3dc03837fcca8bf958e4b291a540e1a6161243d6c94a1728e7519bdcd4329d85a3decd3a5b5b9e68b755ad4103 SHA512 e9646d9bcef95534e7ceebd676d4787834d6e0fd53d0aee47466b80dd77724dce551f18b0d9aad25669feb1bd76869c3785a7a916ec4cb6fd6a8d9f47553aa45 +MISC ChangeLog 1987 BLAKE2B 22eeb881d5fe196aec7d93fedca04d1844ad479f187153c59a3433a34e97bd702e751f8b54ca6e5e43fa7f9b32d3b018f5aa995fbdab15d1dd31d5c95272450e SHA512 10767ac215f11823d66c7c72e76424984e7adcb3a3e5b0ccf00b9b23cebb395dbcb05838894e1fcd897054e9d00f30e5bf5d49b985ad787a6229092ed0170f1d +MISC metadata.xml 1577 BLAKE2B 12f3dcb44bf7b8c0357084d57db23228e365804ebd7a976c0168c383c5a78e24f33789de9ac8f84200063b0729c6f0eed5fd1e371103e3bde29970a1be8349fa SHA512 4003d28e9ef15fe3f3a46080a2584986e166148a43f060cbc90bbcc46ffe130becca495b65ee3e0d3bd348f78fdd42bccfd0e1fa90a7176a8ff5d01151a4ffc8 diff --git a/www-client/netsurf/files/netsurf-9999-add-mona-family.patch b/www-client/netsurf/files/netsurf-9999-add-mona-family.patch deleted file mode 100644 index 34797fd..0000000 --- a/www-client/netsurf/files/netsurf-9999-add-mona-family.patch +++ /dev/null @@ -1,293 +0,0 @@ -diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c -index 1ad188cb8..7da1c6a0f 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; -+ case CSS_FONT_FAMILY_MONA: -+ fprintf(stream, " mona "); -+ break; - } - } - -diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c -index daa3b4087..d8a84b83e 100644 ---- a/content/handlers/css/select.c -+++ b/content/handlers/css/select.c -@@ -1794,6 +1794,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; - break; -+ case PLOT_FONT_FAMILY_MONA: -+ hint->status = CSS_FONT_FAMILY_MONA; -+ break; - } - } else if (property == CSS_PROP_QUOTES) { - /** \todo Not exactly useful :) */ -diff --git a/desktop/options.h b/desktop/options.h -index d91898c6e..7c077b4dc 100644 ---- a/desktop/options.h -+++ b/desktop/options.h -@@ -82,6 +82,9 @@ NSOPTION_STRING(font_cursive, NULL) - /** Default fantasy font */ - NSOPTION_STRING(font_fantasy, NULL) - -+/** Default mona font */ -+NSOPTION_STRING(font_mona, NULL) -+ - /** 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 760e85b25..e687933f0 100644 ---- a/frontends/framebuffer/Makefile -+++ b/frontends/framebuffer/Makefile -@@ -19,6 +19,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE="$(NETSURF_FB_FONT_MONOSPACE)"' - CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"' - CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"' - CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"' -+CFLAGS += '-DNETSURF_FB_FONT_MONA="$(NETSURF_FB_FONT_MONA)"' - - CFLAGS += -std=c99 -g -Dsmall \ - -D_BSD_SOURCE \ -diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults -index cc712e992..aa18b2738 100644 ---- a/frontends/framebuffer/Makefile.defaults -+++ b/frontends/framebuffer/Makefile.defaults -@@ -36,6 +36,7 @@ NETSURF_FB_FONT_MONOSPACE := DejaVuSansMono.ttf - NETSURF_FB_FONT_MONOSPACE_BOLD := DejaVuSansMono-Bold.ttf - NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf - NETSURF_FB_FONT_FANTASY := Impact.ttf -+NETSURF_FB_FONT_MONA := ipagp-mona.ttf - - # Default binary install path - NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/ -diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c -index e7c07f5ff..b5b95e443 100644 ---- a/frontends/framebuffer/font_freetype.c -+++ b/frontends/framebuffer/font_freetype.c -@@ -67,6 +67,7 @@ enum fb_face_e { - FB_FACE_MONOSPACE_BOLD, - FB_FACE_CURSIVE, - FB_FACE_FANTASY, -+ FB_FACE_MONA, - FB_FACE_COUNT - }; - -@@ -297,6 +298,17 @@ bool fb_font_init(void) - fb_faces[FB_FACE_FANTASY] = fb_face; - } - -+ /* mona face */ -+ fb_face = fb_new_face(nsoption_charp(fb_face_mona), -+ "ipagp-mona.ttf", -+ NETSURF_FB_FONT_MONA); -+ if (fb_face == NULL) { -+ /* mona face unavailable use the default */ -+ fb_faces[FB_FACE_MONA] = fb_faces[FB_FACE_SANS_SERIF]; -+ } else { -+ fb_faces[FB_FACE_MONA] = fb_face; -+ } -+ - - /* set the default render mode */ - if (nsoption_bool(fb_font_monochrome) == true) -@@ -367,6 +379,10 @@ static void fb_fill_scalar(const plot_font_style_t *fstyle, FTC_Scaler srec) - selected_face = FB_FACE_FANTASY; - break; - -+ case PLOT_FONT_FAMILY_MONA: -+ selected_face = FB_FACE_MONA; -+ break; -+ - case PLOT_FONT_FAMILY_SANS_SERIF: - default: - if ((fstyle->flags & FONTF_ITALIC) || -diff --git a/frontends/framebuffer/options.h b/frontends/framebuffer/options.h -index eee6f4bc6..c3a565a1f 100644 ---- a/frontends/framebuffer/options.h -+++ b/frontends/framebuffer/options.h -@@ -62,6 +62,7 @@ NSOPTION_STRING(fb_face_monospace, NULL) - NSOPTION_STRING(fb_face_monospace_bold, NULL) - NSOPTION_STRING(fb_face_cursive, NULL) - NSOPTION_STRING(fb_face_fantasy, NULL) -+NSOPTION_STRING(fb_face_mona, NULL) - - /* - * Local Variables: -diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c -index a183e521f..d63a8738e 100644 ---- a/frontends/gtk/gui.c -+++ b/frontends/gtk/gui.c -@@ -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")); -+ nsoption_set_charp(font_mona, strdup("IPAMonaPGothic")); - - return NSERROR_OK; - } -diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c -index fb065b127..f58984cca 100644 ---- a/frontends/gtk/layout_pango.c -+++ b/frontends/gtk/layout_pango.c -@@ -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; -+ case PLOT_FONT_FAMILY_MONA: -+ desc = pango_font_description_from_string(nsoption_charp(font_mona)); -+ break; - case PLOT_FONT_FAMILY_SANS_SERIF: - default: - desc = pango_font_description_from_string(nsoption_charp(font_sans)); -diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui -index d5542ba5d..b4a6c2d31 100644 ---- a/frontends/gtk/res/options.gtk2.ui -+++ b/frontends/gtk/res/options.gtk2.ui -@@ -2862,6 +2862,9 @@ - - preferencesFonttypeFantasy - -+ -+ preferencesFonttypeMona -+ - - - -diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui -index 2a3516f09..4a989710c 100644 ---- a/frontends/gtk/res/options.gtk3.ui -+++ b/frontends/gtk/res/options.gtk3.ui -@@ -2881,6 +2881,9 @@ - - preferencesFonttypeFantasy - -+ -+ preferencesFonttypeMona -+ - - - -diff --git a/include/netsurf/plot_style.h b/include/netsurf/plot_style.h -index 30db3663e..b39154f7f 100644 ---- a/include/netsurf/plot_style.h -+++ b/include/netsurf/plot_style.h -@@ -71,6 +71,7 @@ typedef enum { - PLOT_FONT_FAMILY_MONOSPACE, - PLOT_FONT_FAMILY_CURSIVE, - PLOT_FONT_FAMILY_FANTASY, -+ PLOT_FONT_FAMILY_MONA, - PLOT_FONT_FAMILY_COUNT /**< Number of generic families */ - } plot_font_generic_family_t; - -diff --git a/render/font.c b/render/font.c -index 94ef877c7..6136ad33b 100644 ---- a/render/font.c -+++ b/render/font.c -@@ -52,6 +52,9 @@ static plot_font_generic_family_t plot_font_generic_family( - case CSS_FONT_FAMILY_FANTASY: - plot = PLOT_FONT_FAMILY_FANTASY; - break; -+ case CSS_FONT_FAMILY_MONA: -+ plot = PLOT_FONT_FAMILY_MONA; -+ break; - case CSS_FONT_FAMILY_SANS_SERIF: - default: - plot = PLOT_FONT_FAMILY_SANS_SERIF; -diff --git a/resources/FatMessages b/resources/FatMessages -index 99189dbe5..e847c7c2f 100644 ---- a/resources/FatMessages -+++ b/resources/FatMessages -@@ -2559,6 +2559,9 @@ nl.gtk.preferencesFonttypeCursive:Cursief - en.gtk.preferencesFonttypeFantasy:Fantasy - fr.gtk.preferencesFonttypeFantasy:Fantasy - nl.gtk.preferencesFonttypeFantasy:Fantasie -+en.gtk.preferencesFonttypeMona:Mona -+fr.gtk.preferencesFonttypeMona:Mona -+nl.gtk.preferencesFonttypeMona:Mona - en.gtk.preferencesPrivacyTabtitle:Privacy - fr.gtk.preferencesPrivacyTabtitle:Confidentialité - nl.gtk.preferencesPrivacyTabtitle:Privacy -@@ -6146,6 +6149,11 @@ de.all.FontFantasy:Fantasy - fr.all.FontFantasy:Fantaisie - it.all.FontFantasy:Fantasia - nl.all.FontFantasy:Fantasie -+en.all.FontMona:Mona -+de.all.FontMona:Mona -+fr.all.FontMona:Mona -+it.all.FontMona:Mona -+nl.all.FontMona:Mona - en.ami.FontFallback:Preferred fallback - de.ami.FontFallback:Preferred fallback - fr.ami.FontFallback:Police de caractères de secour préférée diff --git a/www-client/netsurf/netsurf-9999.ebuild b/www-client/netsurf/netsurf-9999.ebuild index aacdf49..2f8a108 100644 --- a/www-client/netsurf/netsurf-9999.ebuild +++ b/www-client/netsurf/netsurf-9999.ebuild @@ -54,7 +54,6 @@ DEPEND="${RDEPEND} >=dev-util/netsurf-buildsystem-9999" PATCHES=( - "${FILESDIR}"/${P}-add-mona-family.patch "${FILESDIR}"/${P}-reenable-glib-deprecated.patch ) DOCS=( fb.modes README docs/using-framebuffer.md -- 2.11.4.GIT