From 17e27e96e2ff9db4e04c9fa8d54f13bfa48abf15 Mon Sep 17 00:00:00 2001 From: psykose Date: Tue, 4 Apr 2023 22:14:38 +0000 Subject: [PATCH] community/cppcheck: fix build with qt6.5 --- community/cppcheck/APKBUILD | 2 ++ community/cppcheck/qt6.5.patch | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 community/cppcheck/qt6.5.patch diff --git a/community/cppcheck/APKBUILD b/community/cppcheck/APKBUILD index c8512a698b7..ab3f30e8f7e 100644 --- a/community/cppcheck/APKBUILD +++ b/community/cppcheck/APKBUILD @@ -20,6 +20,7 @@ makedepends=" " subpackages="$pkgname-doc $pkgname-htmlreport::noarch $pkgname-gui" source="$pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/refs/tags/$pkgver.tar.gz + qt6.5.patch set_datadir.patch " @@ -79,5 +80,6 @@ gui() { sha512sums=" 1c737736a34f0c3412d43c95f07e47c10f64feb6d94bc4dde8a2468a3b3839468b31cfe94af30200fdd326e345ba6f4647c67e43705958885e24f8582abb9785 cppcheck-2.10.tar.gz +e2008d69ce4ba6dea3f553ae1fb6504aae290b614411a75f9b65c74018238c4dd629ac5f8e1e0a4c8ce91813b099c60b3bb3f938a1e67ccf47aa3920e6df3b2e qt6.5.patch deead176705825da12796e42ea5f4a9dfb6dfa0c816057862b41d9f8f3121c4272d0bbf98ddea88c2e63e0504ff0cf603cd5b082e6e6cf41403f2ba0377ebc2e set_datadir.patch " diff --git a/community/cppcheck/qt6.5.patch b/community/cppcheck/qt6.5.patch new file mode 100644 index 00000000000..ac853534b45 --- /dev/null +++ b/community/cppcheck/qt6.5.patch @@ -0,0 +1,39 @@ +diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp +index 4717b25..8e3b0f6 100644 +--- a/gui/projectfile.cpp ++++ b/gui/projectfile.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + ProjectFile *ProjectFile::mActiveProject; + +@@ -1040,21 +1041,21 @@ void ProjectFile::SafeChecks::saveToXml(QXmlStreamWriter &xmlWriter) const + { + if (!classes && !externalFunctions && !internalFunctions && !externalVariables) + return; +- xmlWriter.writeStartElement(Settings::SafeChecks::XmlRootName); ++ xmlWriter.writeStartElement(static_cast(Settings::SafeChecks::XmlRootName)); + if (classes) { +- xmlWriter.writeStartElement(Settings::SafeChecks::XmlClasses); ++ xmlWriter.writeStartElement(static_cast(Settings::SafeChecks::XmlClasses)); + xmlWriter.writeEndElement(); + } + if (externalFunctions) { +- xmlWriter.writeStartElement(Settings::SafeChecks::XmlExternalFunctions); ++ xmlWriter.writeStartElement(static_cast(Settings::SafeChecks::XmlExternalFunctions)); + xmlWriter.writeEndElement(); + } + if (internalFunctions) { +- xmlWriter.writeStartElement(Settings::SafeChecks::XmlInternalFunctions); ++ xmlWriter.writeStartElement(static_cast(Settings::SafeChecks::XmlInternalFunctions)); + xmlWriter.writeEndElement(); + } + if (externalVariables) { +- xmlWriter.writeStartElement(Settings::SafeChecks::XmlExternalVariables); ++ xmlWriter.writeStartElement(static_cast(Settings::SafeChecks::XmlExternalVariables)); + xmlWriter.writeEndElement(); + } + xmlWriter.writeEndElement();