From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 441AF15838C for ; Sat, 20 Jan 2024 15:34:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CCE1E29D2; Sat, 20 Jan 2024 15:34:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D4D3E29D2 for ; Sat, 20 Jan 2024 15:34:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 742BA3431E6 for ; Sat, 20 Jan 2024 15:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8786214BE for ; Sat, 20 Jan 2024 15:34:08 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1705764732.de2f7d31913e8bfc5f78d1e28e3ac3d2d3d91fc1.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: www-client/netsurf/files/, www-client/netsurf/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: www-client/netsurf/Manifest www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch www-client/netsurf/files/netsurf-3.10-libressl-3.5.patch www-client/netsurf/files/netsurf-3.11-libressl-3.5.patch www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch www-client/netsurf/netsurf-3.10-r7.ebuild www-client/netsurf/netsurf-3.11.ebuild X-VCS-Directories: www-client/netsurf/ www-client/netsurf/files/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: de2f7d31913e8bfc5f78d1e28e3ac3d2d3d91fc1 X-VCS-Branch: master Date: Sat, 20 Jan 2024 15:34:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f8e9641-37f8-40df-b99d-f25bcd293c45 X-Archives-Hash: 81fe2493ff1e6d40694d71574467d398 commit: de2f7d31913e8bfc5f78d1e28e3ac3d2d3d91fc1 Author: orbea riseup net> AuthorDate: Sat Jan 20 15:32:12 2024 +0000 Commit: orbea riseup net> CommitDate: Sat Jan 20 15:32:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=de2f7d31 www-client/netsurf: add 3.11, drop 3.10-r7 Signed-off-by: orbea riseup.net> www-client/netsurf/Manifest | 2 +- .../files/netsurf-3.10-gcc10-fno-common.patch | 23 -------------- ...l-3.5.patch => netsurf-3.11-libressl-3.5.patch} | 25 ++++------------ ...f-3.9-conditionally-include-image-headers.patch | 35 ---------------------- ...{netsurf-3.10-r7.ebuild => netsurf-3.11.ebuild} | 18 ++++------- 5 files changed, 12 insertions(+), 91 deletions(-) diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest index 974348b..13e202c 100644 --- a/www-client/netsurf/Manifest +++ b/www-client/netsurf/Manifest @@ -1 +1 @@ -DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d +DIST netsurf-3.11-src.tar.gz 4311767 BLAKE2B aa361b44ddb90fe513e0c34ae7d5f320037c439abb2455f50c224db118cf51da8bbeeac1276f0afdb5763287a6ffaba9d8fad460718ab0659871c1fda143513a SHA512 852ed7afe891828e7e594f1906ed5a7af9c62511b61dbe37ff1ca0700e3b08151db952ad47a18f9c8cfd3f6d78fd93485aa8e39de08eca904f5dbfa747af90c3 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 677004c..0000000 --- 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.10-libressl-3.5.patch b/www-client/netsurf/files/netsurf-3.11-libressl-3.5.patch similarity index 62% rename from www-client/netsurf/files/netsurf-3.10-libressl-3.5.patch rename to www-client/netsurf/files/netsurf-3.11-libressl-3.5.patch index d9add88..5efb701 100644 --- a/www-client/netsurf/files/netsurf-3.10-libressl-3.5.patch +++ b/www-client/netsurf/files/netsurf-3.11-libressl-3.5.patch @@ -2,10 +2,9 @@ X509_get_signature_nid(), ASN1_STRING_get0_data(), RSA_bits() and DH_bits() have been available since LibreSSL 2.7. DSA_bits(), RSA_get0_n(), RSA_get0_e() will be available in LibreSSL 3.5. -Index: content/fetchers/about.c ---- a/content/fetchers/about.c -+++ b/content/fetchers/about.c -@@ -538,7 +538,8 @@ static nserror free_ns_cert_info(struct ns_cert_info * +--- a/content/fetchers/about/certificate.c ++++ b/content/fetchers/about/certificate.c +@@ -137,7 +137,8 @@ static nserror free_ns_cert_info(struct ns_cert_info *cinfo) /* OpenSSL 1.0.x, 1.0.2, 1.1.0 and 1.1.1 API all changed * LibreSSL declares its OpenSSL version as 2.1 but only supports 1.0.x API */ @@ -13,25 +12,11 @@ Index: content/fetchers/about.c +#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL) || \ + (OPENSSL_VERSION_NUMBER < 0x1010000fL) /* 1.0.x */ - + #if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x1000200fL)) -@@ -609,7 +610,7 @@ static const BIGNUM *ns_RSA_get0_e(const RSA *r) - #define ns_DH_bits DH_bits - - #else --/* 1.1.1 and later */ -+/* 1.1.1 and later, LibreSSL 3.5.0 and later */ - #define ns_X509_get_signature_nid X509_get_signature_nid - #define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data - #define ns_RSA_get0_n RSA_get0_n - -X509_up_ref has been available since LibreSSL 2.5. -X509_free has always been available. - -Index: content/fetchers/curl.c --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c -@@ -92,7 +92,7 @@ +@@ -98,7 +98,7 @@ /* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way */ 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 603c209..0000000 --- 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 similarity index 88% rename from www-client/netsurf/netsurf-3.10-r7.ebuild rename to www-client/netsurf/netsurf-3.11.ebuild index dd8707c..585c83d 100644 --- a/www-client/netsurf/netsurf-3.10-r7.ebuild +++ b/www-client/netsurf/netsurf-3.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 @@ -56,17 +56,14 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-libs/check dev-perl/HTML-Parser - dev-util/netsurf-buildsystem + 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" - "${FILESDIR}/${PN}-3.10-libressl-3.5.patch" + "${FILESDIR}/${PN}-3.11-libressl-3.5.patch" ) DOCS=( @@ -123,9 +120,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