diff options
Diffstat (limited to 'dev-qt/qttools')
| -rw-r--r-- | dev-qt/qttools/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch | 73 |
2 files changed, 0 insertions, 74 deletions
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 5aa81ea7e655..2e634fd6d465 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,4 +1,3 @@ -AUX qttools-6.4.0-clang-15-build.patch 3466 BLAKE2B 627bb33b7b0e5a28b2a522023d18cf1275b9976ca4345c2b2c0fdf25388158d176225dd084e4b54164d79368075a199b5a00dcd936c53c55a798ce9a6400f1d5 SHA512 dd45e8827b9f0c9e725aa1ed411e5b5b8d4e626bc19afd86bab8a30c81f7d4c9430bbad3edf708e27aa4c73e2daadad9f3067095266596e7f9efecb7fb537adf DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201 SHA512 303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c EBUILD qttools-6.4.2.ebuild 1197 BLAKE2B 8f6b3572287e9eed612dc835e127564570938b956c8720d14ac123303684f4999cc6a0399c999d4769796fd0dd1dcedb915487bb802afcb9c2ec3cb3fb556d39 SHA512 f0c2896e185eccf8769fef78c9f789ea1636f162b8bef9f09296562baedf215dad326ec2ccf38996a8694e7b32cabfd765f695ef9d88c5d0c371ceda1c96df70 MISC metadata.xml 1094 BLAKE2B 0d4a81302d083669c9a2fe16e1bb7d11d2c421037eb90fa052a77db35b304f51d0d7c85d18c90527a7a546dcb0fbe72d318a26cacfc2c738967553f4e953f12f SHA512 02e76ec2ffca69115e904129f77aca35bbd9c33058636d969175c7c4e738eba61c5bceb2901ca6d3b8e6a6868f4de85b968dedd6513f2e938594574a2f4633ce diff --git a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch b/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch deleted file mode 100644 index eb2d8027cc09..000000000000 --- a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch +++ /dev/null @@ -1,73 +0,0 @@ -Gentoo Bug: https://bugs.gentoo.org/873640 -Qt Bug: https://bugreports.qt.io/browse/QTBUG-106224 -Patch: https://codereview.qt-project.org/c/qt/qttools/+/436135 - -From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de> -Date: Sat, 1 Oct 2022 07:19:52 +0200 -Subject: [PATCH] lupdate: Fix build with clang 15+ -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -The signature of InclusionDirective changed for clang 15. - -Pick-to: 6.4 -Change-Id: Ic259b3508088671b40f6f615524137ce8837c487 -Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> ---- - src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++++++++++-- - src/linguist/lupdate/lupdatepreprocessoraction.h | 7 ++++++- - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp -index abfab34e5c..d963747d8e 100644 ---- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp -+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp -@@ -156,14 +156,23 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange, - // To list the included files - void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/, - const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/, -- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file, -+ clang::CharSourceRange /*filenameRange*/, -+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) -+ const clang::Optional<clang::FileEntryRef> file, -+#else -+ const clang::FileEntry *file, -+#endif - clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/, - const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind /*fileType*/) - { - if (!file) - return; - -- clang::StringRef fileNameRealPath = file->tryGetRealPathName(); -+ clang::StringRef fileNameRealPath = file-> -+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) -+ getFileEntry(). -+#endif -+ tryGetRealPathName(); - if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str())) - return; - -diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h -index b1ee468d4e..3e44cee839 100644 ---- a/src/linguist/lupdate/lupdatepreprocessoraction.h -+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h -@@ -51,7 +51,12 @@ private: - void SourceRangeSkipped(clang::SourceRange sourceRange, clang::SourceLocation endifLoc) override; - void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/, - clang::StringRef /*fileName*/, bool /*isAngled*/, -- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file, -+ clang::CharSourceRange /*filenameRange*/, -+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) -+ const clang::Optional<clang::FileEntryRef> file, -+#else -+ const clang::FileEntry *file, -+#endif - clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/, - const clang::Module */*imported*/, - clang::SrcMgr::CharacteristicKind /*fileType*/) override; --- -2.16.3 - |