From 6e489d15e500ffb096c36590927fd9881ff577d1 Mon Sep 17 00:00:00 2001
From: "Emily M. Boudreaux" <emily@boudreauxmail.com>
Date: Fri, 28 Nov 2025 07:52:38 -0500
Subject: [PATCH] fix(gcc): Fixed gcc build errors and warnings

Brought in libcomposition v2.2.1 and libplugin v0.3.5 which resolve gcc
build errors and warnings
---
 .gitignore                      | 4 ++++
 meson.build                     | 2 +-
 subprojects/libcomposition.wrap | 2 +-
 subprojects/libplugin.wrap      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7aece23..c759f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,9 @@ subprojects/liblogging/
 subprojects/eigen-*/
 !subprojects/pybind11.wrap
 subprojects/libplugin/
+subprojects/minizip-ng-*
 subprojects/.wraplock
+subprojects/openssl-*
 
 *.csv
 *.dot
@@ -83,6 +85,8 @@ subprojects/.wraplock
 qhull.wrap
 quill.wrap
 yaml-cpp.wrap
+minizip-ng.wrap
+openssl.wrap
 
 .vscode/
 
diff --git a/meson.build b/meson.build
index 6203041..bc4498f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('fourdst', 'cpp', version: 'v0.9.7', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
+project('fourdst', 'cpp', version: 'v0.9.8', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
 
 add_project_arguments('-fvisibility=default', language: 'cpp')
 
diff --git a/subprojects/libcomposition.wrap b/subprojects/libcomposition.wrap
index bd6eb99..af9ba14 100644
--- a/subprojects/libcomposition.wrap
+++ b/subprojects/libcomposition.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://github.com/4D-STAR/libcomposition.git
-revision = v2.2.0
+revision = v2.2.1
 depth = 1
diff --git a/subprojects/libplugin.wrap b/subprojects/libplugin.wrap
index 6246bf3..d8f8754 100644
--- a/subprojects/libplugin.wrap
+++ b/subprojects/libplugin.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://github.com/4D-STAR/libplugin.git
-revision = v0.3.4
+revision = v0.3.5
 depth = 1