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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C970715800A for ; Tue, 15 Aug 2023 00:26:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A44A2BC016; Tue, 15 Aug 2023 00:26:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C91462BC016 for ; Tue, 15 Aug 2023 00:26:05 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D23C3335DA8 for ; Tue, 15 Aug 2023 00:26:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07BADB45 for ; Tue, 15 Aug 2023 00:26:03 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1692057928.2f521c78c2ffe05fc39c5c80bdabc0a9c2699566.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/netsurf/netsurf-3.10-r6.ebuild www-client/netsurf/netsurf-3.10-r7.ebuild X-VCS-Directories: www-client/netsurf/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 2f521c78c2ffe05fc39c5c80bdabc0a9c2699566 X-VCS-Branch: master Date: Tue, 15 Aug 2023 00:26:03 +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: 7b4834b2-be3f-4325-b381-48e484a2ffc1 X-Archives-Hash: 321abad242eee4907ebd0c35c74c85a8 commit: 2f521c78c2ffe05fc39c5c80bdabc0a9c2699566 Author: Michael Orlitzky gentoo org> AuthorDate: Mon Aug 14 23:56:20 2023 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Tue Aug 15 00:05:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f521c78 www-client/netsurf: backport live ebuild improvements to ~arch Closes: https://bugs.gentoo.org/769146 Signed-off-by: Michael Orlitzky gentoo.org> ...tsurf-3.10-r6.ebuild => netsurf-3.10-r7.ebuild} | 94 +++++++++++----------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/www-client/netsurf/netsurf-3.10-r6.ebuild b/www-client/netsurf/netsurf-3.10-r7.ebuild similarity index 69% rename from www-client/netsurf/netsurf-3.10-r6.ebuild rename to www-client/netsurf/netsurf-3.10-r7.ebuild index b3f5b779a1f7..d1b77be87dfa 100644 --- a/www-client/netsurf/netsurf-3.10-r6.ebuild +++ b/www-client/netsurf/netsurf-3.10-r7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit netsurf desktop toolchain-funcs +inherit desktop netsurf toolchain-funcs DESCRIPTION="A free, open source web browser" HOMEPAGE="https://www.netsurf-browser.org/" @@ -12,48 +12,53 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta LICENSE="GPL-2 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="bmp fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng +IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg +png +psl rosprite +svg +svgtiny +webp" -REQUIRED_USE="|| ( fbcon gtk gtk2 )" +REQUIRED_USE="|| ( fbcon gtk )" RDEPEND=" - >=dev-libs/libcss-0.9 - >=net-libs/libdom-0.4.1-r1 - >=net-libs/libhubbub-0.3 - >=dev-libs/libnsutils-0.1.0 - >=dev-libs/libutf8proc-2.4 + dev-libs/libcss + dev-libs/libnsutils + dev-libs/openssl:= + dev-libs/libutf8proc dev-libs/libxml2:2 net-misc/curl - bmp? ( >=media-libs/libnsbmp-0.1 ) - fbcon? ( >=dev-libs/libnsfb-0.2.2 - truetype? ( media-fonts/dejavu - >=media-libs/freetype-2.5.0.1 ) + 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 ) - gif? ( >=media-libs/libnsgif-0.1 ) - gtk? ( dev-libs/glib:2 - x11-libs/gtk+:3 ) - gtk2? ( dev-libs/glib:2 - x11-libs/gtk+:2 ) javascript? ( - >=dev-libs/nsgenbind-0.7 + dev-libs/nsgenbind dev-lang/duktape:= ) - jpeg? ( >=virtual/jpeg-0-r2:0 ) - mng? ( >=media-libs/libmng-1.0.10-r2 ) - png? ( >=media-libs/libpng-1.2.51:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:0= ) psl? ( media-libs/libnspsl ) - rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) - svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) - !svgtiny? ( gnome-base/librsvg:2 ) ) - webp? ( >=media-libs/libwebp-0.3.0 )" + rosprite? ( media-libs/librosprite ) + svg? ( + svgtiny? ( media-libs/libsvgtiny ) + !svgtiny? ( gnome-base/librsvg:2 ) + ) + webp? ( media-libs/libwebp )" DEPEND="${RDEPEND}" BDEPEND=" - javascript? ( app-editors/vim-core ) dev-libs/check dev-perl/HTML-Parser - >=dev-util/netsurf-buildsystem-1.7-r1 + dev-util/netsurf-buildsystem virtual/pkgconfig + javascript? ( app-editors/vim-core ) " PATCHES=( @@ -63,8 +68,11 @@ PATCHES=( "${FILESDIR}/${PN}-3.10-gcc10-fno-common.patch" ) -DOCS=( README docs/using-framebuffer.md - docs/ideas/{cache,css-engine,render-library}.txt ) +DOCS=( + README + docs/using-framebuffer.md + docs/ideas/{cache,css-engine,render-library}.txt +) src_prepare() { default @@ -76,22 +84,21 @@ _emake() { 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_MNG=$(usex mng YES NO) - NETSURF_USE_WEBP=$(usex webp YES NO) - NETSURF_USE_JS=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_OPENSSL=YES NETSURF_USE_ROSPRITE=$(usex rosprite YES NO) - PKG_CONFIG=$(tc-getPKG_CONFIG) - NETSURF_FB_FONTLIB=$(usex truetype freetype internal) - NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu" + 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[@]}" $@ @@ -107,7 +114,6 @@ src_compile() { # need some mangling to ensure that svgtiny is installed. use fbcon && _emake NETSURF_USE_RSVG=NO TARGET=framebuffer - use gtk2 && _emake TARGET=gtk2 use gtk && _emake TARGET=gtk3 } @@ -128,14 +134,6 @@ src_install() { netsurf \ "Network;WebBrowser" fi - 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 %u" \ - NetSurf-gtk2 \ - netsurf \ - "Network;WebBrowser" - fi if use gtk ; then _emake TARGET=gtk3 DESTDIR="${D}" install elog "netsurf gtk3 version has been installed as netsurf-gtk3"