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 779F0158099 for ; Wed, 22 Nov 2023 14:22:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A812F2BC026; Wed, 22 Nov 2023 14:22:31 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6660F2BC026 for ; Wed, 22 Nov 2023 14:22:31 +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 4CF0C335DA8 for ; Wed, 22 Nov 2023 14:22:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 714DB13B3 for ; Wed, 22 Nov 2023 14:22:28 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1700662944.9b59b019166a637a92a0fa20ef5b8dcbb035281f.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-120.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 9b59b019166a637a92a0fa20ef5b8dcbb035281f X-VCS-Branch: master Date: Wed, 22 Nov 2023 14:22:28 +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: 175570e9-06b6-40ef-9c9b-64d2c141dc16 X-Archives-Hash: e30ebeafa0e5d3ad3d5d325861d08be7 commit: 9b59b019166a637a92a0fa20ef5b8dcbb035281f Author: Joonas Niilola gentoo org> AuthorDate: Wed Nov 22 14:15:27 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Nov 22 14:22:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b59b019 www-client/firefox: update the icu patch logic to be consistent Closes: https://bugs.gentoo.org/917700 Signed-off-by: Joonas Niilola gentoo.org> www-client/firefox/firefox-120.0.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www-client/firefox/firefox-120.0.ebuild b/www-client/firefox/firefox-120.0.ebuild index cb30d6d39a34..fa5d4105f8f4 100644 --- a/www-client/firefox/firefox-120.0.ebuild +++ b/www-client/firefox/firefox-120.0.ebuild @@ -661,9 +661,10 @@ src_prepare() { fi # Workaround for bgo#917599 - if use system-icu && ! has_version ">=dev-libs/icu-74.1" ; then - rm -v "${WORKDIR}"/firefox-patches/0028-bmo-1862601-system-icu-74.patch || die + if has_version ">=dev-libs/icu-74.1" && use system-icu ; then + eapply "${WORKDIR}"/firefox-patches/0028-bmo-1862601-system-icu-74.patch fi + rm -v "${WORKDIR}"/firefox-patches/0028-bmo-1862601-system-icu-74.patch || die eapply "${WORKDIR}/firefox-patches"