summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-02-10 19:44:00 +0100
committerAlfredo Tupone <tupone@gentoo.org>2023-02-23 22:01:21 +0100
commit9e730d89d81a691257e2071cb245c8a2854c46cb (patch)
tree82a33b0a8d1500f5865f8351b8797b7d2627a49b /dev-qt
parentmedia-video/pipewire: Stabilize 0.3.65-r3 ppc64, #896026 (diff)
downloadgentoo-9e730d89d81a691257e2071cb245c8a2854c46cb.tar.gz
gentoo-9e730d89d81a691257e2071cb245c8a2854c46cb.tar.bz2
gentoo-9e730d89d81a691257e2071cb245c8a2854c46cb.zip
dev-qt/qttools: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29536 Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch73
1 files changed, 0 insertions, 73 deletions
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
-