diff --git a/java-17-openj9.changes b/java-17-openj9.changes index 988dd35..24a7902 100644 --- a/java-17-openj9.changes +++ b/java-17-openj9.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 17 13:19:03 UTC 2023 - Fridrich Strba + +- Remove the accessibility sub-package, since it was never really + working and creates another problems (bsc#1205916). It can + eventually be built as standalone if needed +- Removed patches: + * jaw-jdk10.patch + * jaw-misc.patch + * jaw-nogtk.patch + + not needed after the removal of the accessibility sub-package + ------------------------------------------------------------------- Mon Oct 31 12:04:30 UTC 2022 - Fridrich Strba diff --git a/java-17-openj9.spec b/java-17-openj9.spec index 31e6e10..b1d453f 100644 --- a/java-17-openj9.spec +++ b/java-17-openj9.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,6 @@ %global openj9_revision e04a7f6c1c365a6b375deb5f641c72309b170b95 %global openj9_branch v0.35.0-release %global openj9_tag openj9-0.35.0 -%global java_atk_wrapper_version 0.33.2 # priority must be 6 digits in total %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} %global priority 2701 @@ -95,7 +94,6 @@ URL: https://openjdk.java.net/ Source0: %{root_repository}/%{root_revision}.zip Source1: %{omr_repository}/%{omr_revision}.zip Source2: %{openj9_repository}/%{openj9_revision}.zip -Source8: https://download.gnome.org/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz # Desktop files. Adapted from IcedTea. Source11: jconsole.desktop.in # nss configuration file @@ -128,10 +126,6 @@ Patch31: aarch64.patch Patch302: disable-doclint-by-default.patch Patch303: alternative-tzdb_dat.patch # -Patch400: jaw-misc.patch -Patch401: jaw-jdk10.patch -Patch402: jaw-nogtk.patch -# BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake @@ -170,13 +164,6 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-proto-devel BuildRequires: xprop BuildRequires: zip -BuildRequires: pkgconfig(atk) >= 2.14.0 -BuildRequires: pkgconfig(atk-bridge-2.0) -BuildRequires: pkgconfig(atspi-2) >= 2.14.0 -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gthread-2.0) BuildConflicts: java-devel >= 18 # Requires rest of java Requires: %{name}-headless = %{version}-%{release} @@ -254,6 +241,7 @@ Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. Requires(postun):update-alternatives Recommends: tzdata-java8 +Obsoletes: %{name}-accessibility %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} # Standard JPackage base provides. Provides: java-%{javaver}-headless = %{version}-%{release} @@ -354,25 +342,8 @@ Provides: java-javadoc = %{version}-%{release} %description javadoc The OpenJDK %{featurever} API documentation. -%package accessibility -Summary: OpenJDK %{featurever} accessibility connector -Group: Development/Languages/Java -Requires: %{name} = %{version}-%{release} -Requires: xprop - -%description accessibility -Enables accessibility support in OpenJDK %{featurever} by using java-atk-wrapper. This allows -compatible at-spi2 based accessibility programs to work for AWT and Swing-based -programs. - -Please note, the java-atk-wrapper is still in beta, and OpenJDK itself is still -being tuned to be working with accessibility features. There are known issues -with accessibility on, so please do not install this package unless you really -need to. - %prep %setup -q -n openj9-openjdk-jdk17-%{root_revision} -a 1 -a 2 -%setup -q -D -n openj9-openjdk-jdk17-%{root_revision} -T -a 8 # Set up the build tree using the subrepository tarballs pwd @@ -406,10 +377,6 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2* %patch302 -p1 %patch303 -p1 -%patch400 -%patch401 -%patch402 - cat %{SOURCE100} \ | sed "s/@OPENJ9_SHA@/%{openj9_revision}/g" \ | sed "s/@OPENJ9_BRANCH@/%{openj9_branch}/g" \ @@ -482,24 +449,6 @@ export JAVA_HOME=$(pwd)/%{imagesdir}/jdk # Copy tz.properties echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/conf/tz.properties -# Build the accessibility plugin -pushd java-atk-wrapper-%{java_atk_wrapper_version} -autoreconf --force --install -rm wrapper/org/GNOME/Accessibility/AtkWrapper.java -%configure \ - --without-jdk-auto-detect \ - JDK_SRC=$JAVA_HOME -rm wrapper/org/GNOME/Accessibility/AtkWrapper.java -make %{?_smp_mflags} -cp wrapper/java-atk-wrapper.jar $JAVA_HOME/../jmods/ -cp jni/src/.libs/libatk-wrapper.so $JAVA_HOME/lib/ -popd -# Merge the java-atk-wrapper into the JDK -source $JAVA_HOME/release; export MODULES -$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "atk.wrapper,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk -cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ -rm -rf $JAVA_HOME/../newjdk - # cacerts are generated in runtime in openSUSE if [ -f %{imagesdir}/jdk/lib/security/cacerts ]; then rm %{imagesdir}/jdk/lib/security/cacerts @@ -614,14 +563,6 @@ find %{buildroot}%{_jvmdir}/%{sdkdir}/demo \ | sed 's|^|%doc |' \ >> %{name}-demo.files -# Create a config file to enable java-atk-wrapper -pushd %{buildroot}/%{_jvmdir}/%{sdkdir}/conf/ - echo "#Config file to enable java-atk-wrapper" > accessibility.properties - echo "" >> accessibility.properties - echo "assistive_technologies=org.GNOME.Accessibility.AtkWrapper" >> accessibility.properties - echo "" >> accessibility.properties -popd - # fdupes links the files from JDK to JRE, so it breaks a JRE # use it carefully :)) %fdupes -s %{buildroot}/%{_jvmdir}/%{sdkdir}/ @@ -816,6 +757,7 @@ fi %{_jvmdir}/%{jrelnk} %{_jvmprivdir}/* +%{_jvmdir}/%{sdkdir}/release %{_jvmdir}/%{sdkdir}/bin/java %ifnarch aarch64 %{_jvmdir}/%{sdkdir}/bin/jitserver @@ -990,9 +932,7 @@ fi %files jmods %dir %{_jvmdir}/%{sdkdir}/jmods -%{_jvmdir}/%{sdkdir}/release %{_jvmdir}/%{sdkdir}/jmods/*.jmod -%{_jvmdir}/%{sdkdir}/jmods/java-atk-wrapper.jar %files demo -f %{name}-demo.files @@ -1004,8 +944,4 @@ fi %dir %{_javadocdir}/%{sdklnk} %{_javadocdir}/%{sdklnk}/* -%files accessibility -%config(noreplace) %{_jvmdir}/%{sdkdir}/conf/accessibility.properties -%{_jvmdir}/%{sdkdir}/lib/libatk-wrapper.so - %changelog diff --git a/java-atk-wrapper-0.33.2.tar.xz b/java-atk-wrapper-0.33.2.tar.xz deleted file mode 100644 index d059443..0000000 --- a/java-atk-wrapper-0.33.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8f685caed7c424babac8b158f51355c772d1e2a0b8a1ce8ced4980edae223e2 -size 293364 diff --git a/jaw-jdk10.patch b/jaw-jdk10.patch deleted file mode 100644 index b26c788..0000000 --- a/jaw-jdk10.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- java-atk-wrapper-0.33.2/configure.ac 2017-11-06 13:37:11.504756491 +0100 -+++ java-atk-wrapper-0.33.2/configure.ac 2017-11-06 13:37:47.224756626 +0100 -@@ -64,7 +64,7 @@ - # java wrapper - - AM_CONDITIONAL(USER, test `whoami` = "root") --JAVA_REQUIRED=1.7.0 -+JAVA_REQUIRED=9.0.0 - JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge" - - AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location]) -@@ -170,6 +170,8 @@ - wrapper/org/GNOME/Makefile - wrapper/org/GNOME/Accessibility/Makefile - wrapper/org/GNOME/Accessibility/AtkWrapper.java -+ wrapper/META-INF/Makefile -+ wrapper/META-INF/services/Makefile - ]) - AC_OUTPUT - ---- java-atk-wrapper-0.33.2/wrapper/Makefile.am 2017-11-06 13:37:11.504756491 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/Makefile.am 2017-11-06 13:47:48.648845631 +0100 -@@ -1,4 +1,4 @@ --SUBDIRS=org -+SUBDIRS=org META-INF - JARFILES=java-atk-wrapper.jar - ALL_CLASSES=org/GNOME/Accessibility/*.class - DEP_CLASSES=$(wildcard $(ALL_CLASSES)) -@@ -14,10 +14,13 @@ - java_atk_wrapper_DATA = $(JARFILES) - properties_DATA = accessibility.properties - EXTRA_DIST = $(properties_DATA) \ -- manifest.txt -+ manifest.txt module-info.java - --$(JARFILES) : $(DEP_CLASSES) -- $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class -+module-info.class : $(srcdir)/module-info.java -+ $(JAVAC) -cp $(top_builddir)/wrapper -sourcepath $(top_srcdir)/wrapper:$(top_builddir)/wrapper $(JAVACFLAGS) -d $(top_builddir)/wrapper $< -+ -+$(JARFILES) : $(DEP_CLASSES) module-info.class -+ $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class module-info.class META-INF/services/javax.accessibility.AccessibilityProvider - - all-local : $(DATA) $(JARFILES) - ---- java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/META-INF/Makefile.am 2017-11-06 13:37:47.224756626 +0100 -@@ -0,0 +1 @@ -+SUBDIRS=services ---- java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/javax.accessibility.AccessibilityProvider 2017-11-06 13:37:47.224756626 +0100 -@@ -0,0 +1 @@ -+org.GNOME.Accessibility.AtkProvider ---- java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/META-INF/services/Makefile.am 2017-11-06 13:37:47.224756626 +0100 -@@ -0,0 +1 @@ -+EXTRA_DIST = javax.accessibility.AccessibilityProvider ---- java-atk-wrapper-0.33.2/wrapper/module-info.java 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/module-info.java 2017-11-06 13:42:08.850466481 +0100 -@@ -0,0 +1,6 @@ -+module atk.wrapper { -+ exports org.GNOME.Accessibility; -+ requires java.desktop; -+ provides javax.accessibility.AccessibilityProvider -+ with org.GNOME.Accessibility.AtkProvider; -+} ---- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/AtkProvider.java 2017-11-06 13:37:47.224756626 +0100 -@@ -0,0 +1,38 @@ -+/* -+ * Java ATK Wrapper for GNOME -+ * Copyright (C) 2017 Oracle and/or its affiliates. -+ * Copyright (C) 2017 Fridrich Strba -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+package org.GNOME.Accessibility; -+ -+import javax.accessibility.AccessibilityProvider; -+ -+public final class AtkProvider extends AccessibilityProvider { -+ private final String name = "org.GNOME.Accessibility.AtkWrapper"; -+ -+ public AtkProvider() {} -+ -+ public String getName() { -+ return name; -+ } -+ -+ public void activate() { -+ new AtkWrapper(); -+ } -+ -+} ---- java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am 2015-06-30 23:56:32.000000000 +0200 -+++ java-atk-wrapper-0.33.2/wrapper/org/GNOME/Accessibility/Makefile.am 2017-10-26 17:42:11.472221491 +0200 -@@ -10,7 +10,7 @@ - sed -e "s;\@XPROP\@;${XPROP};g" \ - < $< >$@ - --%.class : %.java -+%.class : %.java AtkWrapper.java - CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $(JAVACFLAGS) -d $(top_builddir)/wrapper $< - - clean-local: diff --git a/jaw-misc.patch b/jaw-misc.patch deleted file mode 100644 index 8882870..0000000 --- a/jaw-misc.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- java-atk-wrapper-0.33.2/configure.ac 2015-07-07 13:52:28.000000000 +0200 -+++ java-atk-wrapper-0.33.2/configure.ac 2017-11-06 17:00:37.366413136 +0100 -@@ -46,7 +46,6 @@ - glib-2.0 >= 2.32.0 - gthread-2.0 - gdk-2.0 -- gdk-3.0 - gobject-2.0 - ]) - AC_SUBST(JAW_LIBS) -@@ -64,7 +63,7 @@ - # java wrapper - - AM_CONDITIONAL(USER, test `whoami` = "root") --JAVA_REQUIRED=1.6 -+JAVA_REQUIRED=1.7.0 - JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge" - - AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location]) -@@ -98,12 +98,6 @@ if test -z "$JAVAC"; then - fi - AC_SUBST(JAVAC) - --AC_PATH_PROG(JAVAH,javah,,${JAVA_PATH}) --if test -z "$JAVAH"; then -- AC_MSG_ERROR([$JAVA_ERROR_MESSAGE]) --fi --AC_SUBST(JAVAH) -- - AC_SUBST(JAVACFLAGS) - - AC_PATH_PROG(JAR,jar,,${JAVA_PATH}) -@@ -125,7 +124,7 @@ - - - if test "x$GCC" = xyes; then -- JAW_CFLAGS=$JAW_CFLAGS $CFLAGS -+ JAW_CFLAGS="$JAW_CFLAGS $CFLAGS" - else - AC_MSG_ERROR("You should compile with GCC") - fi -@@ -169,6 +168,7 @@ - wrapper/org/Makefile - wrapper/org/GNOME/Makefile - wrapper/org/GNOME/Accessibility/Makefile -+ wrapper/org/GNOME/Accessibility/AtkWrapper.java - ]) - AC_OUTPUT - ---- java-atk-wrapper-0.33.2/wrapper/Makefile.am 2015-07-01 02:19:15.000000000 +0200 -+++ java-atk-wrapper-0.33.2/wrapper/Makefile.am 2017-11-06 17:00:07.962413025 +0100 -@@ -13,7 +13,8 @@ - - java_atk_wrapper_DATA = $(JARFILES) - properties_DATA = accessibility.properties --EXTRA_DIST = $(properties_DATA) -+EXTRA_DIST = $(properties_DATA) \ -+ manifest.txt - - $(JARFILES) : $(DEP_CLASSES) - $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class ---- java-atk-wrapper-0.33.2/wrapper/manifest.txt 1970-01-01 01:00:00.000000000 +0100 -+++ java-atk-wrapper-0.33.2/wrapper/manifest.txt 2017-10-26 15:25:02.159429001 +0200 -@@ -0,0 +1,2 @@ -+Main-Class: org.GNOME.Accessibility.AtkWrapper -+ diff --git a/jaw-nogtk.patch b/jaw-nogtk.patch deleted file mode 100644 index 1b26b8a..0000000 --- a/jaw-nogtk.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- java-atk-wrapper-0.33.2/configure.ac 2018-08-21 13:51:47.158216451 +0200 -+++ java-atk-wrapper-0.33.2/configure.ac 2018-08-21 13:52:22.122434818 +0200 -@@ -45,7 +45,6 @@ - dbus-1 - glib-2.0 >= 2.32.0 - gthread-2.0 -- gdk-2.0 - gobject-2.0 - ]) - AC_SUBST(JAW_LIBS) ---- java-atk-wrapper-0.33.2/jni/src/AtkWrapper.c 2015-07-02 15:18:08.000000000 +0200 -+++ java-atk-wrapper-0.33.2/jni/src/AtkWrapper.c 2018-08-21 13:53:20.206797576 +0200 -@@ -23,9 +23,6 @@ - #include - #include - #include --#include --#include --#include - #include - #include "jawutil.h" - #include "jawimpl.h" -@@ -258,7 +255,7 @@ - { - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(focus_notify_handler, para); -+ g_idle_add(focus_notify_handler, para); - } - - static gboolean -@@ -336,7 +333,7 @@ - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); - para->is_toplevel = (jIsToplevel == JNI_TRUE) ? TRUE : FALSE; -- gdk_threads_add_idle(window_open_handler, para); -+ g_idle_add(window_open_handler, para); - } - - static gboolean -@@ -413,7 +410,7 @@ - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); - para->is_toplevel = (jIsToplevel == JNI_TRUE) ? TRUE : FALSE; -- gdk_threads_add_idle(window_close_handler, para); -+ g_idle_add(window_close_handler, para); - } - - static gboolean -@@ -462,7 +459,7 @@ - { - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(window_minimize_handler, para); -+ g_idle_add(window_minimize_handler, para); - } - - static gboolean -@@ -511,7 +508,7 @@ - { - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac ); -- gdk_threads_add_idle(window_maximize_handler, para); -+ g_idle_add(window_maximize_handler, para); - } - - static gboolean -@@ -561,7 +558,7 @@ - - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(window_restore_handler, para); -+ g_idle_add(window_restore_handler, para); - } - - static gboolean -@@ -609,7 +606,7 @@ - - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(window_activate_handler, para); -+ g_idle_add(window_activate_handler, para); - } - - static gboolean -@@ -659,7 +656,7 @@ - - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(window_deactivate_handler, para); -+ g_idle_add(window_deactivate_handler, para); - } - - static gboolean -@@ -710,7 +707,7 @@ - - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(window_state_change_handler, para); -+ g_idle_add(window_state_change_handler, para); - } - - static gchar -@@ -1047,7 +1044,7 @@ - CallbackPara *para = alloc_callback_para(global_ac); - para->signal_id = (gint)id; - para->args = global_args; -- gdk_threads_add_idle(signal_emit_handler, para); -+ g_idle_add(signal_emit_handler, para); - } - - static gboolean -@@ -1106,7 +1103,7 @@ - } else { - para->state_value = FALSE; - } -- gdk_threads_add_idle(object_state_change_handler, para); -+ g_idle_add(object_state_change_handler, para); - } - - static gboolean -@@ -1163,7 +1160,7 @@ - { - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(component_added_handler, para); -+ g_idle_add(component_added_handler, para); - } - - static gboolean -@@ -1222,7 +1219,7 @@ - { - jobject global_ac = (*jniEnv)->NewGlobalRef(jniEnv, jAccContext); - CallbackPara *para = alloc_callback_para(global_ac); -- gdk_threads_add_idle(component_removed_handler, para); -+ g_idle_add(component_removed_handler, para); - } - - static gboolean -@@ -1340,7 +1337,7 @@ - { - jboolean key_consumed; - jobject global_key_event = (*jniEnv)->NewGlobalRef(jniEnv, jAtkKeyEvent); -- gdk_threads_add_idle(key_dispatch_handler, (gpointer)global_key_event); -+ g_idle_add(key_dispatch_handler, (gpointer)global_key_event); - - if(jaw_debug) - printf("key_dispatch_result saved = %d\n ", key_dispatch_result);