[openjdk-8] 06/06: Drop support for java-access-bridge (replaced by atk-wrapper)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit fae74a53d240b660073da7afafe5a3a661968753
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat May 3 13:57:21 2014 +0200

    Drop support for java-access-bridge (replaced by atk-wrapper)
---
 debian/accessibility-atk.properties              | 10 -------
 debian/accessibility.properties                  |  4 +--
 debian/patches/java-access-bridge-security.patch | 15 -----------
 debian/rules                                     | 34 +++---------------------
 4 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/debian/accessibility-atk.properties b/debian/accessibility-atk.properties
deleted file mode 100644
index c1bdc48..0000000
--- a/debian/accessibility-atk.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# The following line specifies the assistive technology classes 
-# that should be loaded into the Java VM when the AWT is initailized.
-# Specify multiple classes by separating them with commas.
-# Note: the line below cannot end the file (there must be at
-# a minimum a blank line following it).
-#
-# Doesn't work, see LP: #935296
-#assistive_technologies=org.GNOME.Accessibility.AtkWrapper
-
diff --git a/debian/accessibility.properties b/debian/accessibility.properties
index e009589..6537cb3 100644
--- a/debian/accessibility.properties
+++ b/debian/accessibility.properties
@@ -5,5 +5,5 @@
 # Note: the line below cannot end the file (there must be at
 # a minimum a blank line following it).
 #
-assistive_technologies=org.GNOME.Accessibility.JavaBridge
-
+# Doesn't work, see LP: #935296
+#assistive_technologies=org.GNOME.Accessibility.AtkWrapper
diff --git a/debian/patches/java-access-bridge-security.patch b/debian/patches/java-access-bridge-security.patch
deleted file mode 100644
index 5a86dc5..0000000
--- a/debian/patches/java-access-bridge-security.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# patch only used for builds with java-access-bridge support
-
---- openjdk/jdk/src/share/lib/security/java.security
-+++ openjdk/jdk/src/share/lib/security/java.security
-@@ -149,7 +149,9 @@
-                com.sun.org.apache.xml.internal.utils.,\
-                com.sun.org.apache.xml.internal.security.,\
-                com.sun.org.glassfish.,\
--               org.jcp.xml.dsig.internal.
-+               org.jcp.xml.dsig.internal.,\
-+               org.GNOME.Accessibility.,\
-+               org.GNOME.Bonobo.
- 
- #
- # List of comma-separated packages that start with or equal this string
diff --git a/debian/rules b/debian/rules
index 940f638..9e3727b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -278,7 +278,6 @@ export OPT_CFLAGS/cppInterpreter_arm.o
 endif
 
 with_pulse = no
-with_bridge = atk
 with_tzdata = yes
 
 on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes)
@@ -325,17 +324,10 @@ DISTRIBUTION_PATCHES += \
 	debian/patches/jdk-freetypeScaler-crash.diff \
 	debian/patches/default-jvm-cfg-$(hotspot_version).diff \
 	debian/patches/nonreparenting-wm.diff \
+	debian/patches/atk-wrapper-security.patch \
 	debian/patches/accessible-toolkit.patch
 #FIXME	debian/patches/fix_extra_flags-$(hotspot_version).diff
 
-ifeq ($(with_bridge),atk)
-    DISTRIBUTION_PATCHES += \
-	debian/patches/atk-wrapper-security.patch
-else ifneq (,$(with_bridge))
-    DISTRIBUTION_PATCHES += \
-	debian/patches/java-access-bridge-security.patch
-endif
-
 ifneq (,$(filter $(DEB_HOST_ARCH), s390))
   DISTRIBUTION_PATCHES += \
 	debian/patches/hotspot-s390.diff \
@@ -684,6 +676,7 @@ control_vars = \
 	'-Vdlopenjre:Recommends=$(dlopen_jre_recommends)' \
 	'-Vpkg:pulseaudio=$(pkg_pulseaudio)' \
 	'-Vxulrunner:Depends=$(xulrunner_depends)' \
+	'-Vdep:bridge=libatk-wrapper-java-jni (>= 0.30.4-0ubuntu2)'
 
 ifneq (,$(DEB_HOST_MULTIARCH))
   control_vars += \
@@ -696,16 +689,6 @@ ifneq (,$(filter-out $(hotspot_archs), $(jamvm_archs)))
   endif
 endif
 
-ifeq ($(with_bridge),atk)
-  control_vars += '-Vdep:bridge=libatk-wrapper-java-jni (>= 0.30.4-0ubuntu2)'
-else ifeq ($(with_bridge),yes)
-  ifneq (,$(DEB_HOST_MULTIARCH))
-    control_vars += '-Vdep:bridge=libaccess-bridge-java-jni (>= 1.26.2-6)'
-  else
-    control_vars += '-Vdep:bridge=libaccess-bridge-java'
-  endif
-endif
-
 ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
   ifneq (,$(filter $(DEB_HOST_ARCH), $(shark_archs)))
     control_vars += '-Vdefaultvm:Provides=$(p_jre)-zero, $(p_jre)-shark'
@@ -1313,12 +1296,7 @@ endif
 	  mv $(d)/$(basedir)/jre/lib/$$i.template $(d)/$(etcdir)/$$i; \
 	done
 
-ifeq ($(with_bridge),atk)
-	cp -p debian/accessibility-atk.properties \
-		$(d)/$(basedir)/jre/lib/accessibility.properties
-else
-	cp -p debian/accessibility.properties $(d)/$(basedir)/jre/lib/
-endif
+	cp -p debian/accessibility.properties $(d)/$(basedir)/jre/lib/accessibility.properties
 	cp -p debian/swing.properties $(d)/$(basedir)/jre/lib/
 
 ifneq (,$(pkg_certs))
@@ -1608,17 +1586,11 @@ endif
 	  echo usr/share/doc/$(p_jrehl) usr/share/doc/$(p_dbg); \
 	) > $(d_dbg).links
 
-ifeq ($(with_bridge),atk)
 	: # create links for the atk wrapper
 	echo "usr/share/java/java-atk-wrapper.jar $(basedir)/jre/lib/ext/java-atk-wrapper.jar" \
 	    >> $(d_jre).links
 	echo "usr/lib$(multiarch_dir)/jni/libatk-wrapper.so $(basedir)/jre/lib/ext/libatk-wrapper.so" \
 	    >> $(d_jre).links
-else ifeq ($(with_bridge),yes)
-	: # create links for the gnome accessibility bridge
-	echo "usr/share/java/gnome-java-bridge.jar $(basedir)/jre/lib/ext/gnome-java-bridge.jar" \
-	    >> $(d_jre).links
-endif
 
 ifeq ($(with_tzdata),yes)
 	echo usr/share/javazi $(basedir)/jre/lib/zi \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git