commit: 982f8d1c3f144456489283e3590440823edfb44f Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Fri Jan 19 07:59:54 2024 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Fri Jan 19 09:29:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982f8d1c
www-client/netsurf: drop 3.10-r7 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> www-client/netsurf/Manifest | 1 - .../files/netsurf-3.10-gcc10-fno-common.patch | 23 ---- ...f-3.9-conditionally-include-image-headers.patch | 35 ----- www-client/netsurf/netsurf-3.10-r7.ebuild | 150 --------------------- 4 files changed, 209 deletions(-) diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest index 721779486c91..13e202c250a1 100644 --- a/www-client/netsurf/Manifest +++ b/www-client/netsurf/Manifest @@ -1,2 +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 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.10-r7.ebuild deleted file mode 100644 index 608f2ffaadd7..000000000000 --- a/www-client/netsurf/netsurf-3.10-r7.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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"; - -LICENSE="GPL-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg - +png +psl rosprite +svg +svgtiny +webp" - -REQUIRED_USE="|| ( fbcon gtk )" - -RDEPEND=" - dev-libs/libcss - dev-libs/libnsutils - dev-libs/openssl:= - dev-libs/libutf8proc - dev-libs/libxml2:2 - net-misc/curl - net-libs/libdom - net-libs/libhubbub - bmp? ( media-libs/libnsbmp ) - fbcon? ( - dev-libs/libnsfb - truetype? ( - media-fonts/dejavu - media-libs/freetype - ) - ) - gif? ( media-libs/libnsgif ) - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:3 - ) - javascript? ( - dev-libs/nsgenbind - dev-lang/duktape:= - ) - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:0= ) - psl? ( media-libs/libnspsl ) - rosprite? ( media-libs/librosprite ) - svg? ( - svgtiny? ( media-libs/libsvgtiny ) - !svgtiny? ( gnome-base/librsvg:2 ) - ) - webp? ( media-libs/libwebp )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/check - 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=( - README - docs/using-framebuffer.md - docs/ideas/{cache,css-engine,render-library}.txt -) - -src_prepare() { - default - rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die -} - -_emake() { - netsurf_define_makeconf - local netsurf_makeconf=( - "${NETSURF_MAKECONF[@]}" - COMPONENT_TYPE=binary - NETSURF_FB_FONTLIB=$(usex truetype freetype internal) - NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu" - NETSURF_USE_BMP=$(usex bmp YES NO) - NETSURF_USE_DUKTAPE=$(usex javascript YES NO) - NETSURF_USE_GIF=$(usex gif YES NO) - NETSURF_USE_JPEG=$(usex jpeg YES NO) - NETSURF_USE_PNG=$(usex png YES NO) - NETSURF_USE_NSPSL=$(usex psl YES NO) - NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO) - NETSURF_USE_OPENSSL=YES - NETSURF_USE_ROSPRITE=$(usex rosprite YES NO) - NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO) - NETSURF_USE_WEBP=$(usex webp YES NO) - NETSURF_USE_VIDEO=NO - PKG_CONFIG=$(tc-getPKG_CONFIG) - ) - - emake "${netsurf_makeconf[@]}" $@ -} - -src_compile() { - # The build system only runs pkg-config to find librsvg's include - # dir for the gtk targets. So if you try to build the framebuffer - # target with NETSURF_USE_RSVG=YES, the build crashes on failing to - # find rsvg.h. To work around that, we set NETSURF_USE_RSVG=NO. It - # might be possible to fall back to svgtiny with USE="svg -svgtiny" - # if svgtiny works in a framebuffer, but then our (R)DEPEND would - # need some mangling to ensure that svgtiny is installed. - use fbcon && _emake NETSURF_USE_RSVG=NO TARGET=framebuffer - - use gtk && _emake TARGET=gtk3 -} - -src_test() { - _emake 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 - elog "framebuffer binary has been installed as netsurf-fb" - make_desktop_entry "${EPREFIX}/usr/bin/netsurf-fb %u" \ - NetSurf-framebuffer \ - netsurf \ - "Network;WebBrowser" - fi - 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 %u" \ - NetSurf-gtk3 \ - netsurf \ - "Network;WebBrowser" - fi - - insinto /usr/share/pixmaps - doins frontends/gtk/res/netsurf.xpm - doman docs/netsurf-fb.1 - doman docs/netsurf-gtk.1 -}
