/hg/icedtea: Bump to b78.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jan 7 11:36:12 PST 2010
changeset 7e9ed32b98d7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7e9ed32b98d7
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 07 19:41:31 2010 +0000
Bump to b78.
2010-01-07 Andrew John Hughes <ahughes at redhat.com>
Bump to b78.
* patches/icedtea-alsa-default-device.patch: Dropped, applied
upstream.
* patches/icedtea-jdk-docs-target.patch: Revised and recreated
upstream.
* Makefile.am: Bump to b78.
* javac.in: Ignore -implicit:none option when using ecj.
* patches/boot/icedteart.patch: Drop langtools patch.
* patches/icedtea-override-redirect-metacity.patch: Reduced to
just the Metacity workaround.
diffstat:
7 files changed, 40 insertions(+), 81 deletions(-)
ChangeLog | 14 ++++++++
Makefile.am | 36 ++++++++++------------
javac.in | 4 +-
patches/boot/icedteart.patch | 19 -----------
patches/icedtea-alsa-default-device.patch | 17 ----------
patches/icedtea-jdk-docs-target.patch | 16 ---------
patches/icedtea-override-redirect-metacity.patch | 15 ++++-----
diffs (191 lines):
diff -r 6cd33d5c844d -r 7e9ed32b98d7 ChangeLog
--- a/ChangeLog Wed Jan 06 18:04:10 2010 -0500
+++ b/ChangeLog Thu Jan 07 19:41:31 2010 +0000
@@ -1,3 +1,17 @@ 2010-01-06 Deepak Bhole <dbhole at redhat.
+2010-01-07 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump to b78.
+ * patches/icedtea-alsa-default-device.patch:
+ Dropped, applied upstream.
+ * patches/icedtea-jdk-docs-target.patch:
+ Revised and recreated upstream.
+ * Makefile.am: Bump to b78.
+ * javac.in: Ignore -implicit:none option when
+ using ecj.
+ * patches/boot/icedteart.patch: Drop langtools patch.
+ * patches/icedtea-override-redirect-metacity.patch:
+ Reduced to just the Metacity workaround.
+
2010-01-06 Deepak Bhole <dbhole at redhat.com>
* configure.ac: Use libxul instead of libxul-unstable for the new NP
diff -r 6cd33d5c844d -r 7e9ed32b98d7 Makefile.am
--- a/Makefile.am Wed Jan 06 18:04:10 2010 -0500
+++ b/Makefile.am Thu Jan 07 19:41:31 2010 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b77
-
-CORBA_CHANGESET = e12a2cc2d9b5
-HOTSPOT_CHANGESET = 6b9522825101
-JAXP_CHANGESET = 3aeb520849db
-JAXWS_CHANGESET = 85d8e6e69be0
-JDK_CHANGESET = d3b07a3dd0da
-LANGTOOLS_CHANGESET = a2ad734c54f9
-OPENJDK_CHANGESET = 3430bb12a9a5
-
-CORBA_SHA256SUM = 40069a50a17c9e39a59cc9da5ad0e3db23747192ed900309bc6cf0d5a2969446
-HOTSPOT_SHA256SUM = 951efc3e173660a6ec47aba0609a476931fdc46fb6180235f92a85cd98365b83
-JAXP_SHA256SUM = e0405c0fe2f28a2ab8f77c6c5d2430357c0b62999a62e4da4315439a042bc0f3
-JAXWS_SHA256SUM = f59a4dc9c5c0f06cff7d14dbfb87c251b581f8700c01535cbd5f461c26d1d54d
-JDK_SHA256SUM = bac95b945892d15889f96a089a00baf96971950c4c2dbd74ef3b12fae1c32ada
-LANGTOOLS_SHA256SUM = d4f7763087532975cf106a23700e19cb668142e960f337ffcc4f83f8053a567d
-OPENJDK_SHA256SUM = b42e70c5fbeed6db9cac51897ab825c69d90ff26e5b38726d59ed27ed3a4db68
+OPENJDK_VERSION = b78
+
+CORBA_CHANGESET = 89141a0869e3
+HOTSPOT_CHANGESET = 54dde9f9887d
+JAXP_CHANGESET = f0f127b93c9e
+JAXWS_CHANGESET = 4ca731fe3154
+JDK_CHANGESET = 35224dd04ddb
+LANGTOOLS_CHANGESET = 21591a03bfbe
+OPENJDK_CHANGESET = f1cf9e78bbad
+
+CORBA_SHA256SUM = 0d41c7f3c3571cc95eae4fb4c0faf8dbbcc61846a4591f70b6870d7b4c2c0857
+HOTSPOT_SHA256SUM = 1127102aa1230d26da6b73118576aef872fb2e86d0d946797da737e64c91d6fc
+JAXP_SHA256SUM = 89f002ed4e6e4b6449e453284b31c4cbe466dedddeeb20249415c6edb10b52cb
+JAXWS_SHA256SUM = 62059bb48e5dad09060bcb79539562f596c77df48345bb35f0e26e815d1cfa6b
+JDK_SHA256SUM = b817bc7703acae21abc57d75eb16ac47d724da25253156aebc90f75c92a267a4
+LANGTOOLS_SHA256SUM = 4bff3af10a14048419bd144a39af2daa82756ca8ec226950d05b91ff99b1d0cc
+OPENJDK_SHA256SUM = df47020bf65614156e363a2170ee96f2959e08e62f9eaedacd3591147f858c00
CACAO_VERSION = 0.99.4
CACAO_SHA256SUM = c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
@@ -268,7 +268,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-shark-build.patch \
patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
patches/icedtea-security-updates.patch \
- patches/icedtea-jdk-docs-target.patch \
patches/icedtea-hotspot-gcc-pr36917.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
@@ -283,7 +282,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-lc_ctype.patch \
patches/icedtea-tests-jdk.patch \
patches/icedtea-stroker-finish.patch \
- patches/icedtea-alsa-default-device.patch \
patches/icedtea-linker-libs-order.patch \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
diff -r 6cd33d5c844d -r 7e9ed32b98d7 javac.in
--- a/javac.in Wed Jan 06 18:04:10 2010 -0500
+++ b/javac.in Thu Jan 07 19:41:31 2010 +0000
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
use strict;
use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror);
+use constant STRIP_ARGS => qw(-Werror -implicit:none);
my ($ECJ_WARNINGS, $JAVAC_WARNINGS);
@@ -22,7 +22,7 @@ my @ecj_parms = ($ECJ_WARNINGS, @bcoptio
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
# Work around ecj's inability to handle duplicate command-line
-# options.
+# options and unknown javac options.
sub gen_ecj_opts
{
my @new_args = @{$_[0]};
diff -r 6cd33d5c844d -r 7e9ed32b98d7 patches/boot/icedteart.patch
--- a/patches/boot/icedteart.patch Wed Jan 06 18:04:10 2010 -0500
+++ b/patches/boot/icedteart.patch Thu Jan 07 19:41:31 2010 +0000
@@ -39,22 +39,3 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
@$(java-vm-cleanup)
$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
---- openjdk-boot.orig/langtools/make/build.xml 2009-10-21 16:40:37.000000000 +0100
-+++ openjdk-boot/langtools/make/build.xml 2009-12-13 20:16:48.000000000 +0000
-@@ -524,6 +524,7 @@
- includeAntRuntime="no"
- source="@{javac.source}"
- target="@{javac.target}">
-+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/jre/lib/rt.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg line="${javac.version.opt}"/>
- <compilerarg line="-Xlint"/>
-@@ -540,6 +541,7 @@
- target="@{javac.target}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}">
-+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/jre/lib/rt.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
diff -r 6cd33d5c844d -r 7e9ed32b98d7 patches/icedtea-alsa-default-device.patch
--- a/patches/icedtea-alsa-default-device.patch Wed Jan 06 18:04:10 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-diff -uNr openjdk-orig/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c
---- openjdk-orig/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c 2008-11-03 15:02:16.000000000 -0500
-+++ openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c 2008-11-03 15:08:07.000000000 -0500
-@@ -143,8 +143,12 @@
- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- ret = snd_pcm_hw_params_any(handle, hwParams);
-- if (ret != 0) {
-+ /* snd_pcm_hw_params_any can return a positive value on success too */
-+ if (ret < 0) {
- ERROR1("snd_pcm_hw_params_any returned error %d\n", ret);
-+ } else {
-+ /* for the logic following this code, set ret to 0 to indicate success */
-+ ret = 0;
- }
- }
- snd_pcm_hw_params_get_format_mask(hwParams, formatMask);
diff -r 6cd33d5c844d -r 7e9ed32b98d7 patches/icedtea-jdk-docs-target.patch
--- a/patches/icedtea-jdk-docs-target.patch Wed Jan 06 18:04:10 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- openjdk/make/jdk-rules.gmk 2008-06-29 10:09:47.002591764 +0000
-+++ openjdk/make/jdk-rules.gmk 2008-06-29 15:04:01.228901751 +0000
-@@ -36,12 +36,7 @@
- IMAGES_TARGET = images
- endif
-
--# No DOCS build when JDK_UPDATE_VERSION set
--ifdef JDK_UPDATE_VERSION
-- DOCS_TARGET =
--else
-- DOCS_TARGET = docs
--endif
-+DOCS_TARGET = docs
-
- # NO_DOCS may be set in conjunction with DEV_ONLY
- ifdef NO_DOCS
diff -r 6cd33d5c844d -r 7e9ed32b98d7 patches/icedtea-override-redirect-metacity.patch
--- a/patches/icedtea-override-redirect-metacity.patch Wed Jan 06 18:04:10 2010 -0500
+++ b/patches/icedtea-override-redirect-metacity.patch Thu Jan 07 19:41:31 2010 +0000
@@ -1,12 +1,11 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2008-09-25 08:44:19.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2008-09-26 21:13:18.000000000 +0100
-@@ -1118,6 +1118,8 @@
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2010-01-04 16:57:29.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2010-01-04 19:47:57.000000000 +0000
+@@ -1142,6 +1142,7 @@
boolean isOverrideRedirect() {
- return (XWM.getWMID() == XWM.OPENLOOK_WM ? true : false) ||
-+ (XWM.getWMID() == XWM.METACITY_WM ? true : false) ||
-+ target.getName().equals("###overrideRedirect###") ||
- ((XToolkit)Toolkit.getDefaultToolkit()).isOverrideRedirect((Window)target) ||
- XTrayIconPeer.isTrayIconStuffWindow((Window)target);
+ return XWM.getWMID() == XWM.OPENLOOK_WM ||
++ XWM.getWMID() == XWM.METACITY_WM ||
+ Window.Type.POPUP.equals(getWindowType());
}
+
More information about the distro-pkg-dev
mailing list