gentoo resync : 20.03.2022

4 files changed, 41 insertions, 18 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 3055dcc4d98a..3975c4b501cd 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,6 +1,7 @@
 AUX netsurf-3.10-disable-failing-tests.patch 1196 BLAKE2B 055f4663bfed7ebe291e922ad52b20acb3b014e0be36e2e562410ce8e1188fcaa0edce1dd39ec9b834139e4250c30a08039a896a47dfc90c23e9f2e4a1675869 SHA512 dc10108ee223287978305942e1254efacf7ac78201355df0de5c19ebb0782077cdaf655e8eba590c5187df38d1f67e861f77b13d507faea481bf8f1992fe0e1d
+AUX netsurf-3.10-gcc10-fno-common.patch 821 BLAKE2B 7560c370dbc41312644c4f3b2df0eeed2c517c5a811bd01ea80bbf1e4506481f1d3df1e5e6df206486b6bafafb78d23d031f08b6d18eca61e4e51a6f4aef9e28 SHA512 af5d60a9f5a1a379c99c7b2cfa3dcf6a61be9a7d8fb7fad84a380b677332832750aea76b3e1ed0671e5204f61968e95542549f9ff966c589e4f80a45b42004df
 AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
-EBUILD netsurf-3.10-r4.ebuild 4584 BLAKE2B f6221c7f97bb83f5b6629895b90f3f494a44078734b491c30a76f638e5a21660f0f9676e302611eaad001468f0d2cb53564e5cab1cdfe56ba2c316ddade16816 SHA512 f0f4c3d72fbe5b19fefcf9682707f544a83dcc193f4c4b45fa5b5e87ef12170099437534f6b79ccd35f74d1b8af4b80886b5c33bc355c451e2fc180a6f4e737d
-MISC metadata.xml 1595 BLAKE2B 8cdb8d65b7cd691aed4dbfb6643b6a7b2ea94efbf1ab971eced0d5b1609173cd9737022fb393ad9864bd2fbeb9eca7236c621252699f406cabc04be51ad8e932 SHA512 9867340fc2118fb49061a19bb438e9c16e81f4e1b40ba88f0d5580b479a92977c7a8acd79c06f363753f4a710bcbdefe149055e55f2a46c89ffd45d83745616c
+EBUILD netsurf-3.10-r6.ebuild 4515 BLAKE2B e864647a0d5ce878f5cc61dc2fb2e8106e6cd535a8d4ed8f483a14deb0277b8a2cd85fef722bf15c3d02cb0ba92a698be57d8b1325af22effcd1fd8bdaf30f47 SHA512 ee9da51fde8679dd200fc985872bd175c6de282d6c9f24a190451bff777f2f93ea0c5bb53ca6d770cec74618e3ed013ae78e76d2d2a0101a1445c5380767cb38
+MISC metadata.xml 1529 BLAKE2B e31ba3f6f2abcf8f6dbda04027e46234829bd1b2f9d09209477e886b7f229ed43045a9138d665d25601a4f3d992394af976f114707499dd7f2e4216c4dcbae0b SHA512 bde429d9121818f4ed510516a4063f341fa98dbd43f471e237205a2b6fd298afea91a13f2a84205ae2a367e1a45895030b787f421baa09d73b5ba88df0c25cbb
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/metadata.xml b/www-client/netsurf/metadata.xml
index 9277e053d4fa..cea4e8eea5db 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -16,7 +16,6 @@
   </upstream>
   <use>
     <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
-    <flag name="duktape">Use duktape.org javascript engine</flag>
     <flag name="gtk">Build GTK3 GUI</flag>
     <flag name="gtk2">Build GTK2 GUI</flag>
     <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
diff --git a/www-client/netsurf/netsurf-3.10-r4.ebuild b/www-client/netsurf/netsurf-3.10-r6.ebuild
index 8fd37259da3c..a6961c60d25c 100644
--- a/www-client/netsurf/netsurf-3.10-r4.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r6.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit netsurf desktop
+inherit netsurf desktop toolchain-funcs
 
-DESCRIPTION="a free, open source web browser"
+DESCRIPTION="A free, open source web browser"
 HOMEPAGE="https://www.netsurf-browser.org/"
 SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
+IUSE="bmp fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
 	+png +psl rosprite +svg +svgtiny +webp"
 
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
-	duktape? ( javascript )"
+REQUIRED_USE="|| ( fbcon gtk gtk2 )"
 
 RDEPEND="
 	>=dev-libs/libcss-0.9
-	>=net-libs/libdom-0.3
+	>=net-libs/libdom-0.4.1-r1
 	>=net-libs/libhubbub-0.3
 	>=dev-libs/libnsutils-0.1.0
 	>=dev-libs/libutf8proc-2.4
@@ -38,8 +37,7 @@ RDEPEND="
 		x11-libs/gtk+:2 )
 	javascript? (
 		>=dev-libs/nsgenbind-0.7
-		duktape? ( dev-lang/duktape:= )
-		!duktape? ( dev-lang/spidermonkey:0= )
+		dev-lang/duktape:=
 	)
 	jpeg? ( >=virtual/jpeg-0-r2:0 )
 	mng? ( >=media-libs/libmng-1.0.10-r2 )
@@ -49,8 +47,9 @@ RDEPEND="
 	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
 		!svgtiny? ( gnome-base/librsvg:2 ) )
 	webp? ( >=media-libs/libwebp-0.3.0 )"
+DEPEND="${RDEPEND}"
 BDEPEND="
-	duktape? ( app-editors/vim-core )
+	javascript? ( app-editors/vim-core )
 	dev-libs/check
 	dev-perl/HTML-Parser
 	>=dev-util/netsurf-buildsystem-1.7-r1
@@ -61,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
@@ -83,9 +83,8 @@ _emake() {
 		NETSURF_USE_NSPSL=$(usex psl YES NO)
 		NETSURF_USE_MNG=$(usex mng YES NO)
 		NETSURF_USE_WEBP=$(usex webp YES NO)
-		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
 		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
+		NETSURF_USE_DUKTAPE=$(usex javascript YES NO)
 		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
 		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
 		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
@@ -94,6 +93,7 @@ _emake() {
 		NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
 		NETSURF_USE_VIDEO=NO
 	)
+
 	emake "${netsurf_makeconf[@]}" $@
 }
 
@@ -123,7 +123,7 @@ src_install() {
 		# See earlier comments about rsvg.h.
 		_emake NETSURF_USE_RSVG=NO TARGET=framebuffer DESTDIR="${D}" install
 		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb \
+		make_desktop_entry "${EPREFIX}/usr/bin/netsurf-fb %u" \
 						   NetSurf-framebuffer \
 						   netsurf \
 						   "Network;WebBrowser"
@@ -131,7 +131,7 @@ src_install() {
 	if use gtk2 ; then
 		_emake TARGET=gtk2 DESTDIR="${D}" install
 		elog "netsurf gtk2 version has been installed as netsurf-gtk2"
-		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk2 \
+		make_desktop_entry "${EPREFIX}/usr/bin/netsurf-gtk2 %u" \
 						   NetSurf-gtk2 \
 						   netsurf \
 						   "Network;WebBrowser"
@@ -139,7 +139,7 @@ src_install() {
 	if use gtk ; then
 		_emake TARGET=gtk3 DESTDIR="${D}" install
 		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk3 \
+		make_desktop_entry "${EPREFIX}/usr/bin/netsurf-gtk3 %u" \
 						   NetSurf-gtk3 \
 						   netsurf \
 						   "Network;WebBrowser"