diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-05-05 20:09:51 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-05-05 20:41:38 -0400 |
| commit | 75c319b193950fbdd168f96adf0e6cbd441496b0 (patch) | |
| tree | eeb875fd90ba274d47aefe9f51861d3708a9a1d8 /dev-qt/qt-creator | |
| parent | dev-qt/qt-creator: drop 12.0.2 (diff) | |
| download | gentoo-75c319b193950fbdd168f96adf0e6cbd441496b0.tar.gz gentoo-75c319b193950fbdd168f96adf0e6cbd441496b0.tar.bz2 gentoo-75c319b193950fbdd168f96adf0e6cbd441496b0.zip | |
dev-qt/qt-creator: fix build with upcoming Qt6.7.1
6.7.1 is (currently) due to release in ~2 days and it seems
unlikely qt-creator-13.0.1 will release before then.
Patch should be safe so doing straight-to-stable to spare
users from a revbump long rebuild.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qt-creator')
| -rw-r--r-- | dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch | 29 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch new file mode 100644 index 000000000000..986f328fa8eb --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch @@ -0,0 +1,29 @@ +Building with Qt6.7.1 needs [1] and a part of [2]+[3]. [2] was intended +to fix building with Qt6.8 but turned out part of it was needed for 6.7.1 +and this was adjusted in [3]. [2] does not apply cleanly so only taking +the bit needed given 6.8 can wait for a proper release. + +[1] https://github.com/qt-creator/qt-creator/commit/041727fb2 +[2] https://github.com/qt-creator/qt-creator/commit/6babc022d +[3] https://github.com/qt-creator/qt-creator/commit/fcf2d2064 +--- a/src/libs/utils/fsengine/fsengine_impl.h ++++ b/src/libs/utils/fsengine/fsengine_impl.h +@@ -52,4 +52,7 @@ + uint ownerId(FileOwner) const override; + QString owner(FileOwner) const override; ++ #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1) ++ using FileTime = QFile::FileTime; ++ #endif + bool setFileTime(const QDateTime &newDate, FileTime time) override; + QDateTime fileTime(FileTime time) const override; +--- a/src/plugins/languageclient/languageclientutils.cpp ++++ b/src/plugins/languageclient/languageclientutils.cpp +@@ -236,6 +236,6 @@ + Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument()); + +- ClientExtras *extras = widget->findChild<ClientExtras *>(clientExtrasName, +- Qt::FindDirectChildrenOnly); ++ ClientExtras *extras = dynamic_cast<ClientExtras *>( ++ widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly)); + if (!extras) { + if (!client) diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild index fb3c7244f96b..12edbaa8754c 100644 --- a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild @@ -88,6 +88,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch + "${FILESDIR}"/${P}-qt671.patch ) pkg_setup() { |