commit: b70448f5365cef1dd230ddf6502277a9205bf4c4 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Jun 12 10:27:27 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 11:30:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70448f5
dev-debug/apitrace: fix qt-6.9 patch for qt-6.9 merged status updated for other merged patches as well Closes: https://bugs.gentoo.org/957581 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42559 Closes: https://github.com/gentoo/gentoo/pull/42559 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-debug/apitrace/apitrace-12.0.ebuild | 5 ++-- .../apitrace/files/apitrace-12.0-fix_qt6.9.patch | 31 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dev-debug/apitrace/apitrace-12.0.ebuild b/dev-debug/apitrace/apitrace-12.0.ebuild index e683eb322abb..e1834260bc15 100644 --- a/dev-debug/apitrace/apitrace-12.0.ebuild +++ b/dev-debug/apitrace/apitrace-12.0.ebuild @@ -39,8 +39,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-9.0-disable-multiarch.patch - "${FILESDIR}"/${PN}-12.0-find_snappy.patch - "${FILESDIR}"/${PN}-12.0-tests.patch "${FILESDIR}"/${PN}-12.0-unbundle.patch # merged, to be removed for the next version @@ -48,6 +46,9 @@ PATCHES=( "${FILESDIR}"/${PN}-12.0-include-stdint.patch "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch "${FILESDIR}"/${PN}-12.0-bump_cmake_min.patch + "${FILESDIR}"/${PN}-12.0-find_snappy.patch + "${FILESDIR}"/${PN}-12.0-tests.patch + "${FILESDIR}"/${PN}-12.0-fix_qt6.9.patch ) src_prepare() { diff --git a/dev-debug/apitrace/files/apitrace-12.0-fix_qt6.9.patch b/dev-debug/apitrace/files/apitrace-12.0-fix_qt6.9.patch new file mode 100644 index 000000000000..aaf1faf7c0c8 --- /dev/null +++ b/dev-debug/apitrace/files/apitrace-12.0-fix_qt6.9.patch @@ -0,0 +1,31 @@ +https://github.com/apitrace/apitrace/pull/950.patch +From 3f7f0ad7781b3200377eea7257c786317b22fb26 Mon Sep 17 00:00:00 2001 +From: Nicolas PARLANT <nicolas.parl...@parhuet.fr> +Date: Thu, 12 Jun 2025 04:48:21 +0200 +Subject: [PATCH] fix qt-6.9 + +> gui/qubjson.cpp: In function QString readChar(QDataStream&): +> gui/qubjson.cpp:151:19: +> error: no matching function for call to QChar::QChar(qint8&) +> 151 | return QChar(c); + +implicit conversions are disabled for QChar::QChar with qt-6.9 + +Signed-off-by: Nicolas PARLANT <nicolas.parl...@parhuet.fr> +--- + gui/qubjson.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gui/qubjson.cpp b/gui/qubjson.cpp +index 63a2424ac..096ed7eac 100644 +--- a/gui/qubjson.cpp ++++ b/gui/qubjson.cpp +@@ -148,7 +148,7 @@ readChar(QDataStream &stream) + qint8 c; + stream >> c; + Q_ASSERT(c >= 0); +- return QChar(c); ++ return QChar(static_cast<char>(c)); + } + +
