Bug#1035628: unblock: java-atk-wrapper/0.40.0-3

[Samuel Thibault]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: java-atk-wrapper at packages.debian.org
Control: affects -1 + src:java-atk-wrapper

Hello,

I have uploaded java-atk-wrapper_0.40.0-3 for inclusion in bookworm.

[ Reason ]
There was a mistake in the upstream code in the test for presence of the
ATK_STATE_COLLAPSED feature in atk, fixed by this upload.

[ Impact ]
In the current bookworm, the treeviews of java applications are
currently inaccessible to blind users. For instance in mediathekview, in
the preference dialog box, the treeview on the left to browse between
panels of the box is inaccessible: users don't know which panel is
currently active, making such dialog box very tedious to work with,
one has to guess what panel is on. This is so for all treeviews, so
most preference dialog boxes of java applications, and treeviews in the
designs of java applications.

[ Tests ]
This was tested manually.

[ Risks ]
The code is very trivial, and comes from upstream
(well, I am upstream :) )

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

Thanks!

unblock java-atk-wrapper/0.40.0-3
-------------- next part --------------
diff -Nru java-atk-wrapper-0.40.0/debian/changelog java-atk-wrapper-0.40.0/debian/changelog
--- java-atk-wrapper-0.40.0/debian/changelog	2022-04-04 20:36:56.000000000 +0200
+++ java-atk-wrapper-0.40.0/debian/changelog	2023-05-06 21:25:54.000000000 +0200
@@ -1,3 +1,10 @@
+java-atk-wrapper (0.40.0-3) unstable; urgency=medium
+
+  * patches/ATK_STATE_COLLAPSED: Fix checking for ATK_STATE_COLLAPSED
+    availability.
+
+ -- Samuel Thibault <sthibault at debian.org>  Sat, 06 May 2023 21:25:54 +0200
+
 java-atk-wrapper (0.40.0-2) unstable; urgency=medium
 
   * control: Bump atk1.0 build-dep to get ATK_STATE_COLLAPSED.
diff -Nru java-atk-wrapper-0.40.0/debian/patches/ATK_STATE_COLLAPSED java-atk-wrapper-0.40.0/debian/patches/ATK_STATE_COLLAPSED
--- java-atk-wrapper-0.40.0/debian/patches/ATK_STATE_COLLAPSED	1970-01-01 01:00:00.000000000 +0100
+++ java-atk-wrapper-0.40.0/debian/patches/ATK_STATE_COLLAPSED	2023-05-06 21:25:19.000000000 +0200
@@ -0,0 +1,22 @@
+commit 5e90b12a7703e108d0183c86c2cf577271865afe
+Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
+Date:   Sat May 6 21:23:56 2023 +0200
+
+    Fix checking for ATK_STATE_COLLAPSED
+    
+    ATK_STATE_COLLAPSED is not actually a macro, so replace #ifdef with a
+    version check, since we know it appeared in atk 2.38.
+
+diff --git a/jni/src/jawutil.c b/jni/src/jawutil.c
+index a6c894c..8b2a16d 100644
+--- a/jni/src/jawutil.c
++++ b/jni/src/jawutil.c
+@@ -589,7 +589,7 @@ 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
++#if ATK_CHECK_VERSION (2,38,0)
+     return ATK_STATE_COLLAPSED;
+ #else
+     return ATK_STATE_INVALID;
diff -Nru java-atk-wrapper-0.40.0/debian/patches/series java-atk-wrapper-0.40.0/debian/patches/series
--- java-atk-wrapper-0.40.0/debian/patches/series	2022-03-29 22:41:41.000000000 +0200
+++ java-atk-wrapper-0.40.0/debian/patches/series	2023-05-06 21:25:54.000000000 +0200
@@ -1,3 +1,4 @@
 java-1.7
 
 atk-dep
+ATK_STATE_COLLAPSED
diff -Nru java-atk-wrapper-0.40.0/debian/salsa-ci.yml java-atk-wrapper-0.40.0/debian/salsa-ci.yml
--- java-atk-wrapper-0.40.0/debian/salsa-ci.yml	2021-09-26 10:00:44.000000000 +0200
+++ java-atk-wrapper-0.40.0/debian/salsa-ci.yml	2022-05-27 00:53:20.000000000 +0200
@@ -6,4 +6,7 @@
 test-crossbuild-arm64:
   allow_failure: false
 
+variables:
+  SALSA_CI_REPROTEST_ENABLE_DIFFOSCOPE: 1
+
 # vim: ts=2 sw=2 et sts=2 ft=yaml