From 0e3d667c0938409fdd48ad1da8f7fba0f8b8b2bc Mon Sep 17 00:00:00 2001
From: Jordan Henderson <jhenderson@hdfgroup.org>
Date: Tue, 17 Oct 2023 21:32:01 -0500
Subject: [PATCH] Sync with changes from develop

---
 .github/workflows/linux-auto-aocc-ompi.yml | 2 +-
 CMakeFilters.cmake                         | 7 +------
 fortran/src/H5Pff.F90                      | 2 +-
 java/src/jni/h5aImp.c                      | 2 +-
 tools/test/misc/talign.c                   | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/linux-auto-aocc-ompi.yml b/.github/workflows/linux-auto-aocc-ompi.yml
index 76b6452226c..45559105b28 100644
--- a/.github/workflows/linux-auto-aocc-ompi.yml
+++ b/.github/workflows/linux-auto-aocc-ompi.yml
@@ -4,7 +4,7 @@ on:
   push:
   pull_request:  
     branches:
-      - develop
+      - hdf5_1_14
     paths-ignore:
       - '.github/CODEOWNERS'
       - '.github/FUNDING.yml'
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index e07f3531be3..da8e2c74ff4 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -85,12 +85,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
       endif ()
     else ()
-      if (BUILD_ZLIB_WITH_FETCHCONTENT)
-        # Only tgz files available
-        ORIGINAL_ZLIB_LIBRARY ("TGZ")
-        message (VERBOSE "HDF5_ZLIB is built from fetch content")
-        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
-      elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
         message (VERBOSE "Filter HDF5_ZLIB is built")
         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index c4da8f32b06..bbc7a9dc066 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -4680,7 +4680,7 @@ SUBROUTINE h5pget_fill_value_ptr(prp_id, type_id, fillvalue, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN)  :: prp_id
     INTEGER(HID_T), INTENT(IN)  :: type_id
-    TYPE(C_PTR)   , INTENT(IN)  :: fillvalue
+    TYPE(C_PTR)                 :: fillvalue
     INTEGER       , INTENT(OUT) :: hdferr
 
     hdferr = INT(H5Pget_fill_value(prp_id, type_id, fillvalue))
diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c
index f5df09cef44..2e985e78fa8 100644
--- a/java/src/jni/h5aImp.c
+++ b/java/src/jni/h5aImp.c
@@ -1186,7 +1186,7 @@ Java_hdf_hdf5lib_H5_H5AwriteVL(JNIEnv *env, jclass clss, jlong attr_id, jlong me
     UNUSED(clss);
 
     if (NULL == buf)
-        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5AwriteVL: write buffer is NULL");
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Awrite: write buffer is NULL");
 
     if ((vl_data_class = h5str_detect_vlen(mem_type_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index b64c8ad3204..7de9d1afe5c 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -179,7 +179,7 @@ main(void)
                "                    %6f = %f\n",
                (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
                (double)fptr[2], (double)fnok[1], (double)fptr[3]);
-        puts("*FAILED - compound type alignnent problem*");
+        puts("*FAILED - compound type alignment problem*");
     }
     else {
         puts(" PASSED");