From fa2975229932c9b4eadbf0c7a249d4d8d541cdbb Mon Sep 17 00:00:00 2001
From: Lex Trotman <elextr@gmail.com>
Date: Tue, 13 Feb 2024 23:25:30 +0100
Subject: [PATCH 1/2] Add missing sign for cppcheck --template argument

Closes #1304.
---
 build/cppcheck.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cppcheck.mk b/build/cppcheck.mk
index 77b5bbf79..e1a5e01e0 100644
--- a/build/cppcheck.mk
+++ b/build/cppcheck.mk
@@ -3,7 +3,7 @@ if HAVE_CPPCHECK
 
 check-cppcheck: $(srcdir)
 	$(CPPCHECK) \
-		-q --template gcc --error-exitcode=2 \
+		-q --template=gcc --error-exitcode=2 \
 		--library=$(top_srcdir)/build/cppcheck-geany-plugins.cfg \
 		-I$(GEANY_INCLUDEDIR)/geany \
 		$(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \

From 146abc696b2d40ba6178328df4184794e40ce106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Sat, 17 Feb 2024 11:24:52 +0100
Subject: [PATCH 2/2] Add more custom macro definitions for recent cppcheck
 versions

---
 build/cppcheck-geany-plugins.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/cppcheck-geany-plugins.cfg b/build/cppcheck-geany-plugins.cfg
index e94b40f9a..88fbe8ec8 100644
--- a/build/cppcheck-geany-plugins.cfg
+++ b/build/cppcheck-geany-plugins.cfg
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <def format="2">
+  <!-- Geany-Plugins macros -->
+  <define name="PLUGIN" value="&quot;foo&quot;"/>
+  <!-- GLib macros -->
+  <define name="G_GSSIZE_FORMAT" value="&quot;li&quot;"/>
+  <define name="G_GINT64_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_DIR_SEPARATOR_S" value="&quot;/&quot;"/>
   <define name="G_DEFINE_TYPE(TN, t_n, T_P)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE(TypeName,type_name,copy_func,free_func)" value=""/>
 </def>