From 70e4a43e67d88d8d74a74a0c35d4a313893c2b9d Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Fri, 6 Dec 2024 00:37:10 +0000
Subject: [PATCH 1/4] Squashed 'database/' changes from 1a221cd7..bf60c1ca

bf60c1ca Fix typos

git-subtree-dir: database
git-subtree-split: bf60c1ca9d528f429086991e96e445f6b3976981
---
 OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat   | 2 +-
 OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat | 2 +-
 OtherDatabases/CEMDATA18.dat                       | 2 +-
 OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat b/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat
index 1006f59b5..02b98dc6e 100644
--- a/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat
+++ b/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat
@@ -24,7 +24,7 @@ SOLUTION_MASTER_SPECIES
 
 
 #
-#  elemen     species	alk   gfw_formula element_gfw atomic number
+# element     species	alk   gfw_formula element_gfw atomic number
 #
 
 
diff --git a/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat b/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat
index c27d0cd5f..37a27609d 100644
--- a/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat
+++ b/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat
@@ -22,7 +22,7 @@ SOLUTION_MASTER_SPECIES
 
 
 #
-#  elemen     species	alk   gfw_formula element_gfw atomic number
+# element     species	alk   gfw_formula element_gfw atomic number
 #
 
 
diff --git a/OtherDatabases/CEMDATA18.dat b/OtherDatabases/CEMDATA18.dat
index 80be5ba54..961964fc5 100644
--- a/OtherDatabases/CEMDATA18.dat
+++ b/OtherDatabases/CEMDATA18.dat
@@ -18,7 +18,7 @@ SOLUTION_MASTER_SPECIES
 
 
 #
-#  elemen     species	alk   gfw_formula element_gfw atomic number
+# element     species	alk   gfw_formula element_gfw atomic number
 #
 
 
diff --git a/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat b/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat
index 0e6c024f2..23d304101 100644
--- a/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat
+++ b/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat
@@ -61,7 +61,7 @@ SOLUTION_MASTER_SPECIES
 #                                                                                                      
 #                                                                                                      
 #
-#  elemen     species        alk   gfw_formula element_gfw atomic Disposition           Source of data 
+# element     species        alk   gfw_formula element_gfw atomic Disposition           Source of data
 #                                                          number   PMATCHC    
 #
 H               H+          -1.0        H         1.008   #   1       Ele              NAGRA NTB 91-17   

From 81902db1137b0358ad478c5141ec0fdf3b973930 Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Fri, 6 Dec 2024 16:52:52 +0000
Subject: [PATCH 2/4] Squashed 'src/' changes from c369020d..b948e30d

b948e30d Exception caught in PhreeqcI. Null pointer for bad definition in SURFACE_MASTER_SPECIES. Test case surf_error added, which catches the error, but run exits.

git-subtree-dir: src
git-subtree-split: b948e30d1ef801f52c99736b58e79dcff5537e23
---
 tidy.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tidy.cpp b/tidy.cpp
index 9449e350d..c6dc3ebf3 100644
--- a/tidy.cpp
+++ b/tidy.cpp
@@ -2312,6 +2312,15 @@ tidy_species(void)
 		}
 		/* store sequence number in master structure */
 		master[i]->number = i;
+		if (master[i]->s == NULL)
+		{
+			input_error++;
+			error_string = sformatf(
+				"Species pointer is null for, %s. Check your _MASTER_ and _SPECIES definitions.",
+				master[i]->elt->name);
+			error_msg(error_string, STOP);
+		}
+
 		if (strcmp(master[i]->elt->name, "Alkalinity") != 0)
 		{
 			if (master[i]->primary == TRUE)

From 074768cba46cb1fef09cdc8e5ae54a8bed06457e Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Fri, 6 Dec 2024 16:52:54 +0000
Subject: [PATCH 3/4] Squashed 'examples/' changes from 09d4a0ba..8f9acfc7

8f9acfc7 Updated cmake_minimum_required and fixed surf_error test

git-subtree-dir: examples
git-subtree-split: 8f9acfc77c9261e87c156056b8acafc21946298f
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4da5d523e..64a40b1b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.9)
+cmake_minimum_required (VERSION 3.10)
 
 SET(phreeqc_EXAMPLES
 co2.dat

From 8891a6a9ee9743a3cad05ffb2492827dfceadd33 Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R." <charlton@usgs.gov>
Date: Fri, 3 Jan 2025 11:13:59 -0700
Subject: [PATCH 4/4] Fix source distribution string replacements

---
 jenkins-phreeqc-dist.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jenkins-phreeqc-dist.sh b/jenkins-phreeqc-dist.sh
index c64b9b2be..147328970 100755
--- a/jenkins-phreeqc-dist.sh
+++ b/jenkins-phreeqc-dist.sh
@@ -162,8 +162,10 @@ fi
 VERSION_LONG="$ver_major.$ver_minor.$ver_patch.$REVISION_SVN"
 
 SED_FILES="$DISTPATH/configure.ac \
+           $DISTPATH/phreeqc_version.h \
            $DISTPATH/doc/README.Phreeqc.TXT \
-           $DISTPATH/doc/RELEASE.TXT"
+           $DISTPATH/doc/RELEASE.TXT \
+           $DISTPATH/src/class_main.cpp"
 
 for vsn_file in $SED_FILES
 do
@@ -191,7 +193,7 @@ done
 mv $DISTPATH/doc/RELEASE.TXT           $DISTPATH/doc/RELEASE
 mv $DISTPATH/doc/README.Phreeqc.TXT    $DISTPATH/doc/README
 mv $DISTPATH/doc/NOTICE.TXT            $DISTPATH/doc/NOTICE
-mv $DISTPATH/HTMLversion/phreeqc3.chm  $DISTPATH/doc/phreeqc3.chm                
+mv $DISTPATH/HTMLversion/phreeqc3.chm  $DISTPATH/doc/phreeqc3.chm
 
 # if [ -n "$WIN" ]; then
 #   echo "Rolling $DISTNAME.zip ..."