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 1CCB9158089 for ; Sat, 9 Sep 2023 16:22:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 998332BC055; Sat, 9 Sep 2023 16:22:52 +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 804102BC055 for ; Sat, 9 Sep 2023 16:22:52 +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 24959335CB7 for ; Sat, 9 Sep 2023 16:22:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56D7E116C for ; Sat, 9 Sep 2023 16:22:48 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1694276425.18d391708df3b32716f1f10f21726a860385062a.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtbase/qtbase-6.5.2-r1.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 18d391708df3b32716f1f10f21726a860385062a X-VCS-Branch: master Date: Sat, 9 Sep 2023 16:22:48 +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: 16461b76-33af-408f-9dd7-8cc871e07a98 X-Archives-Hash: e39299f56a82b77e42579fbfa073fc92 commit: 18d391708df3b32716f1f10f21726a860385062a Author: Ionen Wolkens gentoo org> AuthorDate: Sat Sep 9 14:21:28 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Sep 9 16:20:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d39170 dev-qt/qtbase: bring nls IUSE change from live to 6.5.2 About to revbump either way, so no longer concerned about this causing a no-op rebuild. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtbase/qtbase-6.5.2-r1.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild index 90d4a0ba1d4d..ba0ce93ec259 100644 --- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild @@ -24,7 +24,7 @@ declare -A QT6_IUSE=( [sql]="mysql oci8 odbc postgres +sqlite" [widgets]="cups gtk" - [optfeature]="wayland" #864509 + [optfeature]="nls wayland" #810802,864509 ) IUSE="${QT6_IUSE[*]}" REQUIRED_USE=" @@ -123,7 +123,10 @@ DEPEND=" ) " BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 -PDEPEND="wayland? ( ~dev-qt/qtwayland-${PV}:6 )" +PDEPEND=" + nls? ( ~dev-qt/qttranslations-${PV}:6 ) + wayland? ( ~dev-qt/qtwayland-${PV}:6 ) +" PATCHES=( "${FILESDIR}"/${P}-CVE-2023-38197.patch