From dd8e0df789ecf9e15f1711be90d1444700dc0350 Mon Sep 17 00:00:00 2001
From: 4fury <lilian2water@gmail.com>
Date: Sun, 28 Jun 2020 09:07:41 +0300
Subject: [PATCH] cppcheck: version bump with gui.

---
 programming/tool/cppcheck/actions.py | 27 +++++++++-----
 programming/tool/cppcheck/pspec.xml  | 53 +++++++++++++++++++++++++---
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/programming/tool/cppcheck/actions.py b/programming/tool/cppcheck/actions.py
index 3d6659c8fb..342f16af11 100644
--- a/programming/tool/cppcheck/actions.py
+++ b/programming/tool/cppcheck/actions.py
@@ -4,21 +4,32 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import autotools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-t = 'FILESDIR=/usr/share/cppcheck CFGDIR=/usr/share/cppcheck/cfg'
+j = "-DHAVE_RULES=ON \
+     -DBUILD_GUI=ON \
+     -DWITH_QCHART=ON \
+     -DENABLE_CHECK_INTERNAL=ON -L \
+    "
+
+def setup():
+	shelltools.makedirs("build")
+	shelltools.cd("build")
+	cmaketools.configure("-DUSE_Z3=OFF -DBUILD_TESTS=OFF %s" % j, sourceDir = '..')
 
 def build():
-	pisitools.cxxflags.add("-DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function")
-	autotools.make("MATCHCOMPILER=yes %s HAVE_RULES=yes" % t)
+	shelltools.cd("build")
+	cmaketools.make()
 
-def check():
-	autotools.make("check %s" % t)
+#def check():
+#	cmaketools.make("test")
 
 def install():
-	autotools.rawInstall("DESTDIR=%s %s" % (get.installDIR(), t))
+	shelltools.cd("build")
+	cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-	pisitools.dodoc("AUTHORS", "COPYING", "readme*")
+	pisitools.dodoc("../AUTHORS", "../COPYING", "../readme*")
 
diff --git a/programming/tool/cppcheck/pspec.xml b/programming/tool/cppcheck/pspec.xml
index 319293ef68..bcc3fcb079 100644
--- a/programming/tool/cppcheck/pspec.xml
+++ b/programming/tool/cppcheck/pspec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
 	<Source>
 		<Name>cppcheck</Name>
@@ -15,25 +15,70 @@
 		<Description>
 			 Cppcheck is a static analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code (i.e. have very few false positives).
 		</Description>
-		<Archive sha1sum="852d69a60b6caf023a3420943ebdc29e99fd0349" type="targz">https://github.com/danmar/cppcheck/archive/1.90.tar.gz</Archive>
+		<Archive sha1sum="e59758410408fa0679df06e8c3f3dd4e8c930d00" type="targz">
+			https://github.com/danmar/cppcheck/archive/2.1.tar.gz
+		</Archive>
 		<BuildDependencies>
+			<Dependency>cmake</Dependency>
+			<Dependency>python3</Dependency>
+			<!-- <Dependency>z3-devel</Dependency> -->
+			<Dependency>zlib-devel</Dependency>
+			<Dependency>qt5-linguist</Dependency>
 			<Dependency>libpcre-devel</Dependency>
+			<Dependency>libxslt-devel</Dependency>
+			<Dependency>qt5-base-devel</Dependency>
+			<Dependency>tinyxml2-devel</Dependency>
+			<Dependency>qt5-charts-devel</Dependency>
 		</BuildDependencies>
+		<Patches>
+			<Patch level="1">qm_install_path.patch</Patch>
+		</Patches>
 	</Source>
 
 	<Package>
 		<Name>cppcheck</Name>
 		<RuntimeDependencies>
+			<!-- <Dependency>z3</Dependency> -->
 			<Dependency>libgcc</Dependency>
+			<Dependency>libpcre</Dependency>
+			<Dependency>python3</Dependency>
+			<Dependency>python3-Pygments</Dependency>
 		</RuntimeDependencies>
 		<Files>
-			<Path fileType="executable">/usr/bin</Path>
-			<Path fileType="data">/usr/share/cppcheck</Path>
+			<Path fileType="executable">/usr/bin/cppcheck</Path>
+			<Path fileType="data">/usr/share</Path>
+			<!-- <Path fileType="man">/usr/share/man</Path> -->
 			<Path fileType="doc">/usr/share/doc</Path>
 		</Files>
 	</Package>
 
+	<Package>
+		<IsA>app:gui</IsA>
+		<Name>cppcheck-gui</Name>
+		<RuntimeDependencies>
+			<Dependency release="current">cppcheck</Dependency>
+			<!-- <Dependency>z3</Dependency> -->
+			<Dependency>libgcc</Dependency>
+			<Dependency>libpcre</Dependency>
+			<Dependency>qt5-base</Dependency>
+			<Dependency>qt5-charts</Dependency>
+		</RuntimeDependencies>
+		<Files>
+			<Path fileType="executable">/usr/bin/cppcheck-gui</Path>
+			<Path fileType="data">/usr/share/applications</Path>
+			<Path fileType="data">/usr/share/icons</Path>
+			<Path fileType="localedata">/usr/share/Cppcheck/lang</Path>
+		</Files>
+	</Package>
+
 	<History>
+		<Update release="3">
+			<Date>2020-06-27</Date>
+			<Version>2.1</Version>
+			<Comment>Ver. bump</Comment>
+			<Name>fury</Name>
+			<Email>wascheme@tuta.io</Email>
+		</Update>
 		<Update release="2">
 			<Date>2020-04-16</Date>
 			<Version>1.90</Version>