From 8fdd8c91805dc6a9d0325fb5ec521ee27fd87d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Wed, 11 Oct 2023 17:05:11 +0200
Subject: [PATCH 1/2] CI: Fix version parsing and calculating for 2.0

The previous logic failed on 2.0 to make the new version number 1.99.99.
This is fixed now even though the code is not perfect or good at all but
should work well enough for its purposes.
---
 build/ci_mingw64_geany_plugins.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/ci_mingw64_geany_plugins.sh b/build/ci_mingw64_geany_plugins.sh
index 57bb05694..dff568d94 100644
--- a/build/ci_mingw64_geany_plugins.sh
+++ b/build/ci_mingw64_geany_plugins.sh
@@ -144,8 +144,13 @@ patch_version_information() {
 		MINOR="${BASH_REMATCH[2]}"
 		PATCH="${BASH_REMATCH[4]}"
 		if [ -z "${PATCH}" ] || [ "${PATCH}" = "0" ]; then
-			MINOR="$((MINOR-1))"
-			PATCH="90"
+			if [ "${MINOR}" = "0" ]; then
+				MAJOR="$((MAJOR-1))"
+				MINOR="99"
+			else
+				MINOR="$((MINOR-1))"
+			fi
+			PATCH="99"
 		else
 			PATCH="$((PATCH-1))"
 		fi

From 8a677b465fa60c77d6995b4a119755b754f0e78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= <enrico.troeger@uvena.de>
Date: Wed, 11 Oct 2023 17:05:37 +0200
Subject: [PATCH 2/2] CI: Log compiler and library versions in build output

---
 build/ci_mingw64_geany_plugins.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/ci_mingw64_geany_plugins.sh b/build/ci_mingw64_geany_plugins.sh
index dff568d94..2409d7d2a 100644
--- a/build/ci_mingw64_geany_plugins.sh
+++ b/build/ci_mingw64_geany_plugins.sh
@@ -123,7 +123,11 @@ log_environment() {
 	echo "Geany installer              : ${GEANY_INSTALLER_EXECUTABLE}"
 	echo "PATH                         : ${PATH}"
 	echo "HOST                         : ${HOST}"
-	echo "CC                           : ${CC}"
+	echo "GCC                          : $(${HOST}-gcc -dumpfullversion) ($(${HOST}-gcc -dumpversion))"
+	echo "G++                          : $(${HOST}-g++ -dumpfullversion) ($(${HOST}-g++ -dumpversion))"
+	echo "Libstdc++                    : $(dpkg-query --showformat='${Version}' --show libstdc++6:i386)"
+	echo "GLib                         : $(pkg-config --modversion glib-2.0)"
+	echo "GTK                          : $(pkg-config --modversion gtk+-3.0)"
 	echo "CFLAGS                       : ${CFLAGS}"
 	echo "Configure                    : ${CONFIGURE_OPTIONS}"
 }