/hg/icedtea6-hg: 18 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Sep 6 05:17:48 PDT 2010
changeset 00d9b2c78bc4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=00d9b2c78bc4
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 13 20:00:48 2010 +0100
Make rt.jar update dependent on bootstrapping, not the existence of
sun.awt.Toolkit.
2010-08-13 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Replace conditionals on
LACKS_SUN_AWT_TOOLKIT with ones on BOOTSTRAPPING. If we are
bootstrapping, we don't trust the system JDK and update
rt.jar with newly built classes, regardless of whether it's
an Oracle-based JDK or not.
* configure.ac: Remove check for sun.awt.Toolkit.
changeset 552e98f1c215 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=552e98f1c215
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 13 23:28:38 2010 +0100
Only patch the OpenGL headers when javah exhibits Classpath bug
#40188.
2010-08-13 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/javah.patch: Moved to...
* Makefile.am: Apply patch to OpenGL headers only if javah
exhibits Classpath bug 40188.
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188
* patches/ecj/cp40188-opengl.patch: here.
changeset fe7d70ac2b1a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fe7d70ac2b1a
author: omajid
date: Fri Aug 20 17:06:32 2010 -0400
netx: check for possible null in splash screen code
2010-08-19 Omair Majid <omajid at redhat.com>
Fixes rhbz601281
* NEWS: Update with this fix.
* netx/net/sourceforge/jnlp/JNLPSplashScreen.java
(setSplashImageURL): Check for possible null.
changeset fa8c9bfd3da5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fa8c9bfd3da5
author: omajid
date: Fri Aug 20 17:22:24 2010 -0400
netx: parse update elements in jnlp files
2010-08-20 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/JNLPFile.java (getUpdate): New
method. Returns the parsed UpdateDesc. (parse): Call
parser.getUpdate.
* netx/net/sourceforge/jnlp/Parser.java (getUpdate): New method.
Parses a node to find <update> elements.
* netx/net/sourceforge/jnlp/UpdateDesc.java: New class.
(UpdateDesc): New method. Creates a new UpdateDesc. (getPolicy):
New method. Returns the policy attribute of this update.
(getCheck): New method. Returns the check attribute for this update.
* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
PTwoUpdates error.
changeset 518927fb2498 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=518927fb2498
author: Andrew Su <asu at redhat.com>
date: Mon Aug 23 15:23:46 2010 -0400
2010-08-23 Andrew Su <asu at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
(parse): Removed parsing for unknown <app> tag.
changeset 6f017e9047ab in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6f017e9047ab
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Aug 24 23:19:33 2010 +0100
Include NimbusLookAndFeel as one of the bootstrap classes to avoid
conflicts with older versions in previous IcedTea6 releases.
2010-08-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Compile NimbusLookAndFeel as a
bootstrap class so the older version from IcedTea6 1.8 is
not used when bootstrapping with it.
changeset 1fc64b023005 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1fc64b023005
author: omajid
date: Wed Aug 25 15:49:56 2010 -0400
Backport S6438179: XToolkit.isTraySupported() result has nothing to
do with the system tray 2010-08-25 Omair Majid <omajid at redhat.com>
Fixes RH569121, S6438179
* NEWS: Update with new backport.
* Makefile.am (ICEDTEA_PATCHES): Apply new patch.
* patches/openjdk/6438179-systray_check.patch: Backport of S6438179.
changeset 627620efacc8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=627620efacc8
author: ptisnovs
date: Thu Aug 26 11:03:17 2010 +0200
Fixed missing JNI link to native function
OGLContext.getOGLIdString() which causes many OpenGL-related
regression tests to fail.
changeset ead30a628023 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ead30a628023
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Aug 27 13:59:35 2010 -0400
Fix rhbz#560193
Process nested jars in applet code only if size > 0 bytes.
changeset bf50b9b4cfa8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bf50b9b4cfa8
author: doko at ubuntu.com
date: Fri Aug 27 23:46:48 2010 +0200
Bump cacao version to changeset including build fixes for ARM and
S390
2010-08-27 Matthias Klose <doko at ubuntu.com>
* Makefile.am: Bump cacao version to changeset including
build fixes for ARM and S390.
* patches/cacao/version-parsing.patch: Remove, applied upstream.
changeset b1cf18e3cb6c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b1cf18e3cb6c
author: doko at ubuntu.com
date: Fri Aug 27 23:59:00 2010 +0200
Fix hotspot build with small SC_ARG_MAX
2010-08-27 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-too-many-args.diff: Fix build failure with
small SC_ARG_MAX.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* patches/ecj/icedtea-hotspot.patch: Update.
changeset 133ae13dda61 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=133ae13dda61
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 27 23:39:58 2010 +0100
PR398: hotspot hs16 / 6b17 build failure on sparc
2010-08-27 Andrew John Hughes <ahughes at redhat.com>
PR398, S6951319:
* Makefile.am: Add new patch.
* patches/openjdk/6951319-sparc_build_fixes.patch: Backport of
6951319 to fix build issues on GNU/Linux+SPARC.
* patches/systemtap.patch: Rerolled against 6951319.
* NEWS: Updated.
changeset 17e622c24432 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=17e622c24432
author: doko at ubuntu.com
date: Sat Aug 28 12:58:17 2010 +0200
Add missing file patches/icedtea-too-many-args.patch
changeset 423423aec247 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=423423aec247
author: ptisnovs
date: Wed Sep 01 11:50:21 2010 +0200
Backport of 6755274 a 6791612 patches to fix OpenGL-related
failures.
changeset a6b05ef50569 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a6b05ef50569
author: ptisnovs
date: Thu Sep 02 13:54:31 2010 +0200
New regression test added for checking if OpenGL context is properly
initialized.
changeset dfc3c1061ec7 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=dfc3c1061ec7
author: ptisnovs
date: Fri Sep 03 11:00:55 2010 +0200
Fixed indentation, changed spaces to tab.
changeset 4ccee81e878c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4ccee81e878c
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Sep 05 20:25:14 2010 +0100
Merge
changeset 4d346d8d7d27 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4d346d8d7d27
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 06 13:16:57 2010 +0100
Update JAXP tarball. Drop patch for 6438179, as applied upstream.
Drop portions of 6951319 applied upstream.
2010-09-05 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/6438179-systray_check.patch:
Dropped, applied upstream.
* Makefile.am: Drop above patch and those brought back by
merge.
* patches/openjdk/6951319-sparc_build_fixes.patch: Remove
upstreamed parts.
diffstat:
29 files changed, 1321 insertions(+), 1819 deletions(-)
ChangeLog | 178 +-
Makefile.am | 39
NEWS | 4
acinclude.m4 | 59
configure.ac | 2
netx/net/sourceforge/jnlp/JNLPFile.java | 10
netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 6
netx/net/sourceforge/jnlp/Parser.java | 50
netx/net/sourceforge/jnlp/UpdateDesc.java | 70
netx/net/sourceforge/jnlp/resources/Messages.properties | 1
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7
patches/cacao/version-parsing.patch | 11
patches/ecj/cp40188-opengl.patch | 92 +
patches/ecj/icedtea-hotspot.patch | 14
patches/ecj/javah.patch | 92 -
patches/icedtea-jtreg-OpenGLContextInit.patch | 46
patches/icedtea-jtreg-jrunscript.patch | 12
patches/icedtea-too-many-args.patch | 46
patches/openjdk/4356282-opentype.patch | 227 --
patches/openjdk/6678385-window_movement_crasher.patch | 1241 --------------
patches/openjdk/6755274-glgetstring-crash.patch | 56
patches/openjdk/6791612-opengl-jni-fix.patch | 27
patches/openjdk/6795060-icu_crash.patch | 95 -
patches/openjdk/6951319-sparc_build_fixes.patch | 618 ++++++
patches/openjdk/6954424-opentype_javadoc.patch | 23
patches/openjdk/6961732-negative_leading.patch | 45
patches/systemtap.patch | 33
plugin/icedteanp/IcedTeaNPPlugin.cc | 2
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34
diffs (truncated from 3570 to 500 lines):
diff -r c73c4672031a -r 4d346d8d7d27 ChangeLog
--- a/ChangeLog Tue Aug 10 14:52:56 2010 -0400
+++ b/ChangeLog Mon Sep 06 13:16:57 2010 +0100
@@ -1,3 +1,165 @@ 2010-08-09 Omair Majid <omajid at redhat.
+2010-09-05 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6438179-systray_check.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Drop above patch and those brought
+ back by merge. Update JAXP tarball.
+ * patches/openjdk/6951319-sparc_build_fixes.patch:
+ Remove upstreamed parts.
+
+2010-09-03 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Fixed indentation, changes spaces to tab.
+
+2010-09-02 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/icedtea-jtreg-OpenGLContextInit.patch:
+ New regression test added for checking if OpenGL context is properly initialized.
+
+2010-09-01 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add two new patches, removed one unused patch.
+ * patches/openjdk/6755274-glgetstring-crash.patch:
+ * patches/openjdk/6791612-opengl-jni-fix.patch:
+ Backport of 6755274 and 6791612 patches to fix OpenGL-related failures
+ (improper OpenGL initialization and missing link to native functions)
+
+2010-08-27 Andrew John Hughes <ahughes at redhat.com>
+
+ PR398, S6951319:
+ * Makefile.am: Add new patch.
+ * patches/openjdk/6951319-sparc_build_fixes.patch:
+ Backport of 6951319 to fix build issues on GNU/Linux+SPARC.
+ * patches/systemtap.patch: Rerolled against 6951319.
+ * NEWS: Updated.
+
+2010-08-27 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-too-many-args.diff: Fix build failure with
+ small SC_ARG_MAX.
+ * Makefile.am (ICEDTEA_PATCHES): Apply the above.
+ * patches/ecj/icedtea-hotspot.patch: Update.
+
+2010-08-27 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am: Bump cacao version to changeset including build
+ fixes for ARM and S390.
+ * patches/cacao/version-parsing.patch: Remove, applied upstream.
+
+2010-08-27 Deepak Bhole <dbhole at redhat.com>
+
+ Fixes rhbz#560193
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (activateJars): Process nested jar only if size > 0 bytes.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Fixed file name in header.
+
+2010-08-26 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add patch.
+ * patches/opengl-jni-fix.patch:
+ Fixed missing JNI link to native function
+ OGLContext.getOGLIdString() which causes
+ many OpenGL-related regression tests to fail.
+
+2010-08-25 Omair Majid <omajid at redhat.com>
+
+ Fixes RH569121, S6438179
+ * NEWS: Update with new backport.
+ * Makefile.am (ICEDTEA_PATCHES): Apply new patch.
+ * patches/openjdk/6438179-systray_check.patch: Backport of S6438179.
+
+2010-08-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Compile NimbusLookAndFeel as a
+ bootstrap class so the older version from
+ IcedTea6 1.8 is not used when bootstrapping
+ with it.
+
+2010-08-23 Andrew Su <asu at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (parse): Removed parsing for unknown <app> tag.
+
+2010-08-20 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/JNLPFile.java
+ (getUpdate): New method. Returns the parsed UpdateDesc.
+ (parse): Call parser.getUpdate.
+ * netx/net/sourceforge/jnlp/Parser.java
+ (getUpdate): New method. Parses a node to find <update> elements.
+ * netx/net/sourceforge/jnlp/UpdateDesc.java: New class.
+ (UpdateDesc): New method. Creates a new UpdateDesc.
+ (getPolicy): New method. Returns the policy attribute of this update.
+ (getCheck): New method. Returns the check attribute for this update.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties:
+ Add PTwoUpdates error.
+
+2010-08-19 Omair Majid <omajid at redhat.com>
+
+ Fixes rhbz601281
+ * NEWS: Update with this fix.
+ * netx/net/sourceforge/jnlp/JNLPSplashScreen.java
+ (setSplashImageURL): Check for possible null.
+
+2010-08-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/ecj/javah.patch: Moved to...
+ * Makefile.am: Apply patch to OpenGL headers
+ only if javah exhibits Classpath bug 40188.
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188
+ * patches/ecj/cp40188-opengl.patch: here.
+
+2009-05-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_JAVAH): Renamed from IT_CP39408_JAVAH.
+ Add test for PR40188.
+ * configure.ac:
+ Make full bootstrap the default again. Rename
+ IT_CP39408_JAVAH to IT_JAVAH.
+
+2009-03-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CP39408_JAVAH): Add classpath specification
+ to JAVAC invocation to handle buggy ecjs.
+
+2009-03-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CP39408_JAVAH): New test for Classpath
+ bug 39408.
+ * configure.ac: Enable new test. Result
+ as yet unused.
+
+2010-08-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Replace conditionals on LACKS_SUN_AWT_TOOLKIT
+ with ones on BOOTSTRAPPING. If we are bootstrapping,
+ we don't trust the system JDK and update rt.jar
+ with newly built classes, regardless of whether it's
+ an Oracle-based JDK or not.
+ * configure.ac:
+ Remove check for sun.awt.Toolkit.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/4356282-opentype.patch,
+ * patches/openjdk/6795060-icu_crash.patch,
+ * patches/openjdk/6954424-opentype_javadoc.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patches.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6678385-window_movement_crasher.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patch.
+
2010-08-09 Omair Majid <omajid at redhat.com>
* NEWS: Update with OpenType support.
@@ -38,7 +200,7 @@ 2010-08-09 Deepak Bhole <dbhole at redhat.
* Makefile.am:
(icedtea):Add update-bootclasspath.patch.
dependencies and copying. Add icedtea-update-bootclasspath.patch.
- * patches/update-bootclasspath.patch: New patch. Adds netx,
+ * patches/update-bootclasspath.patch: New patch. Adds netx,
rhino and plugin jars to the bootclasspath.
2010-08-09 Andrew John Hughes <ahughes at redhat.com>
@@ -350,6 +512,12 @@ 2010-07-28 Matthias Klose <doko at ubuntu
2010-07-28 Matthias Klose <doko at ubuntu.com>
* NEWS: Add 1.8.1 entry.
+
+2010-07-26 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-jtreg-jrunscript.patch:
+ Regenerate after 50002bfcff96 from dcubed being
+ added to OpenJDK6.
2010-07-26 Andrew John Hughes <ahughes at redhat.com>
@@ -799,6 +967,12 @@ 2010-07-08 Andrew John Hughes <ahughes
just delete the stamp.
(clean-extract-openjdk): Likewise for clean-patch and
clean-patch-fsg.
+
+2010-07-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6961732.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Remove above patch.
2010-07-06 Andrew John Hughes <ahughes at redhat.com>
@@ -9092,7 +9266,7 @@ 2009-04-07 Omair Majid <omajid at redhat.
2009-04-06 Omair Majid <omajid at redhat.com>
- * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
+ * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
jrunscriptTest.sh with a java version that isnt picky about int vs double
changes.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
diff -r c73c4672031a -r 4d346d8d7d27 Makefile.am
--- a/Makefile.am Tue Aug 10 14:52:56 2010 -0400
+++ b/Makefile.am Mon Sep 06 13:16:57 2010 +0100
@@ -5,8 +5,8 @@ OPENJDK_VERSION = b20
OPENJDK_VERSION = b20
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
-CACAO_VERSION = dd4532afd08a
-CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4
+CACAO_VERSION = e321b101a9ee
+CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
CACAO_BASE_URL = http://mips.complang.tuwien.ac.at
CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
@@ -17,9 +17,9 @@ JAF_DROP_URL = https://jax-ws.dev.java.n
JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/152561
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
@@ -91,6 +91,7 @@ ICEDTEA_BOOTSTRAP_CLASSES = \
ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
$(SHARE)/javax/management/StandardMBean.java \
+ $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java \
$(NETX_BOOTSTRAP_CLASSES)
# Flags
@@ -275,8 +276,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
patches/shark-debug-option.patch \
- patches/openjdk/6678385-window_movement_crasher.patch \
- patches/openjdk/6961732-negative_leading.patch \
patches/debug-dir.patch \
patches/no-sync.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -286,9 +285,9 @@ ICEDTEA_PATCHES = \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
patches/ipv4-mapped-ipv6-addresses.patch \
- patches/openjdk/6795060-icu_crash.patch \
- patches/openjdk/4356282-opentype.patch \
- patches/openjdk/6954424-opentype_javadoc.patch
+ patches/openjdk/6951319-sparc_build_fixes.patch \
+ patches/icedtea-too-many-args.patch \
+ patches/icedtea-jtreg-OpenGLContextInit.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -305,8 +304,7 @@ ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
patches/cacao/arm-arch-defines.patch \
patches/cacao/jsig.patch \
- patches/cacao/memory.patch \
- patches/cacao/version-parsing.patch
+ patches/cacao/memory.patch
endif
if WITH_CACAO
@@ -323,7 +321,9 @@ if ENABLE_XRENDER
if ENABLE_XRENDER
ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \
patches/openjdk/6307603-xrender-01.patch \
- patches/openjdk/6961633-xrender-02.patch
+ patches/openjdk/6961633-xrender-02.patch \
+ patches/openjdk/6791612-opengl-jni-fix.patch \
+ patches/openjdk/6755274-glgetstring-crash.patch
endif
if ENABLE_NIO2
@@ -365,9 +365,10 @@ endif
endif
if ENABLE_XRENDER
-ICEDTEA_ECJ_PATCHES += \
- patches/ecj/needs-6.patch \
- patches/ecj/javah.patch
+ICEDTEA_ECJ_PATCHES += patches/ecj/needs-6.patch
+if CP40188_JAVAH
+ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
+endif
endif
if !HAS_PAX
@@ -2068,7 +2069,7 @@ rt-source-files.txt: $(OPENJDK_ECJ_TREE)
done
stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
-if LACKS_SUN_AWT_TOOLKIT
+if BOOTSTRAPPING
mkdir -p lib/rt
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
-sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \
@@ -2083,7 +2084,7 @@ clean-rt:
rm -f stamps/rt-class-files.stamp
rm -f stamps/rt.stamp
rm -f rt-source-files.txt
-if LACKS_SUN_AWT_TOOLKIT
+if BOOTSTRAPPING
if [ -e $(ECJ_BOOT_DIR) ] ; then \
cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar ; \
fi
@@ -2091,7 +2092,7 @@ endif
stamps/rt.stamp: stamps/rt-class-files.stamp
mkdir -p stamps
-if LACKS_SUN_AWT_TOOLKIT
+if BOOTSTRAPPING
$(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \
-C lib/rt javax -C lib/rt sun
if ENABLE_NIO2
diff -r c73c4672031a -r 4d346d8d7d27 NEWS
--- a/NEWS Tue Aug 10 14:52:56 2010 -0400
+++ b/NEWS Mon Sep 06 13:16:57 2010 +0100
@@ -12,6 +12,10 @@ New in release 1.10 (2010-XX-XX):
* Backports from OpenJDK6
- S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts
- S6954424: Support OpenType/CFF fonts in JDK 7
+ - S6438179: XToolkit.isTraySupported() result has nothing to do with the system tray
+ - S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398)
+* NetX
+ - RH601281: Possible NullPointerException in splash screen code
New in release 1.9 (2010-XX-XX):
diff -r c73c4672031a -r 4d346d8d7d27 acinclude.m4
--- a/acinclude.m4 Tue Aug 10 14:52:56 2010 -0400
+++ b/acinclude.m4 Mon Sep 06 13:16:57 2010 +0100
@@ -1515,3 +1515,62 @@ AM_CONDITIONAL([HAS_PAX], test x"${it_cv
AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN([IT_JAVAH],[
+AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
+SUPERCLASS=Test.java
+SUBCLASS=TestImpl.java
+SUB=$(echo $SUBCLASS|sed 's#\.java##')
+SUBHEADER=$(echo $SUBCLASS|sed 's#\.java#.h#')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $SUPERCLASS
+/* [#]line __oline__ "configure" */
+public class Test
+{
+ public static final int POTATO = 0;
+ public static final int CABBAGE = 1;
+}
+EOF
+cat << \EOF > $SUBCLASS
+/* [#]line __oline__ "configure" */
+public class TestImpl
+ extends Test
+{
+ public native void doStuff();
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAH -classpath . $SUB >&AS_MESSAGE_LOG_FD 2>&1; then
+ if cat $SUBHEADER | grep POTATO >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_cp39408_javah=no;
+ else
+ it_cv_cp39408_javah=yes;
+ fi
+ else
+ AC_MSG_ERROR([The Java header generator $JAVAH failed])
+ echo "configure: failed program was:" >&AC_FD_CC
+ cat $SUBCLASS >&AC_FD_CC
+ fi
+else
+ AC_MSG_ERROR([The Java compiler $JAVAC failed])
+ echo "configure: failed program was:" >&AC_FD_CC
+ cat $SUBCLASS >&AC_FD_CC
+fi
+])
+AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 40188], it_cv_cp40188_javah, [
+ if test -e $SUBHEADER ; then
+ if cat $SUBHEADER | grep TestImpl_POTATO >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_cp40188_javah=no;
+ else
+ it_cv_cp40188_javah=yes;
+ fi
+ fi
+])
+rm -f $SUBCLASS $SUPERCLASS $SUBHEADER *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes")
+AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
diff -r c73c4672031a -r 4d346d8d7d27 configure.ac
--- a/configure.ac Tue Aug 10 14:52:56 2010 -0400
+++ b/configure.ac Mon Sep 06 13:16:57 2010 +0100
@@ -178,9 +178,9 @@ ENABLE_HG
ENABLE_HG
AC_CHECK_WITH_HG_REVISION
AC_CHECK_WITH_TZDATA_DIR
-IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
IT_GETDTDTYPE_CHECK
IT_CHECK_XULRUNNER_VERSION
+IT_JAVAH
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
diff -r c73c4672031a -r 4d346d8d7d27 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Tue Aug 10 14:52:56 2010 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Mon Sep 06 13:16:57 2010 +0100
@@ -82,6 +82,8 @@ public class JNLPFile {
/** information */
protected List info;
+
+ protected UpdateDesc update;
/** resources */
protected List resources;
@@ -345,6 +347,13 @@ public class JNLPFile {
}
/**
+ * Returns the update section of the JNLP file.
+ */
+ public UpdateDesc getUpdate() {
+ return update;
+ }
+
+ /**
* Returns the security section of the JNLP file.
*/
public SecurityDesc getSecurity() {
@@ -561,6 +570,7 @@ public class JNLPFile {
codeBase = parser.getCodeBase();
sourceLocation = parser.getFileLocation() != null ? parser.getFileLocation() : location;
info = parser.getInfo(root);
+ update = parser.getUpdate(root);
resources = parser.getResources(root, false); // false == not a j2se/java resources section
launchType = parser.getLauncher(root);
security = parser.getSecurity(root);
diff -r c73c4672031a -r 4d346d8d7d27 netx/net/sourceforge/jnlp/JNLPSplashScreen.java
--- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Tue Aug 10 14:52:56 2010 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Sep 06 13:16:57 2010 +0100
@@ -44,6 +44,12 @@ public class JNLPSplashScreen extends JF
try {
splashImage = ImageIO.read(resourceTracker
.getCacheFile(splashImageUrl));
+ if (splashImage == null) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Error loading splash image: " + url);
+ }
+ return;
+ }
} catch (IOException e) {
if (JNLPRuntime.isDebug()) {
System.err.println("Error loading splash image: " + url);
diff -r c73c4672031a -r 4d346d8d7d27 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Tue Aug 10 14:52:56 2010 -0400
+++ b/netx/net/sourceforge/jnlp/Parser.java Mon Sep 06 13:16:57 2010 +0100
@@ -25,6 +25,8 @@ import java.util.*;
//import org.w3c.dom.*; // class for using Tiny XML | NanoXML
//import org.xml.sax.*;
//import gd.xml.tiny.*;
+import net.sourceforge.jnlp.UpdateDesc.Check;
+import net.sourceforge.jnlp.UpdateDesc.Policy;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.nanoxml.*;
@@ -176,6 +178,53 @@ class Parser {
*/
public Version getSpecVersion() {
return spec;
+ }
+
+ public UpdateDesc getUpdate(Node parent) throws ParseException {
+ UpdateDesc updateDesc = null;
+ Node child = parent.getFirstChild();
+ while (child != null) {
+ if (child.getNodeName().equals("update")) {
+ if (strict && updateDesc != null) {
More information about the distro-pkg-dev
mailing list