From 23098b93faf8020124d8ee24c7632be9c5a0c847 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 22 Mar 2022 01:09:38 +0000
Subject: [PATCH] community/cppcheck to 2.7.3-1

---
 community/cppcheck/PKGBUILD            | 37 ++++++++++++++++----------
 community/cppcheck/find-tinyxml2.patch | 13 +++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 community/cppcheck/find-tinyxml2.patch

diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 9715150aa..c5c2d3bb2 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -6,7 +6,7 @@
 #  - remove makedepend on pandoc, don't generate manuals
 
 pkgname=cppcheck
-pkgver=2.7
+pkgver=2.7.3
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('x86_64')
@@ -31,24 +31,33 @@ optdepends=(
   'clang: for cppcheck-gui integration'
 )
 options=('debug')
-_commit='6ba6567ad897d56741159f8af90fc354ae050e61'
+_commit='97bf53515b8ec8db6f6f12ea15db4786e26afbc8'
 source=(
   "$pkgname::git+https://github.com/danmar/cppcheck.git#commit=$_commit"
   'translations-location.patch'
+  'find-tinyxml2.patch'
 )
 sha512sums=('SKIP'
-            'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae')
+            'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae'
+            '09b03952ea98f56ed750f3e4443dd148a8aafc68072235537c7db09aca83a11a9f28e7a573b0d63d2a1bf1b57886fd540be060d933bcec9b38d09a09426ae5ff')
 b2sums=('SKIP'
-        '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f')
+        '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f'
+        '51585895a91142fecac88e49c9c182897441ee8033638927b0cbd1c66e5345096d0b03f296a2a8ff8622ef5959b73963617e46be231c8e9a6fbc563571db7ba5')
 
 pkgver() {
   cd "$pkgname"
+
   git describe --tags
 }
 
 prepare() {
   cd "$pkgname"
+
+  # fix location of translations
   patch -p1 -i ../translations-location.patch
+
+  # fix undefined reference to tinyxml2
+  patch -p1 -i ../find-tinyxml2.patch
 }
 
 build() {
@@ -67,21 +76,21 @@ build() {
     -S "$pkgname" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DUSE_MATCHCOMPILER=yes \
-    -DHAVE_RULES=yes \
-    -DBUILD_GUI=yes \
-    -DBUILD_SHARED_LIBS=no \
-    -DBUILD_TESTS=no \
+    -DUSE_MATCHCOMPILER=ON \
+    -DHAVE_RULES=ON \
+    -DBUILD_GUI=ON \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DBUILD_TESTS=ON \
     -DFILESDIR=/usr/share/cppcheck \
-    -DUSE_BUNDLED_TINYXML2=no
+    -DUSE_BUNDLED_TINYXML2=OFF
 
   cmake --build build
 }
 
-#check() {
-#  cd build/bin
-#  ./testrunner -g -q
-#}
+check() {
+  cd build/bin
+  ./testrunner -g -q
+}
 
 package() {
   DESTDIR="$pkgdir" cmake --install build
diff --git a/community/cppcheck/find-tinyxml2.patch b/community/cppcheck/find-tinyxml2.patch
new file mode 100644
index 000000000..def3237b6
--- /dev/null
+++ b/community/cppcheck/find-tinyxml2.patch
@@ -0,0 +1,13 @@
+--- a/cmake/findDependencies.cmake
++++ b/cmake/findDependencies.cmake
+@@ -48,7 +48,9 @@ endif()
+ 
+ if (NOT USE_BUNDLED_TINYXML2)
+     find_package(tinyxml2 QUIET)
+-    if (NOT tinyxml2_FOUND)
++    if (tinyxml2_FOUND)
++        set(tinyxml2_LIBRARIES "tinyxml2")
++    else()
+         find_library(tinyxml2_LIBRARIES tinyxml2)
+         if (NOT tinyxml2_LIBRARIES)
+             message(FATAL_ERROR "tinyxml2 has not been found")