summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-03-16 19:27:12 +0000
committerSam James <sam@gentoo.org>2022-03-16 19:27:48 +0000
commit200f9dbf94b916f196fabdc523d56f5d7b8b32fa (patch)
tree5558cf8a61cbc423a6ef3eaa87e3ae657d5ff39b
parentdev-python/cython: Stabilize 0.29.28 arm64, #835182 (diff)
downloadgentoo-200f9dbf94b916f196fabdc523d56f5d7b8b32fa.tar.gz
gentoo-200f9dbf94b916f196fabdc523d56f5d7b8b32fa.tar.bz2
gentoo-200f9dbf94b916f196fabdc523d56f5d7b8b32fa.zip
www-client/netsurf: fix build with GCC 10 (-fno-common)
Closes: https://bugs.gentoo.org/835379 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch23
-rw-r--r--www-client/netsurf/netsurf-3.10-r6.ebuild1
2 files changed, 24 insertions, 0 deletions
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