Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2012-12-19 10:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2012-10-25 10:59:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2012-12-19 10:59:43.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Dec 18 10:27:24 UTC 2012 - [email protected] + +- update to java access bridge 1.26.2 + * bugfix release, mainly 64bit JNI and JVM support + +------------------------------------------------------------------- +Mon Dec 17 10:06:28 UTC 2012 - [email protected] + +- fix a segfault in AWT code - (bnc#792951) + * add openjdk-7-src-b147-awt-crasher.patch +- turn pulseaudio off on pre 11.4 distros + +------------------------------------------------------------------- Old: ---- java-access-bridge-1.23.0.tar.bz2 New: ---- java-access-bridge-1.26.2.tar.bz2 openjdk-7-src-b147-awt-crasher.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.L4PIUd/_old 2012-12-19 10:59:53.000000000 +0100 +++ /var/tmp/diff_new_pack.L4PIUd/_new 2012-12-19 10:59:53.000000000 +0100 @@ -43,7 +43,12 @@ %define with_systemtap 0 %endif +#XXX: maybe 12.1 with pa 1.1 will work (?) +%if 0%{?suse_version} >= 1140 %define with_pulseaudio 1 +%else +%define with_pulseaudio 0 +%endif # If runtests is 0 test suites will not be run. %define runtests 0 @@ -53,8 +58,8 @@ %define openjdkdate 27_jun_2011 -%define accessmajorver 1.23 -%define accessminorver 0 +%define accessmajorver 1.26 +%define accessminorver 2 %define accessver %{accessmajorver}.%{accessminorver} %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ @@ -199,6 +204,9 @@ Patch105: java-1.7.0-openjdk-ppc-zero-jdk.patch Patch106: java-1.7.0-openjdk-ppc-zero-hotspot.patch +#PATH-FIX-UPSTREAM: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-December/021050.html, bnc#792951 +Patch107: openjdk-7-src-b147-awt-crasher.patch + # # Optional component packages # @@ -560,6 +568,9 @@ qpatch -p0 %{PATCH106} %endif +#AWT crasher +qpatch -p1 %{PATCH107} + #SUSE specific fixes qpatch -p1 %{PATCH1002} @@ -975,6 +986,7 @@ %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README +%doc %dir %{_jvmdir}/java-1.7.0-openjdk %dir %{_jvmdir}/%{sdkdir} ++++++ java-1.7.0-openjdk-java-access-bridge-idlj.patch ++++++ --- /var/tmp/diff_new_pack.L4PIUd/_old 2012-12-19 10:59:53.000000000 +0100 +++ /var/tmp/diff_new_pack.L4PIUd/_new 2012-12-19 10:59:53.000000000 +0100 @@ -1,7 +1,7 @@ -Index: java-access-bridge-1.23.0/idlgen/Makefile.am +Index: java-access-bridge-1.26.2/idlgen/Makefile.am =================================================================== ---- java-access-bridge-1.23.0/idlgen/Makefile.am.orig 2008-06-03 08:47:29.000000000 +0200 -+++ java-access-bridge-1.23.0/idlgen/Makefile.am 2012-08-30 14:53:46.368752461 +0200 +--- java-access-bridge-1.26.2/idlgen/Makefile.am.orig 2008-06-03 08:47:29.000000000 +0200 ++++ java-access-bridge-1.26.2/idlgen/Makefile.am 2012-08-30 14:53:46.368752461 +0200 @@ -3,7 +3,7 @@ JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES) CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) @@ -11,10 +11,10 @@ BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl) -Index: java-access-bridge-1.23.0/idlgen/Makefile.in +Index: java-access-bridge-1.26.2/idlgen/Makefile.in =================================================================== ---- java-access-bridge-1.23.0/idlgen/Makefile.in.orig 2008-06-24 05:34:59.000000000 +0200 -+++ java-access-bridge-1.23.0/idlgen/Makefile.in 2012-08-30 14:56:21.318370220 +0200 +--- java-access-bridge-1.26.2/idlgen/Makefile.in.orig 2008-06-24 05:34:59.000000000 +0200 ++++ java-access-bridge-1.26.2/idlgen/Makefile.in 2012-08-30 14:56:21.318370220 +0200 @@ -140,7 +140,7 @@ SUBDIRS = org JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES) ++++++ java-1.7.0-openjdk-java-access-bridge-tck.patch ++++++ --- /var/tmp/diff_new_pack.L4PIUd/_old 2012-12-19 10:59:53.000000000 +0100 +++ /var/tmp/diff_new_pack.L4PIUd/_new 2012-12-19 10:59:53.000000000 +0100 @@ -1,7 +1,7 @@ -Index: icedtea-2.3.1/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java +Index: icedtea-2.3.1/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java =================================================================== ---- icedtea-2.3.1/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-06-24 05:24:50.000000000 +0200 -+++ icedtea-2.3.1/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2012-08-30 14:52:17.068514546 +0200 +--- icedtea-2.3.1/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-06-24 05:24:50.000000000 +0200 ++++ icedtea-2.3.1/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java 2012-08-30 14:52:17.068514546 +0200 @@ -34,6 +34,9 @@ import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleText; ++++++ java-access-bridge-1.23.0.tar.bz2 -> java-access-bridge-1.26.2.tar.bz2 ++++++ ++++ 41722 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/ChangeLog new/java-access-bridge-1.26.2/ChangeLog --- old/java-access-bridge-1.23.0/ChangeLog 2008-06-24 05:25:45.000000000 +0200 +++ new/java-access-bridge-1.26.2/ChangeLog 2009-06-09 12:25:20.000000000 +0200 @@ -1,3 +1,97 @@ +2009-06-09 Ke Wang <[email protected]> + * NEWS: + * README: + * configure.in: + Release 1.26.2 + +2009-06-04 Jeff Cai <[email protected]> + + * NEWS: + * README: + * configure.in: + Release 1.26.1 + +2009-03-16 Jeff Cai <[email protected]> + + * NEWS: + * README: + * configure.in: + Release 1.26.0 + +2009-03-16 Jeff Cai <[email protected]> + + * bridge/org/GNOME/Accessibility/JavaBridge.java: (JavaBridge): + Remove the patch for #562408, since this patch is not needed. + +2009-01-20 Jeff Cai <[email protected]> + + * NEWS: + * configure.in: + Release 1.25.1 + +2009-01-20 Jeff Cai <[email protected]> + + * bridge/org/GNOME/Accessibility/JavaBridge.java: + Load the jni library in the constructor. + Show the information in the terminal. + +2009-01-09 Jeff Cai <[email protected]> + + * NEWS: + * configure.in: + Release 1.25.0 + +2009-01-09 Jeff Cai <[email protected]> + + * jni/Makefile.in: Removed + +2009-01-09 Jeff Cai <[email protected]> + + * Makefile.am: + * acinclude.m4: + * configure.in: + * jni/Makefile.am: + * jni/Makefile.in: + * jni/jni-main.c: (JNI_OnLoad), (JNI_OnUnload): + Add a JNI library to set NO_AT_BRIDGE for all Java applications. + GTK loads gtk modules according to the settting in xsettings, so + GTK_MODULES doesnot work now. To make java applications not load + atk-bridge, we add a JNI library to set a environmental variable + to ask atk-bridge not load itself. + +2009-01-08 Jeff Cai <[email protected]> + + * bridge/org/GNOME/Accessibility/JavaBridge.java: (JavaBridge): + + Fix for bug #562408. + Ignore 'SIGPIPE' to fix Java applications exit when a11y is enabled. + This is only a tempoary since it uses the unsupported package sun.misc.*. + +2008-12-22 Omair Majid <[email protected]> + + * bridge/org/GNOME/Accessibility/JavaBridge.java: + Fix for bug #563344 + + The event fired by the text component is different from what + we expect, newValueObject is not the position of the insertion, + but the position of the caret after the insertion, so fix + newValueObject. + + Committed by Jeff Cai + +2008-12-04 Omair Majid <[email protected] via [email protected]> + + * bridge/org/GNOME/Accessibility/JavaBridge.java + Fix for bug #563173 - StringIndexOutOfBoundsException can be + thrown in Java Access Bridge + +2008-09-09 Jeff Cai<[email protected]> + + * NEWS: + * README: + * configure.in: + Release 1.24.0 + 2008-06-24 Jeff Cai<[email protected]> * NEWS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/Makefile.am new/java-access-bridge-1.26.2/Makefile.am --- old/java-access-bridge-1.23.0/Makefile.am 2008-06-03 08:47:31.000000000 +0200 +++ new/java-access-bridge-1.26.2/Makefile.am 2009-05-25 10:18:07.000000000 +0200 @@ -4,6 +4,7 @@ bridge \ impl \ registry \ + jni \ test gnome_java_bridgedir = ${prefix}/share/jar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/NEWS new/java-access-bridge-1.26.2/NEWS --- old/java-access-bridge-1.23.0/NEWS 2008-06-24 05:31:20.000000000 +0200 +++ new/java-access-bridge-1.26.2/NEWS 2009-06-09 12:23:37.000000000 +0200 @@ -1,6 +1,102 @@ -Java Access Bridge version 1.23.0 +Java Access Bridge version 1.26.2 +================================ +Release bridge 1.26.2. This is a stable build. It +depends on at-spi 1.8 or versions after. + +The following changes have been made since 1.26.1. + +Fixed bug about 64-JVM support + +Java Access Bridge version 1.26.1 +================================ +Release bridge 1.26.1. This is a stable build. It +depends on at-spi 1.8 or versions after. + +The following changes have been made since 1.26.0. + +Add a 64 bit platform support when loading JNI library + +Java Access Bridge version 1.26.0 +================================ +Release bridge 1.26.0. This is a stable build. It +depens on at-spi 1.8 or versions after. + +The following changes have been made since 1.24.0. + +* Add a JNI library to set NO_AT_BRIDGE for all Java applications. +GTK loads gtk modules according to the settting in xsettings, so +GTK_MODULES doesnot work now. To make java applications not load +atk-bridge, we add a JNI library to set a environmental variable +to ask atk-bridge not load itself. + +* bridge/org/GNOME/Accessibility/JavaBridge.java: + + Fix for bug #563344 + + The event fired by the text component is different from what + we expect, newValueObject is not the position of the insertion, + but the position of the caret after the insertion, so fix + newValueObject. + +* bridge/org/GNOME/Accessibility/JavaBridge.java + Fix for bug #563173 - StringIndexOutOfBoundsException can be + thrown in Java Access Bridge + +Java Access Bridge version 1.25.1 ================================ +Release bridge 1.25.1. This is a development build. It +depends on at-spi 1.8 or versions after. +The following changes have been made since 1.25.0. + +* bridge/org/GNOME/Accessibility/JavaBridge.java: + Load the jni library in the constructor. + Show the information in the terminal. + +Please use ./configure --prefix=/usr --with-java-home= +$JAVA_HOME to produce Makefile. + +Java Access Bridge version 1.25.0 +================================ +Release bridge 1.25.0. This is a development build. It +depends on at-spi 1.8 or versions after. + +The following changes have been made since 1.24.0. + +Add a JNI library to set NO_AT_BRIDGE for all Java applications. +GTK loads gtk modules according to the settting in xsettings, so +GTK_MODULES doesnot work now. To make java applications not load +atk-bridge, we add a JNI library to set a environmental variable +to ask atk-bridge not load itself. + +* bridge/org/GNOME/Accessibility/JavaBridge.java: (JavaBridge): + + Fix for bug #562408. + Ignore 'SIGPIPE' to fix Java applications exit when a11y is enabled. + This is only a tempoary since it uses the unsupported package sun.misc.*. + +* bridge/org/GNOME/Accessibility/JavaBridge.java: + + Fix for bug #563344 + + The event fired by the text component is different from what + we expect, newValueObject is not the position of the insertion, + but the position of the caret after the insertion, so fix + newValueObject. + +* bridge/org/GNOME/Accessibility/JavaBridge.java + Fix for bug #563173 - StringIndexOutOfBoundsException can be + thrown in Java Access Bridge + +Java Access Bridge version 1.24.0 +================================ +Release bridge 1.24.0. This is a stable build. It +depends on at-spi 1.8 or versions after. + +Comparing with 1.23.0, there's no any difference. + +Java Access Bridge version 1.23.0 +================================ Release bridge 1.23.0. This is a unstable build. It depends on at-spi 1.8 or versions after. @@ -16,8 +112,8 @@ calculate the keycodes. * All events sent to registryd is having "host_ -application" so you don't need to have a round trip -to get application object. + application" so you don't need to have a round trip + to get application object. Fix #531869 Java Access Bridge version 1.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/README new/java-access-bridge-1.26.2/README --- old/java-access-bridge-1.23.0/README 2008-06-03 09:39:25.000000000 +0200 +++ new/java-access-bridge-1.26.2/README 2009-06-09 12:21:54.000000000 +0200 @@ -2,7 +2,7 @@ which connects the built-in accessibility support in Java Swing apps to the GNOME Accessibility framework, specifically the Assistive Technology Service Provider -Interface (AT-SPI). Version 1.22.1 +Interface (AT-SPI). Version 1.26.2 Contents: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/acinclude.m4 new/java-access-bridge-1.26.2/acinclude.m4 --- old/java-access-bridge-1.23.0/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/java-access-bridge-1.26.2/acinclude.m4 2009-05-25 10:18:07.000000000 +0200 @@ -0,0 +1,72 @@ +AC_DEFUN([CHECK_JNI],[ + +dnl Check to see what platform and set jni include path +AC_CANONICAL_HOST +AC_MSG_CHECKING([platform to setup platform specific variables]) +platform_win32="no" +case $host in + *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-windows*) + if test $gcj_compile = "yes"; then + JNI_INCLUDES= + else + JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/win32" + fi + platform_win32="yes" + PLATFORM_CFLAGS="-mms-bitfields" + PLATFORM_LDFLAGS="-Wl,--kill-at" + PLATFORM_CLASSPATH_SEPARATOR=";" + SOPREFIX="lib" + ;; + *-*-cygwin*) + if test $gcj_compile = "yes"; then + JNI_INCLUDES= + else + JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/win32" + fi + platform_win32="yes" + PLATFORM_CFLAGS= + PLATFORM_LDFLAGS= + PLATFORM_CLASSPATH_SEPARATOR=":" + SOPREFIX="cyg" + ;; + *-*-linux*) + if test $gcj_compile = "yes"; then + JNI_INCLUDES= + else + JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + fi + PLATFORM_CFLAGS= + PLATFORM_LDFLAGS= + PLATFORM_CLASSPATH_SEPARATOR=":" + SOPREFIX= + ;; + *-*-solaris*) + if test $gcj_compile = "yes"; then + JNI_INCLUDES= + else + JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/solaris" + fi + PLATFORM_CFLAGS= + PLATFORM_LDFLAGS= + PLATFORM_CLASSPATH_SEPARATOR=":" + SOPREFIX= + ;; + *) + if test $gcj_compile = "yes"; then + JNI_INCLUDES= + else + JNI_INCLUDES="-I$JAVA_HOME/include -I$JAVA_HOME/include/$host_os" + fi + PLATFORM_CFLAGS= + PLATFORM_LDFLAGS= + PLATFORM_CLASSPATH_SEPARATOR=":" + SOPREFIX= + ;; +esac +AC_MSG_RESULT([$host_os]) +AC_SUBST(JNI_INCLUDES) +AC_SUBST(PLATFORM_CFLAGS) +AC_SUBST(PLATFORM_LDFLAGS) +AC_SUBST(PLATFORM_CLASSPATH_SEPARATOR) + +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java new/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java --- old/java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-06-24 05:24:50.000000000 +0200 +++ new/java-access-bridge-1.26.2/bridge/org/GNOME/Accessibility/JavaBridge.java 2009-06-09 11:54:46.000000000 +0200 @@ -334,6 +334,47 @@ }; } + private boolean loadJni() { + try { + String javaHome = System.getProperty ("java.home"); + String jvmArch = System.getProperty ("sun.arch.data.model"); + String osArch = System.getProperty ("os.arch"); + String fileSep = System.getProperty ("file.separator"); + String libPath = javaHome + "/lib/ext/libjava-access-bridge-jni.so"; + + if ("64".equals(jvmArch)) { + String libPath64 = javaHome + "/lib/ext/" + osArch + "/libjava-access-bridge-jni.so"; + java.io.File fileLib64 = new java.io.File( libPath64.replace('/', fileSep.charAt(0)) ); + if (fileLib64.exists()) { + libPath = libPath64; + } + } + + if (!libPath.equals("")) { + libPath = libPath.replace('/', fileSep.charAt(0)); + System.load (libPath); + + if (debugFlag) { + System.err.println ( libPath + " loaded" ); + } + } else { + if (debugFlag) { + System.err.println ( "Error: jni library not found" ); + } + + return false; + } + } + catch (Throwable ex) + { + System.err.println(ex+" caught."); + ex.printStackTrace(); + return false; + } + + return true; + } + public static void main(String args[]) { new JavaBridge(); @@ -623,15 +664,20 @@ } oldFocusSelectStart = selection_start; oldFocusSelectEnd = selection_end; - if (selection_change_start != selection_change_end) { - selection_any.insert_string (oldFocusText.substring ( - Math.min (selection_change_start, selection_change_end), - Math.max (selection_change_start, selection_change_end))); - dispatchEvent (e.getSource(), - "object:text-selection-changed", - selection_start, selection_end, - selection_any); - } + try { + if (selection_change_start != selection_change_end) { + selection_any.insert_string (oldFocusText.substring ( + Math.min (selection_change_start, selection_change_end), + Math.max (selection_change_start, selection_change_end))); + dispatchEvent (e.getSource(), + "object:text-selection-changed", + selection_start, selection_end, + selection_any); + } + } catch(StringIndexOutOfBoundsException indexException) { + // the selection_change_end index may be more than the + // length of the string. ignore this case silently + } } } dispatchEvent(e.getSource(), @@ -745,11 +791,16 @@ oldFocusText = aeText.getTextRange (0, charCount); } else if ((ac != null) && (ac == oldFocusSource)) { + // accessibleAWTTextComponent + // the event fired by the text component is different from what we expect + // newValueObject is not the position of the insertion, + // but the position of the caret after the instertion, so fix newValueObject + newValueObject = new Integer(((Integer)newValueObject).intValue() - oldValue); + oldFocusText = getTextRange (aText, 0, charCount); any.insert_string (oldFocusText.substring ( ((Integer)newValueObject).intValue(), ((Integer)newValueObject).intValue() + oldValue)); - oldFocusText = getTextRange (aText, 0, charCount); } } else if ( charCount < prevCharCount ) { @@ -1089,6 +1140,10 @@ return false; } + if (! loadJni() ) { + return false; + } + if (AccessUtil.getRegistryObject() == null) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/configure.in new/java-access-bridge-1.26.2/configure.in --- old/java-access-bridge-1.23.0/configure.in 2008-06-24 05:31:32.000000000 +0200 +++ new/java-access-bridge-1.26.2/configure.in 2009-06-09 12:24:04.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT(bridge) -AM_INIT_AUTOMAKE(java-access-bridge, 1.23.0) +AM_INIT_AUTOMAKE(java-access-bridge,1.26.2) JAVA_REQUIRED=1.5 JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge" @@ -23,6 +23,19 @@ AC_SUBST(JAVA_HOME) AC_SUBST(JAVA) +AC_PROG_CC +AC_PROG_INSTALL +AC_ISC_POSIX + +CHECK_JNI + +AM_PROG_LIBTOOL + +PKG_CHECK_MODULES(GTK, [ + gtk+-2.0 >= 1.17.0 +]) + + AC_MSG_CHECKING([JDK version]) jversion=`$JAVA -version 2>&1 | head -n1 | cut -f2 -d'"' | cut -f1 -d_` AC_MSG_RESULT($jversion) @@ -149,5 +162,6 @@ registry/org/Makefile registry/org/GNOME/Makefile registry/org/GNOME/Accessibility/Makefile +jni/Makefile test/Makefile ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/jni/Makefile.am new/java-access-bridge-1.26.2/jni/Makefile.am --- old/java-access-bridge-1.23.0/jni/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/java-access-bridge-1.26.2/jni/Makefile.am 2009-05-25 10:18:07.000000000 +0200 @@ -0,0 +1,9 @@ +lib_LTLIBRARIES = libjava-access-bridge-jni.la + +libjava_access_bridge_jni_la_SOURCES = jni-main.c + +libjava_access_bridge_jni_la_CPPFLAGS = $(JNI_INCLUDES)\ + $(GTK_CFLAGS) + +libjava_access_bridge_jni_la_LIBADD = $(GTK_LIBS) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/java-access-bridge-1.23.0/jni/jni-main.c new/java-access-bridge-1.26.2/jni/jni-main.c --- old/java-access-bridge-1.23.0/jni/jni-main.c 1970-01-01 01:00:00.000000000 +0100 +++ new/java-access-bridge-1.26.2/jni/jni-main.c 2009-05-25 10:18:07.000000000 +0200 @@ -0,0 +1,33 @@ +/* + * java-access-bridge for GNOME + * Copyright 2009 Sun Microsystems Inc. + * + * 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 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include <jni.h> +#include <stdio.h> +#include <gtk/gtk.h> + +JNIEXPORT jint JNICALL JNI_OnLoad (JavaVM *javaVM, void *reserve) { + g_type_init(); + g_setenv( "NO_AT_BRIDGE", "1", TRUE ); + return JNI_VERSION_1_4; +} + +JNIEXPORT void JNICALL JNI_OnUnload (JavaVM *javaVM, void *reserve) { +} + ++++++ openjdk-7-src-b147-awt-crasher.patch ++++++ >From >http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-December/021050.html # HG changeset patch # User aph # Date 1354629728 0 # Node ID ea20c9388d90fd9fda085c59ceae25ea9d686ec6 # Parent 4aad3e6f68d2463f4fee63c93153394be6489c00 8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c Summary: Code does not check for JNU_GetEnv returning NULL. Reviewed-by: anthony diff -r 4aad3e6f68d2 -r ea20c9388d90 openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c --- a/openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 17:17:45 2012 +0400 +++ b/openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 14:02:08 2012 +0000 @@ -1260,13 +1260,15 @@ JavaVM* jvm = NULL; static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) { + JNIEnv * env; if (jvm != NULL) { - JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", - ptr_to_jlong(dpy), ptr_to_jlong(event)).i; - } else { - return 0; + env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); + if (env) { + return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", + ptr_to_jlong(dpy), ptr_to_jlong(event)).i; + } } + return 0; } /* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
