[java-atk-wrapper] Lower atk required version again

[Samuel Thibault <sthibaul src gnome org>]

commit 60c156b2cf8ed50f3d24b68ca54bca5371424d42
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Mon Mar 21 21:40:19 2022 +0100

    Lower atk required version again
    
    Only use ATK_STATE_COLLAPSED if atk is new enough to support it,
    and lower the atk requirement in meson.build.
    Atk needs a release, so otherwise we depend on unreleased git code.

 configure.ac      | 2 +-
 jni/src/jawutil.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/configure.ac b/configure.ac
index 75baacd..f0e7bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_CONFIG_MACRO_DIR([m4])
 m4_define([req_ver_atk], [1.18.0])
 
 PKG_CHECK_MODULES(JAW, [
-  atk >= 2.37.1
+  atk >= 2.36.0
   atk-bridge-2.0 >= 2.33.1
   atspi-2 >= 2.14.0
   dbus-1
diff --git a/jni/src/jawutil.c b/jni/src/jawutil.c
index ea94423..a6c894c 100644
--- a/jni/src/jawutil.c
+++ b/jni/src/jawutil.c
@@ -589,7 +589,11 @@ jaw_util_get_atk_state_type_from_java_state (JNIEnv *jniEnv, jobject jobj)
     return ATK_STATE_CHECKED;
 
   if (is_same_java_state( jniEnv, jobj, "COLLAPSED" ))
+#ifdef ATK_STATE_COLLAPSED
     return ATK_STATE_COLLAPSED;
+#else
+    return ATK_STATE_INVALID;
+#endif
 
   if (is_same_java_state( jniEnv, jobj, "EDITABLE" ))
     return ATK_STATE_EDITABLE;