commit:     200f9dbf94b916f196fabdc523d56f5d7b8b32fa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 19:27:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 19:27:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200f9dbf

www-client/netsurf: fix build with GCC 10 (-fno-common)

Closes: https://bugs.gentoo.org/835379
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/netsurf-3.10-gcc10-fno-common.patch      | 23 ++++++++++++++++++++++
 www-client/netsurf/netsurf-3.10-r6.ebuild          |  1 +
 2 files changed, 24 insertions(+)

diff --git a/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch 
b/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch
new file mode 100644
index 000000000000..677004c51750
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch
@@ -0,0 +1,23 @@
+Backport of upstream fix: 
https://git.netsurf-browser.org/netsurf.git/commit/?id=434f6c3fe7d1d2c6a3e6ae6338608a4a4421ab1b
+
+https://bugs.netsurf-browser.org/mantis/view.php?id=2778
+https://bugs.gentoo.org/835379
+--- a/frontends/framebuffer/convert_font.c
++++ b/frontends/framebuffer/convert_font.c
+@@ -290,14 +290,14 @@ bool generate_font_header(const char *path, struct 
font_data *data)
+ 
+ 
+       for (s = 0; s < 4; s++) {
+-              fprintf(fp, "const uint8_t *%s_section_table;\n",
++              fprintf(fp, "extern const uint8_t *%s_section_table;\n",
+                       var_lables[s]);
+-              fprintf(fp, "const uint16_t *%s_sections;\n",
++              fprintf(fp, "extern const uint16_t *%s_sections;\n",
+                       var_lables[s]);
+ 
+       }
+ 
+-      fprintf(fp, "const uint8_t *font_glyph_data;\n");
++      fprintf(fp, "extern const uint8_t *font_glyph_data;\n");
+ 
+       fprintf(fp, "\n\n");

diff --git a/www-client/netsurf/netsurf-3.10-r6.ebuild 
b/www-client/netsurf/netsurf-3.10-r6.ebuild
index 4cab447b2f86..a6961c60d25c 100644
--- a/www-client/netsurf/netsurf-3.10-r6.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r6.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-3.9-conditionally-include-image-headers.patch"
        "${FILESDIR}/${PN}-3.10-julia-libutf8proc-header-location.patch"
        "${FILESDIR}/${PN}-3.10-disable-failing-tests.patch"
+       "${FILESDIR}/${PN}-3.10-gcc10-fno-common.patch"
 )
 
 DOCS=( README docs/using-framebuffer.md

Reply via email to