gentoo auto-resync : 19:01:2024 - 14:07:55

5 files changed, 6 insertions, 73 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 133fc7a58cd2..7ec4d5e58379 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,8 +1,6 @@
 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-r7.ebuild 4015 BLAKE2B 7bc6ffa283381fd0d31b6e3214209c1a436fb8aa5ab02ad825d7859d8945ef6af8c771299188e7833e92b7a5a6b0d73afe4547b19a7067485ece9b9b1ebb7bb2 SHA512 f3f57f1dc15ee0342d6a046a5195f9e1f5039322e49058a9beeeee574d2c74109205695ee59ea70c7eb9facae9ba57100bd71992c2d83f6aa8d265ac6ae00e00
-EBUILD netsurf-9999.ebuild 3822 BLAKE2B f8748f5816fed4f979a0ce8b21ca6cd000835aefa125a1d808d6c47c30c5d46c91d2a1e30cc979a6653fcf9fbb593a252514c0fd2310db6208fd0d3dfbe30a24 SHA512 b47999ba477d663f9f9c366f5c10111edd198da7d854b115657368c6166a22fcfeffe4f0ca61a93734a6cfb05a78b35584fbcbe7859827c1f3b17fe854706a6f
+DIST netsurf-3.11-src.tar.gz 4311767 BLAKE2B aa361b44ddb90fe513e0c34ae7d5f320037c439abb2455f50c224db118cf51da8bbeeac1276f0afdb5763287a6ffaba9d8fad460718ab0659871c1fda143513a SHA512 852ed7afe891828e7e594f1906ed5a7af9c62511b61dbe37ff1ca0700e3b08151db952ad47a18f9c8cfd3f6d78fd93485aa8e39de08eca904f5dbfa747af90c3
+EBUILD netsurf-3.11.ebuild 3807 BLAKE2B ca92c5375dc551911b79629f99a837c15f4daf3bf408f39e720016c4d3e9fff03d491edade8962302195a9003c88f08cf72f30eb155a41e0c070713e89b36b9b SHA512 6f82ce007500945503dc30a2ab94832b32d1f59b649a5345b5198e7b0f6cfb551def0df6a4becf03ef7be5669d45147f711461bc8a8122ad1f269b2b670dd66e
+EBUILD netsurf-9999.ebuild 3810 BLAKE2B 666de3a6809b01eb72a3ae84b625d2654a943e8072ca68230bf942d8c2d3e8ca5690276f907c7965b93058e78f8a165fb7fd8e4b42c433d7b92868eb2afe119a SHA512 5ec7c4c9043ddae9e386e42eb29a86367fdee7cf52b238ac794fbce3a857c997e06be0456571cdadb966d7465f213474d47d1b304283da00adf45eccb3f84b3b
 MISC metadata.xml 1763 BLAKE2B be2710262e8b1890512dc57304a22adc03157a2ca39240b8899fae389fc9c3d6b7cb6ed3857c5e910a5ce0b8e3fe4a575904ce52e2b34324c762e6d1f24a9dbd SHA512 8d2bca1ceea4d5f9c095a681c79c3df69af72e4699c2761feee2033f07a43fbb7d3e82736a53adc14bf08243b2aaa80d483476a25636232836790b75ae38097b
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
deleted file mode 100644
index 677004c51750..000000000000
--- a/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/netsurf-3.9-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
deleted file mode 100644
index 603c20913da3..000000000000
--- a/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rup a/content/handlers/image/image.c b/content/handlers/image/image.c
---- a/content/handlers/image/image.c	2019-07-17 10:28:13.000000000 +0000
-+++ b/content/handlers/image/image.c	2019-09-27 15:09:03.860000000 +0000
-@@ -27,15 +27,31 @@
- #include "netsurf/content.h"
- #include "desktop/gui_internal.h"
-
-+#ifdef WITH_BMP
- #include "image/bmp.h"
-+#endif
-+#ifdef WITH_GIF
- #include "image/gif.h"
-+#endif
- #include "image/ico.h"
-+#ifdef WITH_JPEG
- #include "image/jpeg.h"
-+#endif
-+#ifdef WITH_NSSPRITE
- #include "image/nssprite.h"
-+#endif
-+#ifdef WITH_PNG
- #include "image/png.h"
-+#endif
-+#ifdef WITH_RSVG
- #include "image/rsvg.h"
-+#endif
-+#ifdef WITH_NS_SVG
- #include "image/svg.h"
-+#endif
-+#ifdef WITH_WEBP
- #include "image/webp.h"
-+#endif
- #include "image/image.h"
-
- /**
diff --git a/www-client/netsurf/netsurf-3.10-r7.ebuild b/www-client/netsurf/netsurf-3.11.ebuild
index 608f2ffaadd7..bd02ef430762 100644
--- a/www-client/netsurf/netsurf-3.10-r7.ebuild
+++ b/www-client/netsurf/netsurf-3.11.ebuild
@@ -7,7 +7,7 @@ inherit desktop netsurf toolchain-funcs
 
 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"
+SRC_URI="https://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	net-misc/curl
 	net-libs/libdom
-	net-libs/libhubbub
+	>=net-libs/libhubbub-0.3.8
 	bmp? ( media-libs/libnsbmp )
 	fbcon? (
 		dev-libs/libnsfb
@@ -34,7 +34,7 @@ RDEPEND="
 			media-libs/freetype
 		)
 	)
-	gif? ( media-libs/libnsgif )
+	gif? ( >=media-libs/libnsgif-1.0.0 )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:3
@@ -58,14 +58,11 @@ BDEPEND="
 	dev-perl/HTML-Parser
 	dev-build/netsurf-buildsystem
 	virtual/pkgconfig
-	javascript? ( app-editors/vim-core )
 "
 
 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=(
@@ -122,9 +119,6 @@ src_test() {
 }
 
 src_install() {
-	sed -e '1iexit;' \
-		-i "${WORKDIR}"/*/utils/git-testament.pl || die
-
 	if use fbcon ; then
 		# See earlier comments about rsvg.h.
 		_emake NETSURF_USE_RSVG=NO TARGET=framebuffer DESTDIR="${D}" install
diff --git a/www-client/netsurf/netsurf-9999.ebuild b/www-client/netsurf/netsurf-9999.ebuild
index 41bdc78e2ca1..24c3a05906f3 100644
--- a/www-client/netsurf/netsurf-9999.ebuild
+++ b/www-client/netsurf/netsurf-9999.ebuild
@@ -11,7 +11,6 @@ HOMEPAGE="https://www.netsurf-browser.org/"
 EGIT_REPO_URI="https://git.netsurf-browser.org/${PN}.git"
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg
 	+png +psl rosprite +svg +svgtiny +webp"