From c1ca8317f8dbfb5f11d2ccf751fed65b887594ea Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 27 Jun 2023 10:37:08 +0000
Subject: [PATCH] extra/cppcheck to 2.11-1

---
 extra/cppcheck/PKGBUILD                   | 23 +++++++++++++++++------
 extra/cppcheck/ftbfs-version-string.patch |  9 +++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 extra/cppcheck/ftbfs-version-string.patch

diff --git a/extra/cppcheck/PKGBUILD b/extra/cppcheck/PKGBUILD
index 34c02159a..c4639a90f 100644
--- a/extra/cppcheck/PKGBUILD
+++ b/extra/cppcheck/PKGBUILD
@@ -6,8 +6,8 @@
 #  - remove makedepend on pandoc, don't generate manuals
 
 pkgname=cppcheck
-pkgver=2.10.3
-pkgrel=2
+pkgver=2.11
+pkgrel=1
 pkgdesc='A tool for static C/C++ code analysis'
 arch=('x86_64')
 url='http://cppcheck.sourceforge.net/'
@@ -31,15 +31,18 @@ optdepends=(
   'python-pygments: cppcheck-htmlreport'
   'clang: for cppcheck-gui integration'
 )
-_commit='59030ef53dff61885c058583d2aef94f970ffdc8'
+_commit='f156b1ecb20af834d6d70a20b9485533e2b5bdaf'
 source=(
   "$pkgname::git+https://github.com/danmar/cppcheck.git#commit=$_commit"
   'translations-location.patch'
+  'ftbfs-version-string.patch'
 )
 sha512sums=('SKIP'
-            'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae')
+            'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae'
+            'd8ee5ad49e1d62571677c730b688853220ff74a6cb7d45ab35360c6c1c4819a1e064eb18835913bc62f36f6273da5d50e86d68bc9f9bf9fcd0a3dd4ff949d176')
 b2sums=('SKIP'
-        '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f')
+        '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f'
+        '3dda14b1c4530ba408884a00395e78db3bc507788a5c7f98f441650a78deec8ac22231d6473a39efbe21237beb20a31f85b6c8abf761b29ab2598a1672cee4b5')
 
 pkgver() {
   cd "$pkgname"
@@ -51,7 +54,15 @@ prepare() {
   cd "$pkgname"
 
   # fix location of translations
-  patch -p1 -i ../translations-location.patch
+  patch -p1 -i "$srcdir/translations-location.patch"
+
+  # FTBFS due to GCC13
+  git cherry-pick --no-commit f4030c4b1ae8ac3001bfc9f85e24a51ad2f08d79
+
+  # FTBFS due to version string
+  # https://sourceforge.net/p/cppcheck/discussion/general/thread/12b363e1af/
+  # https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
+  patch -p1 -i "$srcdir/ftbfs-version-string.patch"
 }
 
 build() {
diff --git a/extra/cppcheck/ftbfs-version-string.patch b/extra/cppcheck/ftbfs-version-string.patch
new file mode 100644
index 000000000..770e50788
--- /dev/null
+++ b/extra/cppcheck/ftbfs-version-string.patch
@@ -0,0 +1,9 @@
+--- a/cmake/versions.cmake
++++ b/cmake/versions.cmake
+@@ -1,5 +1,5 @@
+ # Version for libraries CPP
+-SET(VERSION "2.11")
++SET(VERSION "2.11.0")
+ STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
+ LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
+ LIST(GET VERSION_PARTS 1 VERSION_MINOR)