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
