commit: 75f2e1d5210faeda3ca218c64ad2e0c2b14069f5
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jan 7 19:15:38 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 15:12:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f2e1d5
dev-qt/qt-creator: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/qt-creator-11.0.2-musl-no-execinfo.patch | 47 -------
.../qt-creator/files/qt-creator-14.0.2-qt681.patch | 141 ---------------------
2 files changed, 188 deletions(-)
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>(
