Hello community,
here is the log from the commit of package java-1_6_0-openjdk
checked in at Wed Sep 24 16:54:47 CEST 2008.
--------
--- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-07-31 02:14:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-09-05 09:00:55.000000000 +0200
@@ -1,0 +2,28 @@
+Fri Sep 5 08:33:01 CEST 2008 - mvyskocil@suse.cz
+
+- merged spec file upstream one (from icedtea.classpath.org) for simpler
+ maintenance in future
+ - movement of some macro definitions on the begining of the spec file
+ - added some missing macros (eg. icedteasnapshot and openjdkdate)
+ - the sources are defined by these macros
+ - changed the Group to Development/Languages/Java (from Libraries)
+ - changed the URL to icedtea.classpath.org
+ - removal of icedtea7 bootstrapping and leave the gcj and openjdk6 options
+ - improved BuildRequires and Requires - one value per line (better diff
+ output)
+ - a new --with-openjdk-src-zip option to configure
+- updates
+ - openjdk - version from 10_jul_2008
+ - icedtea - from b09 to b11
+ - java access bridge - from 1.22 to 1.23
+ - a new BuildRequire - rhino
+- changes in patches
+ - the java-1.6.0-openjdk-optflags.patch was improved (thanks to Mandriva)
+ - regenerated java-1.6.0-openjdk-makefile.patch and
+ java-1.6.0-openjdk-jhat.patch with movement into %prep
+ - new java-1.6.0-openjdk-java-access-bridge-tck.patch (from upstream)
+ - increase a numbers of SUSE specific patches
+ - removed java-enum_cell.patch, because it was obsoleted by new version of
+ source codes
+
+-------------------------------------------------------------------
Old:
----
icedtea6-1.2-7a015d5c9cb132abefb7f500852b3fef2ba7615d.tar.lzma
java-access-bridge-1.22.0.tar.lzma
java-enum_cell.patch
openjdk-6-src-b09-11_apr_2008-fedora.tar.lzma
New:
----
icedtea6-1.2.tar.lzma
java-1.6.0-openjdk-java-access-bridge-tck.patch
java-access-bridge-1.23.0.tar.lzma
openjdk-6-src-b11-10_jul_2008-fedora.tar.lzma
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.iw4132/_old 2008-09-24 16:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.iw4132/_new 2008-09-24 16:54:12.000000000 +0200
@@ -2,15 +2,101 @@
# spec file for package java-1_6_0-openjdk (Version MACRO)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%define gcjbootstrap 0
+%define runtest 0
+%define icedteaver 1.2
+%define icedteasnapshot %{nil}
+%define openjdkver b11
+%define openjdkdate 10_jul_2008
+%if 0%suse_version <= 1030
+%define ext bz2
+%else
+%define ext lzma
+%endif
+%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
+%define accessmajorver 1.23
+%define accessminorver 0
+%define accessver %{accessmajorver}.%{accessminorver}
+%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
+%define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
+%define openjdkurl %{openjdkurlbase}%{openjdkver}/
+%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.%{ext}
+%define mauvedate 2008-03-11
+%define multilib_arches ppc64 sparc64 x86_64
+%define jit_arches %{ix86} x86_64
+%ifarch %{ix86}
+%define archbuild i586
+%define archinstall i386
+%endif
+%ifarch x86_64
+%define archbuild amd64
+%define archinstall amd64
+%endif
+%ifnarch %{jit_arches}
+%define archbuild %{_arch}
+%define archinstall %{_arch}
+%endif
+# Reduce build time from 27 hours to 12 hours by only running test
+# suites on JIT architectures.
+%ifnarch %{jit_arches}
+%define runtests 0
+%endif
+%define buildoutputdir openjdk/control/build/linux-%{archbuild}
+%if %{gcjbootstrap}
+%define icedteaopt --with-libgcj-jar=%_javadir/libgcj-4.3.jar --with-gcj-home=%_jvmdir/java-1.5.0-gcj
+%else
+%define icedteaopt --with-openjdk --with-openjdk-home=/etc/alternatives/java_sdk
+%endif
+# Convert an absolute path to a relative path. Each symbolic link is
+# specified relative to the directory in which it is installed so that
+# it will resolve properly within chrooted installations.
+%define script 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
+%define abs2rel %{__perl} -e %{script}
+%ifarch %{multilib_arches}
+%define archsuffix .%{_arch}
+%define syslibdir %{_prefix}/lib64
+#% define _libdir %{_prefix}/lib
+%else
+%define archsuffix %{nil}
+%define syslibdir %{_libdir}
+%endif
+# Hard-code libdir on 64-bit architectures to make the 64-bit JDK
+# simply be another alternative.
+%define sdkname java-%{javaver}-%{origin}
+%define archname %{sdkname}%{archsuffix}
+%define localpolicy jce_%{javaver}_%{origin}_local_policy%{archsuffix}
+%define uspolicy jce_%{javaver}_%{origin}_us_export_policy%{archsuffix}
+%define javaplugin libjavaplugin.so%{archsuffix}
+# Standard JPackage naming and versioning defines.
%define origin openjdk
+%define priority 17100
%define javaver 1.6.0
+%define buildver 0
+# Standard JPackage directories and symbolic links.
+# Make 64-bit JDKs just another alternative on 64-bit architectures.
+# FIXME: add a archsuffix, or use of an baseline.conf
+%define jrelnk jre-%{javaver}-%{origin}
+%define sdklnk %{sdkname}
+%define sdkdir %{sdklnk}-%{version}
+%define jredir %{sdkdir}/jre
+%define sdkbindir %{_jvmdir}/%{sdklnk}/bin
+%define jrebindir %{_jvmdir}/%{jrelnk}/bin
+%define jvmjardir %{_jvmjardir}/%{sdkdir}
+%define jvmjarlink %{_jvmjardir}/%{sdklnk}
Name: java-1_6_0-openjdk
%define obsoletes java-1_7_0-icedtea
@@ -18,82 +104,106 @@
%if 0%suse_version <= 1100
Obsoletes: %obsoletes
%endif
-%define icedteaver 1.2
-%define openjdkver b09
Version: %{icedteaver}_%{openjdkver}
-Release: 17
+Release: 19
Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6
-Group: Development/Libraries/Java
+Group: Development/Languages/Java
License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception
Url: http://openjdk.java.net/
-%if 0%suse_version <= 1030
-%define ext bz2
-%else
-%define ext lzma
+%if 0%suse_version > 1030
BuildRequires: lzma
%endif
-Source0: icedtea6-1.2-7a015d5c9cb132abefb7f500852b3fef2ba7615d.tar.%ext
-Source1: openjdk-6-src-b09-11_apr_2008-fedora.tar.%ext
-%define accessmajorver 1.22
-%define accessver %{accessmajorver}.0
-Source2: http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/%{accessmajorver}/java-access-bridge-%{accessver}.tar.%ext
-Source3: http://cvs.fedoraproject.org/viewcvs/devel/java-1.7.0-icedtea/generate-fedor...
-Patch0: java-1.6.0-openjdk-makefile.patch
-Patch1: java-1.6.0-openjdk-optflags.patch
+Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.%{ext}
+Source1: %{fedorazip}
+Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.%{ext}
+Source3: %{genurl}generate-fedora-zip.sh
+# FIXME: This patch needs to be fixed. optflags argument -mtune=generic is
+# being ignored because it breaks several graphical applications.
+# (wallluck): Fixed to patch configure.ac, not configure
+Patch0: java-1.6.0-openjdk-optflags.patch
+Patch1: java-1.6.0-openjdk-makefile.patch
+# FIXME: The licenses in the jhat sources need to be fixed with proper GPL
+# Licenses.
Patch2: java-1.6.0-openjdk-jhat.patch
-Patch3: openjdk-6-src-b09-execstack.patch
-Patch4: openjdk-6-src-b09-gcc4-warningfixes.patch
-Patch5: openjdk-6-src-b09-s390+s390x.patch
-Patch6: openjdk-6-src-b09-s390-size_t-fixes.patch
-Patch7: java-enum_cell.patch
+Patch3: java-1.6.0-openjdk-java-access-bridge-tck.patch
+# SUSE patches
+Patch103: openjdk-6-src-b09-execstack.patch
+Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch
+Patch105: openjdk-6-src-b09-s390+s390x.patch
+Patch106: openjdk-6-src-b09-s390-size_t-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# Bootstrapping using gcj doesn't work in openSUSE so far, OpenJDK needs java-1.6:
-%define gcjbootstrap 0
-%ifarch %ix86 ia64 ppc ppc64 s390 x86_64
-%define openjdk_bootstrap 1
-%else
-%define openjdk_bootstrap 0
-%endif
-#
-# It may be possibe to bootstrap OpenJDK using a JDK from another architecure,
-# as long as it can run on the target archtecture using kernel support or
-# qemu, so BuildRequires are divided in those which need to be provided by
-# the target archtecture for compilation (and linking) and tools like the JDK.
-#
-# Composing the build environment works by copying the target buildroot over
-# the helper-buildroot which needs to provide the bootstrap JDK inside the mix:
-#
-# ifarch tools_arch
+BuildRequires: alsa-lib-devel
+BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
+BuildRequires: giflib-devel
+BuildRequires: openmotif-devel
+BuildRequires: xorg-x11
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: rhino
+BuildRequires: wget
+BuildRequires: xalan-j2
+# make sure to use bootstrap requires of ant
+BuildRequires: xerces-j2-bootstrap
+#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons
+BuildRequires: ant
+BuildRequires: zip
%if %{gcjbootstrap}
BuildRequires: ecj-bootstrap java-1_5_0-gcj-compat-devel
%else
-%if %{openjdk_bootstrap}
BuildRequires: java-1_6_0-openjdk java-1_6_0-openjdk-devel
-%else
-BuildRequires: java-1_7_0-icedtea java-1_7_0-icedtea-devel
-%endif
%endif
-PreReq: update-alternatives
-Requires: jpackage-utils >= 1.7.3
-# endif
-# These are just tools, they can be provided from any supported architecture.
-# ifarch any_running_arch
-BuildRequires: ant fdupes gawk pkg-config procps unzip wget xalan-j2 zip
-# make sure to use bootstrap requires of ant
-BuildRequires: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons
-# endif
-# These must be provided by from the target architecture for native build:
-#ifarch target_arch
-BuildRequires: alsa-lib-devel cups-devel giflib-devel libjpeg-devel libpng-devel
-BuildRequires: openmotif-devel xorg-x11 xorg-x11-proto-devel
-BuildRequires: at-spi-devel libbonobo-devel
-BuildRequires: gcc-c++ glib2-devel gtk2-devel libffi-devel
+# Mauve build requirements.
+#BuildRequires: x11-server-xvfb
+#BuildRequires: x11-font-type1
+#BuildRequires: x11-font-misc
+#BuildRequires: freetype2-devel >= 2.3.0
+#BuildRequires: fontconfig
+#BuildRequires: eclipse-ecj
+# Java Access Bridge for GNOME build requirements.
+BuildRequires: at-spi-devel
+BuildRequires: gawk
+BuildRequires: libbonobo-devel
+BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: xorg-x11-util-devel
+# gcjwebplugin build requirements.
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
+BuildRequires: mozilla-nspr-devel
BuildRequires: mozilla-xulrunner190-devel
#!BuildIgnore: mozilla-xulrunner181-devel mozilla-xulrunner181
-# endif
-# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating cacerts.
-#Requires: openssl-cacerts
+# Zero-assembler build requirement.
+%ifnarch %{jit_arches}
+BuildRequires: libffi-devel
+%endif
+%if %defined suse_version
+BuildRequires: fdupes
+BuildRequires: unzip
+BuildRequires: procps
+BuildRequires: gcc-c++
+%endif
+# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
+# cacerts.
+Requires: openssl-certs
+# Require jpackage-utils for ant.
+Requires: jpackage-utils >= 1.7.3
+# Require zoneinfo data provided by tzdata-java subpackage.
+Requires: tzdata-java
+# Post requires alternatives to install tool alternatives.
+Requires(post): update-alternatives
+# Postun requires alternatives to uninstall tool alternatives.
+Requires(postun): update-alternatives
+# Post requires update-desktop-database to update desktop database
+# for jnlp files.
+Requires(post): desktop-file-utils
+# Postun requires update-desktop-database to update desktop database
+# for jnlp files.
+Requires(postun): desktop-file-utils
+%if %defined suse_version
+PreReq: update-alternatives
+PreReq: desktop-file-utils
+%endif
# Standard JPackage base provides.
Provides: %(echo %name|sed s/_/./g)
Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
@@ -112,9 +222,14 @@
Provides: jaas = %{version}
Provides: jsse = %{version}
Provides: jce = %{version}
-Provides: jdbc-stdext = 3.0, jdbc-stdext = %{version}, java-sasl = %{version}
+Provides: jdbc-stdext = 3.0
+Provides: jdbc-stdext = %{version}
+Provides: java-sasl = %{version}
# Required at least by fop
-Provides: jre1.3.x jre1.4.x jre1.5.x jre1.6.x
+Provides: jre1.3.x
+Provides: jre1.4.x
+Provides: jre1.5.x
+Provides: jre1.6.x
%description
This Java 6 compatible Java Runtime Environment is based on OpenJDK 6
@@ -138,7 +253,7 @@
Obsoletes: %obsoletes-devel
%endif
Summary: Java SDK based on OpenJDK 6 and IcedTea 6
-Group: Development/Libraries/Java
+Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
PreReq: %{_sbindir}/update-alternatives
Provides: %(echo %name|sed s/_/./g)-devel
@@ -171,7 +286,7 @@
Obsoletes: %obsoletes-demo
%endif
Summary: Sources for building demo applications with OpenJDK 6
-Group: Development/Libraries/Java
+Group: Development/Languages/Java
Provides: %(echo %name|sed s/_/./g)-demo
Requires: %{name}-devel = %{version}-%{release}
@@ -189,7 +304,7 @@
Obsoletes: %obsoletes-src
%endif
Summary: OpenJDK 6 Java class sources for developers
-Group: Development/Libraries/Java
+Group: Development/Languages/Java
Requires: %{name}-devel = %{version}-%{release}
%description src
@@ -206,7 +321,7 @@
Obsoletes: %obsoletes-javadoc
%endif
Summary: Documentation of the Java API of OpenJDK 6
-Group: Development/Libraries/Java
+Group: Development/Languages/Java
PreReq: %{_sbindir}/update-alternatives
Provides: %(echo %name|sed s/_/./g)-javadoc
Provides: java-javadoc = %{version}-%{release}
@@ -226,7 +341,7 @@
Obsoletes: %obsoletes-plugin
%endif
Summary: Java web browser plugin based on OpenJDK 6 and IcedTea 6
-Group: Development/Libraries/Java
+Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
PreReq: %{_sbindir}/update-alternatives
Provides: %(echo %name|sed s/_/./g)-plugin
@@ -251,66 +366,37 @@
ulimit -a
# the Java VM of the bootstrap JDK needs a fair amount of virtual memory:
ulimit -v 2048000
-%ifarch x86_64 ppc64
-%define archsuffix .%{_arch}
-%else
-%define archsuffix %{nil}
-%endif
# Standard JPackage directories and symbolic links:
-%define sdkname java-%{javaver}-%{origin}
-%define archname %{sdkname}%{archsuffix}
-%define localpolicy jce_%{javaver}_%{origin}_local_policy%{archsuffix}
-%define uspolicy jce_%{javaver}_%{origin}_us_export_policy%{archsuffix}
-%define javaplugin libjavaplugin.so%{archsuffix}
-%define jrelnk jre-%{javaver}-%{origin}
-%define sdklnk %{sdkname}
-%define sdkdir %{sdklnk}-%{version}
-%define jredir %{sdkdir}/jre
-%define sdkbindir %{_jvmdir}/%{sdklnk}/bin
-%define jrebindir %{_jvmdir}/%{jrelnk}/bin
-%define jvmjardir %{_jvmjardir}/%{sdkdir}
-%define jvmjarlink %{_jvmjardir}/%{sdklnk}
-%define priority 17100
lzma -dc %{SOURCE0} | tar x --recursive-unlink -f -
%setup -n icedtea6-%{icedteaver} -q -D -T
lzma -dc %{SOURCE1} | tar x --recursive-unlink -f -
mkdir stamps;touch stamps/download.stamp
touch stamps/extract.stamp
lzma -dc %{SOURCE2} | tar x --recursive-unlink -f -
-%patch0
+%patch0 -b .optflags
+%patch1 -b .makefile
+%patch2 -b .jhat
+%patch3 -b .java-access-bridge-tck
%build
# the Java VM of the bootstrap JDK needs a fair amount of virtual memory:
ulimit -v 2048000
unset JAVA_HOME
-%if %{gcjbootstrap}
-%define icedteaopt --with-libgcj-jar=%_javadir/libgcj-4.3.jar --with-gcj-home=%_jvmdir/java-1.5.0-gcj
-%else
-%if %{openjdk_bootstrap}
-%define icedteaopt --with-openjdk --with-openjdk-home=/etc/alternatives/java_sdk
-%else
-%define icedteaopt --with-icedtea --with-icedtea-home=/etc/alternatives/java_sdk
-%endif
-%endif
export LIBFFI_CFLAGS="-I/usr/include"
export LIBFFI_LIBS="-lffi"
-./configure %{icedteaopt} # --enable-netx-plugin # needs icedtea-netx-plugin.patch
-#
-# configure extracts and links openjdk, now we can patch it:
-#
+autoreconf -i -v -f
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
patch_openjdk() {
- patch -l $* --input=%PATCH2
- patch -l $* --input=%PATCH3
- patch -l $* --input=%PATCH4
+ patch -l $* --input=%{PATCH103}
+ patch -l $* --input=%{PATCH104}
+%ifarch s390 s390x # contains a special makefile test which is only for s390(x) for now:
+ patch -l $* --input=%{PATCH105}
+%endif
# IcedTea's openjdk patching is quite a mess, this patch should be added as
# an IcedTea openjdk patch which is applied during the IcedTea patch orgy:
-%ifarch s390 s390x # Contains a special makefile test which is only for s390(x) for now:
- patch -l $* --input=%PATCH5
-%endif
%ifarch s390 # Only needed on s390 for now, could break on other archictures in theory, for review:
- patch -l $* --input=%PATCH6
+ patch -l $* --input=%PATCH106
%endif
- patch -l $* --input=%PATCH7
}
%if %{gcjbootstrap}
make patch-ecj; pushd openjdk-ecj; patch_openjdk -p1; popd
@@ -326,22 +412,7 @@
# complains about strict-aliasing bugs (-fno-strict-aliasing is used by Intel arch targes too):
sed -i 's/CFLAGS_REQUIRED.*ZERO_ARCHFLAG)/& -fno-strict-aliasing -fno-omit-frame-pointer/' openjdk/corba/make/common/Defs-linux.gmk
make
-#
-# Determine output directories of the openjdk build for later:
-#
-%ifarch x86_64
-%define archinstall amd64
-%define archbuild amd64
-%else
-%ifarch ppc ppc64 ia64 s390 s390x
-%define archinstall %{_arch}
-%define archbuild %{_arch}
-%else
-%define archinstall i386
-%define archbuild i586
-%endif
-%endif
-%define buildoutputdir openjdk/control/build/linux-%{archbuild}
+# ========== java access bridge ==========
pushd java-access-bridge-%{accessver}
export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
export PATH=$JAVA_HOME/bin:$PATH
@@ -352,8 +423,6 @@
popd
%install
-%define script 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
-%define abs2rel %{__perl} -e %{script}
# skip /usr/lib/rpm/brp-check-bytecode-version:
export NO_BRP_CHECK_BYTECODE_VERSION=true
pushd %{buildoutputdir}/j2sdk-image
@@ -749,6 +818,31 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Fri Sep 05 2008 mvyskocil@suse.cz
+- merged spec file upstream one (from icedtea.classpath.org) for simpler
+ maintenance in future
+ - movement of some macro definitions on the begining of the spec file
+ - added some missing macros (eg. icedteasnapshot and openjdkdate)
+ - the sources are defined by these macros
+ - changed the Group to Development/Languages/Java (from Libraries)
+ - changed the URL to icedtea.classpath.org
+ - removal of icedtea7 bootstrapping and leave the gcj and openjdk6 options
+ - improved BuildRequires and Requires - one value per line (better diff
+ output)
+ - a new --with-openjdk-src-zip option to configure
+- updates
+ - openjdk - version from 10_jul_2008
+ - icedtea - from b09 to b11
+ - java access bridge - from 1.22 to 1.23
+ - a new BuildRequire - rhino
+- changes in patches
+ - the java-1.6.0-openjdk-optflags.patch was improved (thanks to Mandriva)
+ - regenerated java-1.6.0-openjdk-makefile.patch and
+ java-1.6.0-openjdk-jhat.patch with movement into %%prep
+ - new java-1.6.0-openjdk-java-access-bridge-tck.patch (from upstream)
+ - increase a numbers of SUSE specific patches
+ - removed java-enum_cell.patch, because it was obsoleted by new version of
+ source codes
* Wed Jul 30 2008 ro@suse.de
- extend provides list jre1.4.x jre1.5.x jre1.6.x
* Tue Jul 29 2008 ro@suse.de
++++++ java-1.6.0-openjdk-java-access-bridge-tck.patch ++++++
--- java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java
+++ java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java
@@ -34,6 +34,8 @@
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleText;
import javax.accessibility.AccessibleEditableText;
+import java.security.PrivilegedAction;
+import java.security.AccessController;
public class JavaBridge {
@@ -348,7 +350,11 @@
System.err.println ("Java Accessibility Bridge for GNOME loaded.\n");
// Not sure what kind of arguments should be sent to ORB
- String vm_rev = System.getProperty("java.version");
+ String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() {
+ public java.lang.Object run() {
+ return System.getProperty("java.version");
+ }
+ });
if (vm_rev.compareTo("1.4.0") < 0) {
System.err.println("WARNING: Java Accessibility Bridge " +
++++++ java-1.6.0-openjdk-jhat.patch ++++++
--- /var/tmp/diff_new_pack.iw4132/_old 2008-09-24 16:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.iw4132/_new 2008-09-24 16:54:12.000000000 +0200
@@ -1,6 +1,25 @@
-diff -ruN openjdkb21/openjdk/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
---- openjdkb21/openjdk/jdk/make/launchers/Makefile 2007-09-27 03:52:09.000000000 -0400
-+++ openjdk/jdk/make/launchers/Makefile 2007-10-15 10:18:32.000000000 -0400
+--- openjdk/jdk/make/common/Release.gmk
++++ openjdk/jdk/make/common/Release.gmk
+@@ -373,7 +373,6 @@
+ com/sun/tools/example/debug/expr \
+ com/sun/tools/example/debug/tty \
+ com/sun/tools/extcheck \
+- com/sun/tools/hat \
+ com/sun/tools/javac \
+ com/sun/tools/javadoc \
+ com/sun/tools/apt \
+@@ -473,8 +472,7 @@
+ wsgen$(EXE_SUFFIX) \
+ wsimport$(EXE_SUFFIX) \
+ schemagen$(EXE_SUFFIX) \
+- jsadebugd$(EXE_SUFFIX) \
+- jhat$(EXE_SUFFIX)
++ jsadebugd$(EXE_SUFFIX)
+
+ # The following get removed from the JRE after the bulk-copy of LIBDIR...
+ NOTJRELIBS = tools.jar \
+--- openjdk/jdk/make/launchers/Makefile
++++ openjdk/jdk/make/launchers/Makefile
@@ -70,7 +70,6 @@
$(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
-J-Djconsole.showOutputViewer, )
@@ -9,9 +28,8 @@
$(call make-launcher, jinfo, sun.tools.jinfo.JInfo, \
-J-Dsun.jvm.hotspot.debugger.useProcDebugger \
-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
-diff -ruN openjdkb21/openjdk/jdk/make/sun/tools/Makefile openjdk/jdk/make/sun/tools/Makefile
---- openjdkb21/openjdk/jdk/make/sun/tools/Makefile 2007-09-27 03:52:13.000000000 -0400
-+++ openjdk/jdk/make/sun/tools/Makefile 2007-10-15 10:16:52.000000000 -0400
+--- openjdk/jdk/make/sun/tools/Makefile
++++ openjdk/jdk/make/sun/tools/Makefile
@@ -42,7 +42,6 @@
sun/tools/jstack \
sun/tools/jstat \
@@ -34,9 +52,8 @@
# Extra jrunscript files
JRUNSCRIPT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/script/shell
FILES_copy += \
-diff -ruN openjdkb21/openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
---- openjdkb21/openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh 2007-09-27 04:20:15.000000000 -0400
-+++ openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh 2007-10-15 10:19:33.000000000 -0400
+--- openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
++++ openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
@@ -49,10 +49,6 @@
${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES \
DumpHeap ${DUMPFILE} || exit 2
@@ -48,23 +65,3 @@
# dump file is large so remove it
rm ${DUMPFILE}
---- oldopenjdk/jdk/make/common/Release.gmk 2008-02-05 11:31:07.000000000 -0500
-+++ openjdk/jdk/make/common/Release.gmk 2008-02-05 11:32:09.000000000 -0500
-@@ -371,7 +371,6 @@
- com/sun/tools/example/debug/expr \
- com/sun/tools/example/debug/tty \
- com/sun/tools/extcheck \
-- com/sun/tools/hat \
- com/sun/tools/javac \
- com/sun/tools/javadoc \
- com/sun/tools/apt \
-@@ -468,8 +462,7 @@
- wsgen$(EXE_SUFFIX) \
- wsimport$(EXE_SUFFIX) \
- schemagen$(EXE_SUFFIX) \
-- jsadebugd$(EXE_SUFFIX) \
-- jhat$(EXE_SUFFIX)
-+ jsadebugd$(EXE_SUFFIX)
-
- # The following get removed from the JRE after the bulk-copy of LIBDIR...
- NOTJRELIBS = tools.jar \
++++++ java-1.6.0-openjdk-makefile.patch ++++++
--- /var/tmp/diff_new_pack.iw4132/_old 2008-09-24 16:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.iw4132/_new 2008-09-24 16:54:12.000000000 +0200
@@ -1,56 +1,86 @@
---- makeorig 2008-03-27 13:34:52.000000000 -0400
-+++ Makefile.am 2008-03-27 13:35:11.000000000 -0400
-@@ -177,15 +177,6 @@
+--- Makefile.am
++++ Makefile.am
+@@ -295,74 +295,6 @@
endif
stamps/download.stamp:
+-if USE_ALT_OPENJDK_SRC_ZIP
+-else
- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
-- | $(MD5SUM) --check ; \
+- | $(MD5SUM) --check ; \
- then \
-- if [ $(OPENJDK_SRC_ZIP) ] ; \
-- then \
-- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
-- fi ; \
-- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+- if [ $(OPENJDK_SRC_ZIP) ] ; \
+- then \
+- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+- fi ; \
+- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
- fi
- mkdir -p stamps
- touch stamps/download.stamp
-
-@@ -292,8 +283,7 @@
- stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
-- mkdir openjdk ; \
-- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
-+ $(TAR) xzf $(OPENJDK_SRC_ZIP); \
- chmod -R ug+w openjdk ; \
- fi
- mkdir -p stamps
---- makeinorig 2008-03-27 13:34:58.000000000 -0400
-+++ Makefile.in 2008-03-27 13:35:15.000000000 -0400
-@@ -755,15 +756,6 @@
- mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
-
- stamps/download.stamp:
-- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
+-endif
+-if WITH_CACAO
+-if !USE_SYSTEM_CACAO
+-if USE_ALT_CACAO_SRC_ZIP
+-else
+- if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
- then \
-- if [ $(OPENJDK_SRC_ZIP) ] ; \
+- if [ $(CACAO_SRC_ZIP) ] ; \
- then \
-- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+- mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
- fi ; \
-- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+- $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
+- fi
+-endif
+-endif
+-endif
+-if WITH_VISUALVM
+-if USE_ALT_NETBEANS_PLATFORM_SRC_ZIP
+-else
+- if ! echo "$(NETBEANS_PLATFORM_MD5SUM) $(NETBEANS_PLATFORM_SRC_ZIP)" \
+- | $(MD5SUM) --check ; \
+- then \
+- if [ $(NETBEANS_PLATFORM_SRC_ZIP) ] ; \
+- then \
+- mv $(NETBEANS_PLATFORM_SRC_ZIP) $(NETBEANS_PLATFORM_SRC_ZIP).old ; \
+- fi ; \
+- $(WGET) $(NETBEANS_PLATFORM_URL)$(NETBEANS_PLATFORM_SRC_ZIP) \
+- -O $(NETBEANS_PLATFORM_SRC_ZIP) ; \
- fi
+-endif
+-if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
+-else
+- if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+- | $(MD5SUM) --check ; \
+- then \
+- if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
+- then \
+- mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
+- fi ; \
+- $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
+- -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
+- fi
+-endif
+-if USE_ALT_VISUALVM_SRC_ZIP
+-else
+- if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
+- | $(MD5SUM) --check ; \
+- then \
+- if [ $(VISUALVM_SRC_ZIP) ] ; \
+- then \
+- mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
+- fi ; \
+- $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
+- fi
+-endif
+-endif
mkdir -p stamps
touch stamps/download.stamp
-@@ -792,8 +784,7 @@
- stamps/extract.stamp: stamps/download.stamp
+@@ -515,7 +447,7 @@
if ! test -d openjdk ; \
then \
-- mkdir openjdk ; \
-- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
-+ $(TAR) xzf $(OPENJDK_SRC_ZIP); \
+ mkdir openjdk ; \
+- $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
++ $(TAR) xf $(OPENJDK_SRC_ZIP); \
chmod -R ug+w openjdk ; \
+ sh $(srcdir)/fsg.sh ; \
fi
- mkdir -p stamps
++++++ java-1.6.0-openjdk-optflags.patch ++++++
--- /var/tmp/diff_new_pack.iw4132/_old 2008-09-24 16:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.iw4132/_new 2008-09-24 16:54:12.000000000 +0200
@@ -1,175 +1,11 @@
---- openjdkold/icedtea6/patches/icedtea-optflags.patch 1969-12-31 19:00:00.000000000 -0500
-+++ patches/icedtea-optflags.patch 2008-04-01 08:41:47.000000000 -0400
-@@ -0,0 +1,59 @@
-+--- oldopenjdk/hotspot/src/share/vm/libadt/port.hpp 2008-02-28 05:02:37.000000000 -0500
-++++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-03-14 16:21:10.000000000 -0400
-+@@ -39,8 +39,8 @@
-+ #include