From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1568541-garchives=archives.gentoo.org@lists.gentoo.org>
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 9F843158089
	for <garchives@archives.gentoo.org>; Tue,  7 Nov 2023 14:36:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DDD6A2BC013;
	Tue,  7 Nov 2023 14:36:20 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id C367F2BC013
	for <gentoo-commits@lists.gentoo.org>; Tue,  7 Nov 2023 14:36:20 +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 C3AE1335CDF
	for <gentoo-commits@lists.gentoo.org>; Tue,  7 Nov 2023 14:36:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 38DD71325
	for <gentoo-commits@lists.gentoo.org>; Tue,  7 Nov 2023 14:36:18 +0000 (UTC)
From: "orbea" <orbea@riseup.net>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "orbea" <orbea@riseup.net>
Message-ID: <1699367315.224624b9e8259b0a4523b5bd71a9e52659361304.orbea@gentoo>
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtbase/
X-VCS-Repository: repo/proj/libressl
X-VCS-Files: dev-qt/qtbase/metadata.xml dev-qt/qtbase/qtbase-6.5.2-r2.ebuild dev-qt/qtbase/qtbase-6.5.3-r1.ebuild dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
X-VCS-Directories: dev-qt/qtbase/
X-VCS-Committer: orbea
X-VCS-Committer-Name: orbea
X-VCS-Revision: 224624b9e8259b0a4523b5bd71a9e52659361304
X-VCS-Branch: master
Date: Tue,  7 Nov 2023 14:36:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 45a2d091-a368-4ee9-aa86-a68b2901bd33
X-Archives-Hash: 7167f0af3e4e78e08bfb92f90a15ecfe

commit:     224624b9e8259b0a4523b5bd71a9e52659361304
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Nov  7 14:28:35 2023 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Nov  7 14:28:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=224624b9

dev-qt/qtbase: sync ::gentoo

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-qt/qtbase/metadata.xml           | 1 -
 dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 1 +
 dev-qt/qtbase/qtbase-6.5.3-r1.ebuild | 4 +++-
 dev-qt/qtbase/qtbase-6.6.0-r1.ebuild | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 852224a..6156479 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
-		<flag name="brotli">Enable support for Brotli decompression</flag>
 		<flag name="concurrent">Build Qt6Concurrent module</flag>
 		<flag name="dbus">Build Qt6DBus module</flag>
 		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>

diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 7fc63cf..dd808c8 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -115,6 +115,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	<x11-libs/libxkbcommon-1.6
 	X? ( x11-base/xorg-proto )
 	gui? (
 		vulkan? ( dev-util/vulkan-headers )

diff --git a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
index cb379dc..dd5ea49 100644
--- a/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
@@ -287,9 +287,12 @@ src_test() {
 		tst_qdnslookup
 		# typical to lack SCTP support on non-generic kernels
 		tst_qsctpsocket
+		# randomly fails without -j1, and not worth it over this (bug #916181)
+		tst_qfiledialog{,2}
 		# these can be flaky depending on the environment/toolchain
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+		tst_qprinter # checks system's printers (bug #916216)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
@@ -314,7 +317,6 @@ src_test() {
 		# partially broken on llvm-musl, needs looking into but skip to have
 		# a baseline for regressions (rest of dev-qt still passes with musl)
 		$(usev elibc_musl '
-			tst_qfiledialog2
 			tst_qicoimageformat
 			tst_qimagereader
 			tst_qimage

diff --git a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
index bacb108..aa683f4 100644
--- a/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
@@ -289,9 +289,12 @@ src_test() {
 		tst_qsharedmemory
 		# typical to lack SCTP support on non-generic kernels
 		tst_qsctpsocket
+		# randomly fails without -j1, and not worth it over this (bug #916181)
+		tst_qfiledialog{,2}
 		# these can be flaky depending on the environment/toolchain
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
+		tst_qprinter # checks system's printers (bug #916216)
 		tst_qstorageinfo # checks mounted filesystems
 		# flaky due to using different test framework and fails with USE=-gui
 		tst_selftests
@@ -316,7 +319,6 @@ src_test() {
 		# partially broken on llvm-musl, needs looking into but skip to have
 		# a baseline for regressions (rest of dev-qt still passes with musl)
 		$(usev elibc_musl '
-			tst_qfiledialog2
 			tst_qicoimageformat
 			tst_qimagereader
 			tst_qimage