diff options
Diffstat (limited to 'dev-qt/qttools')
| -rw-r--r-- | dev-qt/qttools/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch | 73 | ||||
| -rw-r--r-- | dev-qt/qttools/qttools-6.4.0.ebuild | 55 |
3 files changed, 131 insertions, 0 deletions
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index 217616b40311..e59818d09ccb 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,3 +1,6 @@ +AUX qttools-6.4.0-clang-15-build.patch 3466 BLAKE2B 627bb33b7b0e5a28b2a522023d18cf1275b9976ca4345c2b2c0fdf25388158d176225dd084e4b54164d79368075a199b5a00dcd936c53c55a798ce9a6400f1d5 SHA512 dd45e8827b9f0c9e725aa1ed411e5b5b8d4e626bc19afd86bab8a30c81f7d4c9430bbad3edf708e27aa4c73e2daadad9f3067095266596e7f9efecb7fb537adf DIST qttools-everywhere-src-6.3.2.tar.xz 8629400 BLAKE2B 594f7f31e0f10006d1c58d26c5ae13b7f9c8b5770adaddee90a176676dff2029215501d01d599da0656876cd6f8b97275754a9b8c37735412154ca3f458656b3 SHA512 ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1 +DIST qttools-everywhere-src-6.4.0.tar.xz 8738432 BLAKE2B 0bd6c3e1e4badf16ec74209c1ddc45820bee9403753b6603000fcad8e82b5ee73b4df0f4d346de5c855e0b545e43c17b11ba5702e9caa5b8b2e6280d82a3fab5 SHA512 ff4ed95491d26227b3bfea665fe810572f537a295dda0cffa26b18525961026db0471e7ef04667e3e4b8ae6b92dbedccb0fa77d733274c34d489d448b961ab44 EBUILD qttools-6.3.2.ebuild 1234 BLAKE2B 2693a2600cfc2eb0fe0d58c1faf8d4084c38edde874a2305e29f6ede3358d80d12cc9cdc9bf6325b9e1f3f98686b60d3e3800867906fbf7e080fd17e54f51d33 SHA512 455bf9d086977b1b2fb791f9e1514d7fe2af67e22734a27788cc4553fb2575a2c3f4264ca1f7e7a8ebc731caab8fdd62ea0f777705a05935be24ae061ea8b050 +EBUILD qttools-6.4.0.ebuild 1271 BLAKE2B c329bd5a691852eeaddb9d47a0d5dbbd04276c112d4551f6f4e504a0b669513fc82c6aabf45eb839124849359e8c0b1eb6767c97d4d0bd234cf91bbb7bc581b9 SHA512 19db05c5e19c8d583d03fd674aa82aed143b75f5bc180c19d9607fbd471ad9ca0010b464466fb5598035bb5e5f771d41d63ca055e8b321f5ecac0f832bdb90ad 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 new file mode 100644 index 000000000000..eb2d8027cc09 --- /dev/null +++ b/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch @@ -0,0 +1,73 @@ +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 + diff --git a/dev-qt/qttools/qttools-6.4.0.ebuild b/dev-qt/qttools/qttools-6.4.0.ebuild new file mode 100644 index 000000000000..6aa7cb05da97 --- /dev/null +++ b/dev-qt/qttools/qttools-6.4.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Qt Tools Collection" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + assistant designer distancefieldgenerator +linguist pixeltool + qdbus qdoc qtattributionsscanner qtdiag qtplugininfo +" + +DEPEND=" + =dev-qt/qtbase-${PV}*[network] + assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] ) + designer? ( =dev-qt/qtbase-${PV}*[widgets] ) + distancefieldgenerator? ( + =dev-qt/qtbase-${PV}*[widgets] + =dev-qt/qtdeclarative-${PV}* + ) + pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) + qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) + qdoc? ( sys-devel/clang:= ) + qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-6.4.0-clang-15-build.patch" # Bug 873640 +) + +src_configure() { + local mycmakeargs=( + $(qt_feature assistant) + -DQT_FEATURE_commandlineparser=ON + $(qt_feature designer) + $(qt_feature distancefieldgenerator) + $(qt_feature linguist) + $(qt_feature pixeltool) + $(qt_feature qdbus) + $(qt_feature qdoc clang) + $(qt_feature qtattributionsscanner) + $(qt_feature qtdiag) + $(qt_feature qtplugininfo) + -DQT_FEATURE_thread=ON + ) + + qt6-build_src_configure +} |