Version in base suite: 0.38.0-2

Base version: java-atk-wrapper_0.38.0-2
Target version: java-atk-wrapper_0.38.0-2+deb11u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/j/java-atk-wrapper/java-atk-wrapper_0.38.0-2.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/j/java-atk-wrapper/java-atk-wrapper_0.38.0-2+deb11u1.dsc

 changelog      |    6 ++++++
 patches/dbus   |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/series |    1 +
 3 files changed, 57 insertions(+)

diff -Nru java-atk-wrapper-0.38.0/debian/changelog java-atk-wrapper-0.38.0/debian/changelog
--- java-atk-wrapper-0.38.0/debian/changelog	2021-01-01 14:05:05.000000000 +0000
+++ java-atk-wrapper-0.38.0/debian/changelog	2021-08-26 00:50:17.000000000 +0000
@@ -1,3 +1,9 @@
+java-atk-wrapper (0.38.0-2+deb11u1) bullseye; urgency=medium
+
+  * patches/dbus: Also detect at-spi through dbus.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 26 Aug 2021 02:50:17 +0200
+
 java-atk-wrapper (0.38.0-2) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru java-atk-wrapper-0.38.0/debian/patches/dbus java-atk-wrapper-0.38.0/debian/patches/dbus
--- java-atk-wrapper-0.38.0/debian/patches/dbus	1970-01-01 00:00:00.000000000 +0000
+++ java-atk-wrapper-0.38.0/debian/patches/dbus	2021-08-26 00:50:17.000000000 +0000
@@ -0,0 +1,50 @@
+commit 43576f265a16de8f1cd16c8a09d0e6a6006cbe3c
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Thu Aug 26 02:49:06 2021 +0200
+
+    Also use dbus to detect accessibility being enabled
+    
+    This is required if for some reason the AT_SPI_BUS property is not set.
+    That happens for instance if for some reason the dbus session bus (and thus
+    the at-spi bus) is reused between X sessions.
+
+diff --git a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
+index cb267fd..d91b985 100644
+--- a/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
++++ b/wrapper/org/GNOME/Accessibility/AtkWrapper.java.in
+@@ -32,6 +32,11 @@ import java.lang.management.*;
+ 
+ public class AtkWrapper {
+   static boolean accessibilityEnabled = false;
++  static void initAtk() {
++    System.loadLibrary("atk-wrapper");
++    if (AtkWrapper.initNativeLibrary())
++      accessibilityEnabled = true;
++  }
+   static {
+     try {
+       Process p = Runtime.getRuntime().exec("@XPROP@ -root");
+@@ -39,13 +44,20 @@ public class AtkWrapper {
+       String result;
+       while ((result = b.readLine()) != null) {
+         if (result.indexOf("AT_SPI_IOR") >= 0 || result.indexOf("AT_SPI_BUS") >= 0) {
+-          System.loadLibrary("atk-wrapper");
+-          if (AtkWrapper.initNativeLibrary())
+-            accessibilityEnabled = true;
++          initAtk();
+           break;
+         }
+       }
+ 
++      if (!accessibilityEnabled) {
++        p = Runtime.getRuntime().exec("dbus-send --session --dest=org.a11y.Bus --print-reply /org/a11y/bus org.a11y.Bus.GetAddress");
++        b = new BufferedReader(new InputStreamReader (p.getInputStream ()));
++        while ((b.readLine()) != null);
++        p.waitFor();
++        if (p.exitValue() == 0)
++          initAtk();
++      }
++
+       java.util.List<GarbageCollectorMXBean> gcbeans = ManagementFactory.getGarbageCollectorMXBeans();
+       for (GarbageCollectorMXBean gcbean : gcbeans) {
+ 	NotificationEmitter emitter = (NotificationEmitter) gcbean;
diff -Nru java-atk-wrapper-0.38.0/debian/patches/series java-atk-wrapper-0.38.0/debian/patches/series
--- java-atk-wrapper-0.38.0/debian/patches/series	2020-08-02 00:27:36.000000000 +0000
+++ java-atk-wrapper-0.38.0/debian/patches/series	2021-08-26 00:50:17.000000000 +0000
@@ -1,3 +1,4 @@
 java-1.7
 
 atk-dep
+dbus