From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 96B51158200 for ; Tue, 16 Sep 2025 05:04:01 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7D0F1341F19 for ; Tue, 16 Sep 2025 05:04:01 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7AA6A110571; Tue, 16 Sep 2025 05:04:00 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 6F01B110571 for ; Tue, 16 Sep 2025 05:04:00 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 264B8340F15 for ; Tue, 16 Sep 2025 05:04:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B730A323C for ; Tue, 16 Sep 2025 05:03:58 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1757998663.9e186426c3b4ebbc99279e0aa1eec83d5d123c5f.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/dillo/dillo-3.2.0.ebuild www-client/dillo/dillo-9999.ebuild X-VCS-Directories: www-client/dillo/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 9e186426c3b4ebbc99279e0aa1eec83d5d123c5f X-VCS-Branch: master Date: Tue, 16 Sep 2025 05:03:58 +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: 22efdd24-7411-41ef-9b89-17e44da43dad X-Archives-Hash: 7238ff82dc2170366873d6a96168f41b commit: 9e186426c3b4ebbc99279e0aa1eec83d5d123c5f Author: Viorel Munteanu gentoo org> AuthorDate: Mon Sep 15 18:58:35 2025 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Tue Sep 16 04:57:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e186426 www-client/dillo: sync live ebuild Signed-off-by: Viorel Munteanu gentoo.org> www-client/dillo/dillo-3.2.0.ebuild | 27 ++++++++++++++------ www-client/dillo/dillo-9999.ebuild | 49 ++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/www-client/dillo/dillo-3.2.0.ebuild b/www-client/dillo/dillo-3.2.0.ebuild index 9146ea7cf57b..150de4906b5e 100644 --- a/www-client/dillo/dillo-3.2.0.ebuild +++ b/www-client/dillo/dillo-3.2.0.ebuild @@ -8,11 +8,20 @@ inherit autotools toolchain-funcs virtualx xdg-utils DESCRIPTION="Lean FLTK based web browser" HOMEPAGE="https://dillo-browser.github.io/" -SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2" -LICENSE="GPL-3+" -SLOT="0" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dillo-browser/dillo.git" +else + SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" + + PATCHES=( + "${FILESDIR}/dillo-3.2.0-mbedtls-3.patch" + ) +fi -KEYWORDS="~amd64 ~x86" +LICENSE="GPL-3" +SLOT="0" IUSE="debug doc +gif +jpeg mbedtls +png +ssl +openssl +xembed" REQUIRED_USE=" ssl? ( || ( openssl mbedtls ) ) @@ -46,10 +55,6 @@ BDEPEND=" DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" -PATCHES=( - "${FILESDIR}/dillo-3.2.0-mbedtls-3.patch" -) - src_prepare() { default eautoreconf @@ -68,6 +73,12 @@ src_configure() { --enable-ipv6 ) + if [[ ${PV} == *9999* ]]; then + myeconfargs+=( + --enable-svg # Vendored nanosvg dep, no point in disabling + ) + fi + use mbedtls && myeconfargs+=( --with-mbedtls-inc="${ESYSROOT}/usr/include/mbedtls3" ) diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild index c660f5759b1b..150de4906b5e 100644 --- a/www-client/dillo/dillo-9999.ebuild +++ b/www-client/dillo/dillo-9999.ebuild @@ -14,6 +14,10 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2" KEYWORDS="~amd64 ~x86" + + PATCHES=( + "${FILESDIR}/dillo-3.2.0-mbedtls-3.patch" + ) fi LICENSE="GPL-3" @@ -30,26 +34,23 @@ RDEPEND=" jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.2:= ) ssl? ( - mbedtls? ( net-libs/mbedtls:0= ) + mbedtls? ( net-libs/mbedtls:3= ) openssl? ( dev-libs/openssl:= ) ) - test? ( - media-fonts/dejavu - media-gfx/imagemagick[X] - x11-apps/xwd - x11-apps/xwininfo - ) " - -DEPEND=" - ${RDEPEND} -" - +DEPEND="${RDEPEND}" BDEPEND=" doc? ( app-text/doxygen[dot] app-text/texlive ) + test? ( + media-fonts/dejavu + media-gfx/imagemagick[X] + x11-apps/xwd + x11-apps/xwininfo + x11-base/xorg-server[xvfb] + ) " DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" @@ -69,10 +70,18 @@ src_configure() { $(use_enable png) $(use_enable ssl tls) $(use_enable xembed) - --enable-svg # Vendored nanosvg dep, no point in disabling --enable-ipv6 ) + if [[ ${PV} == *9999* ]]; then + myeconfargs+=( + --enable-svg # Vendored nanosvg dep, no point in disabling + ) + fi + + use mbedtls && myeconfargs+=( + --with-mbedtls-inc="${ESYSROOT}/usr/include/mbedtls3" + ) use test && myeconfargs+=( --enable-html-tests=yes ) econf "${myeconfargs[@]}" @@ -87,8 +96,18 @@ src_compile() { } src_test() { + # Prepare test framework (#942051) + local test_dir="${WORKDIR}/build-test" + emake DESTDIR="${test_dir}" install + mkdir -p "${HOME}/.dillo/" || die + + # dillo expects dpid binary in homedir + cp "${test_dir}"/etc/dillo/* dpid/dpid "${HOME}/.dillo/" || die + sed -e "s|[@]libdir[@]|${test_dir}/usr/$(get_libdir)|;s|[@]EXEEXT[@]||g" \ + dpid/dpidrc.in > "${HOME}/.dillo/dpidrc" || die + # The test suite consistently fails with -jN in portage - virtx emake -j1 check + DILLOBIN="${test_dir}/usr/bin/dillo" virtx emake -j1 check } src_install() { @@ -99,8 +118,10 @@ src_install() { pkg_postinst() { xdg_desktop_database_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update + xdg_icon_cache_update }