diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-01-10 06:41:31 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-10 06:41:31 +0000 |
commit | f9d8ddaae80afb8fa0924cd3f769f9b37dd373e1 (patch) | |
tree | d8962e6446d606b8c95329b4b78932a65f928a5f /dev-qt | |
parent | d94fef9a5708b8e64f363f4a71f0b56caef5efe4 (diff) |
gentoo auto-resync : 10:01:2025 - 06:41:30
Diffstat (limited to 'dev-qt')
-rw-r--r-- | dev-qt/Manifest.gz | bin | 11889 -> 11890 bytes | |||
-rw-r--r-- | dev-qt/qt-creator/Manifest | 2 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch | 47 | ||||
-rw-r--r-- | dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch | 141 |
4 files changed, 0 insertions, 190 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 0fa9cc18d8ef..ddc1bec02e72 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 421d1ffa47df..3e4da86b871d 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,7 +1,5 @@ -AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4 AUX qt-creator-12.0.0-musl-no-malloc-trim.patch 343 BLAKE2B 9c4b87a0de20616dc8cf5da4523c347f963c3459efdd9a716387690775f96abe0bb60bf0e147dd01ded79a110d1222b4009b17cece71998b46d62dd8b83eeac6 SHA512 6a0807bab971a795a156f974dab2b12699a4c90a6c7380e2dd0a136ba44354791ef7a178f79e61100c3165ec7667a72d6ca7f3c43f4958ccf9e8611995ca191d AUX qt-creator-14.0.1-clang19.patch 1046 BLAKE2B 2d1fefe8c48d448d51ca5c25e5f91cc178300312e8f420055a15e0bfecf5d916244460bbc6d9acff738116f3a2e272a7ab758bd6cf5884286e5e8013a2801656 SHA512 39e164ba1efe0b6fea70ec8ff62f0f46fa376f1ee85e450c67da1f6ba5ed00d571f94b4976be4b4f1e87ffcf56a5585761a5a1a319df67d17a56a13061e1303f -AUX qt-creator-14.0.2-qt681.patch 6003 BLAKE2B 2243b5779a6948308367430528b183c4981f634481cd161b1c2ea45980c0b81ee409e8705965bc6ebbe91e6779f7c67cc6674ddc381c0c83c0829ae18d1ca621 SHA512 973bf5df6ad1e781ad6b44eef2c988ece636e7b57554f8ef4ecb43f6577c824c8e0669ae89cc6e4ebdcafdf592e235841844d4cbe3b350f8b463a41e5b3c66cd AUX qt-creator-15.0.0-musl-no-execinfo.patch 1313 BLAKE2B acbc23f4e943f1d5942b8f91e75acefb24d8d396a37d15965892ef6da60891c92824628d1e719762273c5fce6752812b6d50a18b4536484c8e20cd9d5100ea62 SHA512 644c7f8337a8a7c66fbcea9f2d097ba508eea9b7a3550bcf4b3dfc267c14d5c2b9d517c0ff092aa101fd902b98af44133ac81f1ba1a5fdbe1251dda45677447d DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0 SHA512 52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05 SHA512 0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279 diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch deleted file mode 100644 index b36cfef2d4e7..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch +++ /dev/null @@ -1,47 +0,0 @@ -execinfo is unavailable with musl (unless opted to package+use libexecinfo) ---- a/src/libs/utils/qtcassert.cpp -+++ b/src/libs/utils/qtcassert.cpp -@@ -9,5 +9,5 @@ - #include <QTime> - --#if defined(Q_OS_UNIX) -+#if defined(Q_OS_UNIX) && defined(__GLIBC__) - #include <stdio.h> - #include <signal.h> -@@ -30,5 +30,5 @@ - if (maxdepth < 0 || maxdepth > ArraySize) - maxdepth = ArraySize; --#if defined(Q_OS_UNIX) -+#if defined(Q_OS_UNIX) && defined(__GLIBC__) - void *bt[ArraySize] = {nullptr}; - int size = backtrace(bt, maxdepth); ---- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp -+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp -@@ -4,5 +4,5 @@ - #include "exception.h" - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - #include <execinfo.h> - #include <cxxabi.h> -@@ -31,5 +31,5 @@ - namespace QmlDesigner { - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - const char* demangle(const char* name) - { -@@ -76,5 +76,5 @@ - } - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - static QString getBackTrace() - { -@@ -114,5 +114,5 @@ - , m_file(QString::fromUtf8(file)) - , m_description(description) -- #ifdef Q_OS_LINUX -+ #if defined(Q_OS_LINUX) && defined(__GLIBC__) - , m_backTrace(getBackTrace()) - #endif diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch deleted file mode 100644 index 0dbe75feb7c4..000000000000 --- a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch +++ /dev/null @@ -1,141 +0,0 @@ -Backport of [1]+[2] to fix tests with Qt6.8.0 and build with Qt6.8.1. - -There was some refactoring in these files which prevent anything from -applying cleanly, so this was manually rebased -- hopefully correct -(fsengine tests pass again, so it should be fine). - -[1] https://github.com/qt-creator/qt-creator/commit/81d4e8a3742 -[2] https://github.com/qt-creator/qt-creator/commit/f993fb76ded ---- a/src/libs/utils/fsengine/diriterator.h -+++ b/src/libs/utils/fsengine/diriterator.h -@@ -16,4 +16,36 @@ - namespace Internal { - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) -+inline std::pair<QDir::Filters, QDirIterator::IteratorFlags> convertQDirListingIteratorFlags( -+ QDirListing::IteratorFlags flags) -+{ -+ QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::System | QDir::NoDotAndDotDot; -+ QDirIterator::IteratorFlags iteratorFlags = QDirIterator::NoIteratorFlags; -+ -+ if (flags & QDirListing::IteratorFlag::ExcludeFiles) -+ filters.setFlag(QDir::Files, false); -+ if (flags & QDirListing::IteratorFlag::ExcludeDirs) -+ filters.setFlag(QDir::Dirs, false); -+ if (flags & QDirListing::IteratorFlag::ExcludeSpecial) -+ filters.setFlag(QDir::System, false); -+ if (flags & QDirListing::IteratorFlag::CaseSensitive) -+ filters.setFlag(QDir::CaseSensitive, true); -+ if (flags & QDirListing::IteratorFlag::IncludeHidden) -+ filters.setFlag(QDir::Hidden, true); -+ -+ if (flags & QDirListing::IteratorFlag::IncludeDotAndDotDot) { -+ filters.setFlag(QDir::NoDot, false); -+ filters.setFlag(QDir::NoDotDot, false); -+ } -+ -+ if (flags & QDirListing::IteratorFlag::Recursive) -+ iteratorFlags.setFlag(QDirIterator::Subdirectories, true); -+ if (flags & QDirListing::IteratorFlag::FollowDirSymlinks) -+ iteratorFlags.setFlag(QDirIterator::FollowSymlinks, true); -+ -+ return {filters, iteratorFlags}; -+} -+#endif -+ - class DirIterator : public QAbstractFileEngineIterator - { ---- a/src/libs/utils/fsengine/fixedlistfsengine.h -+++ b/src/libs/utils/fsengine/fixedlistfsengine.h -@@ -67,8 +67,14 @@ - - #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) -- IteratorUniquePtr beginEntryList(const QString &path, -- QDir::Filters filters, -- const QStringList &filterNames) override -+ QAbstractFileEngine::IteratorUniquePtr beginEntryList( -+ const QString &path, -+ QDirListing::IteratorFlags itFlags, -+ const QStringList &filterNames) override - { -+ // We do not support recursive or following symlinks for the Fixed List engine. -+ Q_ASSERT(itFlags.testFlag(QDirListing::IteratorFlag::Recursive) == false); -+ -+ const auto [filters, _] = convertQDirListingIteratorFlags(itFlags); -+ - return std::make_unique<DirIterator>(m_children, path, filters, filterNames); - } ---- a/src/libs/utils/fsengine/fsengine_impl.cpp -+++ b/src/libs/utils/fsengine/fsengine_impl.cpp -@@ -297,11 +297,25 @@ - - #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) --QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(const QString &path, -- QDir::Filters filters, -- const QStringList &filterNames) -+QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList( -+ const QString &path, QDirListing::IteratorFlags itFlags, const QStringList &filterNames) -+{ -+ const auto [filters, iteratorFlags] = convertQDirListingIteratorFlags(itFlags); -+ -+ FilePaths paths{m_filePath.pathAppended(".")}; -+ m_filePath.iterateDirectory( -+ [&paths](const FilePath &p, const FilePathInfo &fi) { -+ paths.append(p); -+ FilePathInfoCache::CachedData *data -+ = new FilePathInfoCache::CachedData{fi, QDateTime::currentDateTime().addSecs(60)}; -+ g_filePathInfoCache.cache(p, data); -+ return IterationPolicy::Continue; -+ }, -+ {filterNames, filters, iteratorFlags}); -+ -+ return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames); -+} - #else - QAbstractFileEngine::Iterator *FSEngineImpl::beginEntryList(QDir::Filters filters, - const QStringList &filterNames) --#endif - { - FilePaths paths{m_filePath.pathAppended(".")}; -@@ -317,10 +331,7 @@ - {filterNames, filters}); - --#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) -- return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames); --#else - return new DirIterator(std::move(paths)); --#endif - } -+#endif - - qint64 FSEngineImpl::read(char *data, qint64 maxlen) ---- a/src/libs/utils/fsengine/fsengine_impl.h -+++ b/src/libs/utils/fsengine/fsengine_impl.h -@@ -60,7 +60,10 @@ - - #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) -- IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, -- const QStringList &filterNames) override; -- IteratorUniquePtr endEntryList() override { return {}; } -+ IteratorUniquePtr beginEntryList( -+ const QString &path, -+ QDirListing::IteratorFlags filters, -+ const QStringList &filterNames) final; -+ -+ IteratorUniquePtr endEntryList() final { return {}; } - #else - Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; ---- a/src/libs/utils/fsengine/fsenginehandler.cpp -+++ b/src/libs/utils/fsengine/fsenginehandler.cpp -@@ -23,7 +23,8 @@ - public: - #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) -- IteratorUniquePtr beginEntryList(const QString &path, -- QDir::Filters filters, -- const QStringList &filterNames) override -+ IteratorUniquePtr beginEntryList( -+ const QString &path, -+ QDirListing::IteratorFlags filters, -+ const QStringList &filterNames) override - { - return std::make_unique<FileIteratorWrapper>( |