changeset in /hg/icedtea: 2008-03-03 Joshua Sumali <jsumali at re...
Joshua Sumali
jsumali at redhat.com
Thu May 29 14:10:57 PDT 2008
changeset 7676131f9e83 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7676131f9e83
description:
2008-03-03 Joshua Sumali <jsumali at redhat.com>
* Makefile.am: Updated to b06.
* Makefile.in: Regenerated.
* patches/icedtea-ant.patch: Updated line numbers for b06.
* patches/icedtea-bytebuffer-compact.patch: Likewise.
* patches/icedtea-copy-plugs.patch: Likewise.
* patches/icedtea-core-build.patch: Likewise.
* patches/icedtea-gcc-4.3.patch: Likewise.
* patches/icedtea-headers.patch: Likewise.
* patches/icedtea-lib64.patch: Likewise.
* patches/icedtea-libraries.patch: Likewise.
* patches/icedtea-ports.patch: Likewise.
* patches/icedtea-sunsrc.patch: Likewise.
* patches/icedtea-tools.patch: Likewise.
* patches/icedtea-use-system-tzdata.patch: Likewise.
* patches/icedtea-zero.patch: Likewise.
* patches/icedtea-graphics.patch: Removed awt patches since new awt code
is included in b06.
* rt/java/awt/*: Removed files since they are newly opened in b06.
diffstat:
45 files changed, 94 insertions(+), 10461 deletions(-)
ChangeLog | 21
Makefile.am | 6
Makefile.in | 6
generated/sun/awt/X11/generator/sizer.32.c | 16
patches/icedtea-ant.patch | 2
patches/icedtea-bytebuffer-compact.patch | 4
patches/icedtea-copy-plugs.patch | 45
patches/icedtea-core-build.patch | 8
patches/icedtea-gcc-4.3.patch | 2
patches/icedtea-graphics.patch | 131 -
patches/icedtea-headers.patch | 4
patches/icedtea-lib64.patch | 2
patches/icedtea-libraries.patch | 2
patches/icedtea-ports.patch | 10
patches/icedtea-sunsrc.patch | 8
patches/icedtea-tools.patch | 14
patches/icedtea-use-system-tzdata.patch | 14
patches/icedtea-zero.patch | 14
rt/java/awt/color/CMMException.java | 63
rt/java/awt/color/ColorSpace.java | 190 -
rt/java/awt/color/ICC_ColorSpace.java | 314 --
rt/java/awt/color/ICC_Profile.java | 1282 ----------
rt/java/awt/color/ICC_ProfileGray.java | 133 -
rt/java/awt/color/ICC_ProfileRGB.java | 227 -
rt/java/awt/image/BandedSampleModel.java | 758 -----
rt/java/awt/image/ColorConvertOp.java | 537 ----
rt/java/awt/image/ComponentSampleModel.java | 762 -----
rt/java/awt/image/DataBuffer.java | 473 ---
rt/java/awt/image/DataBufferByte.java | 245 -
rt/java/awt/image/DataBufferInt.java | 244 -
rt/java/awt/image/DataBufferShort.java | 245 -
rt/java/awt/image/DataBufferUShort.java | 246 -
rt/java/awt/image/MultiPixelPackedSampleModel.java | 602 ----
rt/java/awt/image/Raster.java | 1156 ---------
rt/java/awt/image/RenderedImage.java | 70
rt/java/awt/image/SampleModel.java | 981 -------
rt/java/awt/image/SinglePixelPackedSampleModel.java | 597 ----
rt/java/awt/image/WritableRaster.java | 436 ---
rt/java/awt/image/WritableRenderedImage.java | 56
rt/java/awt/image/renderable/ContextualRenderedImageFactory.java | 56
rt/java/awt/image/renderable/RenderContext.java | 141 -
rt/java/awt/image/renderable/RenderableImage.java | 62
rt/java/awt/image/renderable/RenderableImageOp.java | 157 -
rt/java/awt/image/renderable/RenderableImageProducer.java | 166 -
rt/java/awt/image/renderable/RenderedImageFactory.java | 47
diffs (truncated from 11017 to 500 lines):
diff -r f5e4411c76e2 -r 7676131f9e83 ChangeLog
--- a/ChangeLog Thu Feb 28 13:34:20 2008 -0500
+++ b/ChangeLog Mon Mar 03 20:58:16 2008 -0500
@@ -1,3 +1,24 @@ 2008-02-28 Joshua Sumali <jsumali at redh
+2008-03-03 Joshua Sumali <jsumali at redhat.com>
+
+ * Makefile.am: Updated to b06.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-ant.patch: Updated line numbers for b06.
+ * patches/icedtea-bytebuffer-compact.patch: Likewise.
+ * patches/icedtea-copy-plugs.patch: Likewise.
+ * patches/icedtea-core-build.patch: Likewise.
+ * patches/icedtea-gcc-4.3.patch: Likewise.
+ * patches/icedtea-headers.patch: Likewise.
+ * patches/icedtea-lib64.patch: Likewise.
+ * patches/icedtea-libraries.patch: Likewise.
+ * patches/icedtea-ports.patch: Likewise.
+ * patches/icedtea-sunsrc.patch: Likewise.
+ * patches/icedtea-tools.patch: Likewise.
+ * patches/icedtea-use-system-tzdata.patch: Likewise.
+ * patches/icedtea-zero.patch: Likewise.
+ * patches/icedtea-graphics.patch: Removed awt patches since new awt code
+ is included in b06.
+ * rt/java/awt/*: Removed files since they are newly opened in b06.
+
2008-02-28 Joshua Sumali <jsumali at redhat.com>
* Makefile.am:
diff -r f5e4411c76e2 -r 7676131f9e83 Makefile.am
--- a/Makefile.am Thu Feb 28 13:34:20 2008 -0500
+++ b/Makefile.am Mon Mar 03 20:58:16 2008 -0500
@@ -1,6 +1,6 @@ OPENJDK_DATE = 12_feb_2008
-OPENJDK_DATE = 12_feb_2008
-OPENJDK_MD5SUM = 660e6230dfc4cdc8a7c93bc3e7e60120
-OPENJDK_VERSION = b05
+OPENJDK_DATE = 28_feb_2008
+OPENJDK_MD5SUM = 08bdfb4d78340788969a4edd853fcd2b
+OPENJDK_VERSION = b06
if NETX_PLUGIN
NETX_PATCH = patches/icedtea-netx-plugin.patch
diff -r f5e4411c76e2 -r 7676131f9e83 Makefile.in
--- a/Makefile.in Thu Feb 28 13:34:20 2008 -0500
+++ b/Makefile.in Mon Mar 03 20:58:16 2008 -0500
@@ -209,9 +209,9 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_DATE = 12_feb_2008
-OPENJDK_MD5SUM = 660e6230dfc4cdc8a7c93bc3e7e60120
-OPENJDK_VERSION = b05
+OPENJDK_DATE = 28_feb_2008
+OPENJDK_MD5SUM = 08bdfb4d78340788969a4edd853fcd2b
+OPENJDK_VERSION = b06
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
diff -r f5e4411c76e2 -r 7676131f9e83 generated/sun/awt/X11/generator/sizer.32
Binary file generated/sun/awt/X11/generator/sizer.32 has changed
diff -r f5e4411c76e2 -r 7676131f9e83 generated/sun/awt/X11/generator/sizer.32.c
--- a/generated/sun/awt/X11/generator/sizer.32.c Thu Feb 28 13:34:20 2008 -0500
+++ b/generated/sun/awt/X11/generator/sizer.32.c Mon Mar 03 20:58:16 2008 -0500
@@ -6,11 +6,25 @@
#include <X11/Xatom.h>
#include <stdio.h>
-#include <Xm/MwmUtil.h>
#include <X11/extensions/Xdbe.h>
#include "awt_p.h"
#include "color.h"
#include "colordata.h"
+
+/* the struct below was copied from MwmUtil.h to workaround a lesstif bug:
+ http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */
+
+typedef struct PROPMOTIFWMHINTS {
+/* 32-bit property items are stored as long on the client (whether
+ * that means 32 bits or 64). XChangeProperty handles the conversion
+ * to the actual 32-bit quantities sent to the server.
+ */
+ unsigned long flags;
+ unsigned long functions;
+ unsigned long decorations;
+ long inputMode;
+ unsigned long status;
+} PropMwmHints;
int main(){
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-ant.patch
--- a/patches/icedtea-ant.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-ant.patch Mon Mar 03 20:58:16 2008 -0500
@@ -96,7 +96,7 @@
# Default target and expected 'do everything' target
--- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400
+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500
-@@ -100,6 +100,7 @@
+@@ -109,6 +109,7 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
target="${javac.target}"
excludes="com/sun/tools/internal/txw2/**">
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-bytebuffer-compact.patch
--- a/patches/icedtea-bytebuffer-compact.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-bytebuffer-compact.patch Mon Mar 03 20:58:16 2008 -0500
@@ -42,7 +42,7 @@
return this;
}
-@@ -367,7 +367,7 @@
+@@ -368,7 +368,7 @@
*/
public final Buffer rewind() {
position = 0;
@@ -51,7 +51,7 @@
return this;
}
-@@ -548,4 +548,8 @@
+@@ -547,4 +547,8 @@
throw new IndexOutOfBoundsException();
}
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-copy-plugs.patch Mon Mar 03 20:58:16 2008 -0500
@@ -33,8 +33,8 @@ diff -urN openjdk.orig/jdk/src/share/cla
Type[] paramTypes = constr.getGenericParameterTypes();
if (paramTypes.length != propertyNames.length) {
---- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig 2008-02-27 16:48:35.000000000 -0500
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-27 16:46:09.000000000 -0500
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-28 04:39:40.000000000 -0500
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-29 14:28:47.000000000 -0500
@@ -51,28 +51,19 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
com/sun/jmx/snmp/SnmpDefinitions.class \
@@ -66,17 +66,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
PLUG_SOUND_CLASS_NAMES = \
com/sun/media/sound/AbstractPlayer.class \
-@@ -130,9 +121,6 @@
- java/awt/color/CMMException.class \
- java/awt/color/ColorSpace.class \
- java/awt/color/ICC_ColorSpace.class \
--java/awt/color/ICC_Profile\$$1.class \
--java/awt/color/ICC_Profile\$$2.class \
--java/awt/color/ICC_Profile\$$3.class \
- java/awt/color/ICC_Profile.class \
- java/awt/color/ICC_ProfileGray.class \
- java/awt/color/ICC_ProfileRGB.class \
-@@ -162,8 +150,14 @@
+@@ -128,8 +119,14 @@
# Class list temp files (used by both import and export of plugs)
@@ -87,13 +77,13 @@ diff -urN openjdk.orig/jdk/src/share/cla
+PLUG_NETX_CLASS_NAMES = net
+
PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf sound awt
-+PLUG_CLASS_AREAS = jmf sound awt gnu javax netx
+-PLUG_CLASS_AREAS = jmf sound
++PLUG_CLASS_AREAS = jmf sound gnu javax netx
PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
# Create jargs file command
-@@ -191,6 +185,21 @@
- @for i in $(PLUG_AWT_CLASS_NAMES) ; do \
+@@ -152,6 +149,21 @@
+ @for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
$(ECHO) "$$i" >> $@ ; \
done
+$(PLUG_TEMPDIR)/gnu.clist:
@@ -114,9 +104,9 @@ diff -urN openjdk.orig/jdk/src/share/cla
$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
@$(prep-target)
$(CAT) $(PLUG_CLISTS) > $@
-@@ -200,6 +209,12 @@
+@@ -159,6 +171,12 @@
$(plug-create-jargs)
- $(PLUG_TEMPDIR)/awt.jargs: $(PLUG_TEMPDIR)/awt.clist
+ $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
$(plug-create-jargs)
+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
+ $(plug-create-jargs)
@@ -127,7 +117,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
$(plug-create-jargs)
-@@ -229,9 +244,9 @@
+@@ -188,9 +206,9 @@
# Import classes command
define import-binary-plug-classes
@@ -139,10 +129,10 @@ diff -urN openjdk.orig/jdk/src/share/cla
endef # import-binary-plug-classes
else # IMPORT_BINARY_PLUGS
-@@ -263,13 +278,22 @@
+@@ -220,12 +238,21 @@
+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
+ import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
- import-binary-plug-awt-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/awt.clist
- $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/awt.clist)
+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
+import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
@@ -154,12 +144,11 @@ diff -urN openjdk.orig/jdk/src/share/cla
import-binary-plug-jar: \
import-binary-plug-jmf-classes \
- import-binary-plug-sound-classes \
-- import-binary-plug-awt-classes
-+ import-binary-plug-awt-classes \
+- import-binary-plug-sound-classes
++ import-binary-plug-sound-classes \
+ import-binary-plug-gnu-classes \
-+ import-binary-plug-javax-classes \
-+ import-binary-plug-netx-classes \
++ import-binary-plug-javax-classes \
++ import-binary-plug-netx-classes \
# Import native libraries
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-core-build.patch Mon Mar 03 20:58:16 2008 -0500
@@ -116,7 +116,7 @@ diff -ru openjdk.orig/jdk/make/java/redi
ifeq ($(PLATFORM), windows)
# Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows
-@@ -119,8 +149,7 @@
+@@ -122,8 +152,7 @@
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
@@ -126,7 +126,7 @@ diff -ru openjdk.orig/jdk/make/java/redi
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
endif
-@@ -151,17 +180,25 @@
+@@ -154,17 +183,25 @@
# NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows
IMPORT_LIST += \
@@ -156,7 +156,7 @@ diff -ru openjdk.orig/jdk/make/java/redi
ifeq ($(PLATFORM), solaris)
# solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris
-@@ -195,11 +232,25 @@
+@@ -198,11 +235,25 @@
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
$(install-import-file)
@@ -184,7 +184,7 @@ diff -ru openjdk.orig/jdk/make/java/redi
@$(prep-target)
$(LN) -s ../$(LIBJSIG_NAME) $@
-@@ -224,6 +275,9 @@
+@@ -227,6 +278,9 @@
$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt
$(install-import-file)
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-gcc-4.3.patch
--- a/patches/icedtea-gcc-4.3.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-gcc-4.3.patch Mon Mar 03 20:58:16 2008 -0500
@@ -31,7 +31,7 @@
#include <iostream>
#else
#include <iostream.h>
-@@ -96,8 +96,11 @@
+@@ -99,8 +99,11 @@
FileBuffRegion *copy(); // Deep copy
FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-graphics.patch
--- a/patches/icedtea-graphics.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-graphics.patch Mon Mar 03 20:58:16 2008 -0500
@@ -1,110 +1,3 @@ diff -urN openjdk.orig/jdk/src/share/nat
-diff -urN openjdk.orig/jdk/src/share/native/sun/awt/image/imageInitIDs.h openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.h
---- openjdk.orig/jdk/src/share/native/sun/awt/image/imageInitIDs.h 2007-07-20 03:33:46.000000000 -0400
-+++ openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.h 2007-07-25 15:55:05.000000000 -0400
-@@ -120,7 +120,4 @@
- IMGEXTERN jfieldID g_KernelYOriginD;
- IMGEXTERN jfieldID g_KernelDataID;
-
--/* DataBufferInt ids */
--IMGEXTERN jfieldID g_DataBufferIntPdataID;
--
- #endif /* IMAGEINITIDS_H */
---- iopenjdkb23/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c 2007-10-30 04:38:58.000000000 -0400
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c 2007-11-13 12:43:26.000000000 -0500
-@@ -505,5 +505,5 @@
- IL_offset_fID = (*env)->GetFieldID (env, IL, "offset", "I");
- IL_nextRowOffset_fID = (*env)->GetFieldID (env, IL, "nextRowOffset", "I");
-
-- PF_ID_fID = (*env)->GetFieldID (env, Pf, "ID", "J");
-+ PF_ID_fID = (*env)->GetFieldID (env, Pf, "profileID", "J");
- }
---- iopenjdkb23/openjdk/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java 2007-10-30 04:37:17.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java 2007-11-13 12:47:25.000000000 -0500
-@@ -55,51 +55,48 @@
- public int[] getData(DataBufferInt dbi, int bank);
- public StateTrackableDelegate getTrackable(DataBuffer db);
- }
--
-+/*
- public static void setDataStealer(DataStealer ds) {
- if (stealer != null) {
- throw new InternalError("Attempt to set DataStealer twice");
- }
- stealer = ds;
- }
--
-+*/
- public static byte[] stealData(DataBufferByte dbb, int bank) {
-- return stealer.getData(dbb, bank);
-+// return stealer.getData(dbb, bank);
-+ return dbb.getData(bank);
- }
-
- public static short[] stealData(DataBufferUShort dbus, int bank) {
-- return stealer.getData(dbus, bank);
-+// return stealer.getData(dbus, bank);
-+ return dbus.getData(bank);
- }
-
- public static int[] stealData(DataBufferInt dbi, int bank) {
-- return stealer.getData(dbi, bank);
-+// return stealer.getData(dbi, bank);
-+ return dbi.getData(bank);
- }
-
- public static StateTrackableDelegate stealTrackable(DataBuffer db) {
-- return stealer.getTrackable(db);
-+// return stealer.getTrackable(db);
-+ return StateTrackableDelegate.UNTRACKABLE_DELEGATE;
- }
-
- public static void markDirty(DataBuffer db) {
-- stealer.getTrackable(db).markDirty();
-+// stealer.getTrackable(db).markDirty();
- }
-
- public static void markDirty(WritableRaster wr) {
-- if (wr instanceof SunWritableRaster) {
-- ((SunWritableRaster) wr).markDirty();
-- } else {
-- markDirty(wr.getDataBuffer());
-- }
- }
-
- public static void markDirty(Image img) {
-- SurfaceData.getPrimarySurfaceData(img).markDirty();
- }
-
- private StateTrackableDelegate theTrackable;
-
- public SunWritableRaster(SampleModel sampleModel, Point origin) {
- super(sampleModel, origin);
-- theTrackable = stealTrackable(dataBuffer);
- }
-
- public SunWritableRaster(SampleModel sampleModel,
-@@ -107,7 +104,6 @@
- Point origin)
- {
- super(sampleModel, dataBuffer, origin);
-- theTrackable = stealTrackable(dataBuffer);
- }
-
- public SunWritableRaster(SampleModel sampleModel,
-@@ -117,13 +113,11 @@
- WritableRaster parent)
- {
- super(sampleModel, dataBuffer, aRegion, sampleModelTranslate, parent);
-- theTrackable = stealTrackable(dataBuffer);
- }
-
- /**
- * Mark the TrackableDelegate of the associated DataBuffer dirty.
- */
- public final void markDirty() {
-- theTrackable.markDirty();
- }
- }
--- ../opienjdkb23/openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java 2007-10-30 04:37:06.000000000 -0400
+++ openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java 2007-11-13 12:50:52.000000000 -0500
@@ -236,9 +236,6 @@
@@ -165,27 +58,3 @@ diff -urN openjdk.orig/jdk/src/share/nat
throw new IllegalArgumentException("Invalid axis: " + axis);
}
}
---- ../iopenjdkb23/openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.c 2007-10-30 04:38:50.000000000 -0400
-+++ openjdk/jdk/src/share/native/sun/awt/image/imageInitIDs.c 2007-11-13 12:52:43.000000000 -0500
-@@ -143,7 +143,7 @@
- jclass cls) {
- g_SPPSMmaskArrID = (*env)->GetFieldID(env, cls, "bitMasks", "[I");
- g_SPPSMmaskOffID = (*env)->GetFieldID(env, cls, "bitOffsets", "[I");
-- g_SPPSMnBitsID = (*env)->GetFieldID(env, cls, "bitSizes", "[I");
-+ g_SPPSMnBitsID = (*env)->GetFieldID(env, cls, "sampleSize", "[I");
- g_SPPSMmaxBitID = (*env)->GetFieldID(env, cls, "maxBitSize", "I");
-
- if (g_SPPSMmaskArrID == NULL || g_SPPSMmaskOffID == NULL ||
-@@ -228,12 +228,3 @@
- JNU_ThrowNullPointerException(env, "Unable to grab field ids");
- }
- }
--
--JNIEXPORT void JNICALL
--Java_java_awt_image_DataBufferInt_initIDs(JNIEnv *env, jclass cls) {
-- g_DataBufferIntPdataID = (*env)->GetFieldID(env, cls, "pData", "J");
-- if (g_DataBufferIntPdataID == NULL) {
-- JNU_ThrowNullPointerException(env, "Unable to grab DataBufferInt.pData");
-- return;
-- }
--}
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-headers.patch
--- a/patches/icedtea-headers.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-headers.patch Mon Mar 03 20:58:16 2008 -0500
@@ -11,7 +11,7 @@
--- openjdkold/jdk/make/tools/freetypecheck/Makefile 2008-01-04 18:20:30.000000000 -0500
+++ openjdk/jdk/make/tools/freetypecheck/Makefile 2008-02-26 11:21:34.000000000 -0500
-@@ -54,7 +54,7 @@
+@@ -61,7 +61,7 @@
ifeq ($(PLATFORM), solaris)
FT_OPTIONS += -R $(FT_LIB) -lfreetype
else #linux
@@ -22,7 +22,7 @@
--- openjdkold/jdk/make/common/Defs.gmk 2008-01-04 18:20:29.000000000 -0500
+++ openjdk/jdk/make/common/Defs.gmk 2008-02-26 11:21:49.000000000 -0500
-@@ -225,7 +225,7 @@
+@@ -237,7 +237,7 @@
ifeq ($(PLATFORM), windows)
FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
else
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-lib64.patch
--- a/patches/icedtea-lib64.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-lib64.patch Mon Mar 03 20:58:16 2008 -0500
@@ -1,6 +1,6 @@
--- origopenjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-04 18:11:53.000000000 -0500
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-11 11:15:24.000000000 -0500
-@@ -265,7 +265,12 @@
+@@ -271,7 +271,12 @@
* ...
* 7: The default directories, normally /lib and /usr/lib.
*/
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-libraries.patch Mon Mar 03 20:58:16 2008 -0500
@@ -75,7 +75,7 @@
LDFLAGS += -Wl,--allow-shlib-undefined
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
-@@ -250,7 +250,6 @@
+@@ -251,7 +251,6 @@
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
diff -r f5e4411c76e2 -r 7676131f9e83 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch Thu Feb 28 13:34:20 2008 -0500
+++ b/patches/icedtea-ports.patch Mon Mar 03 20:58:16 2008 -0500
@@ -57,7 +57,7 @@ diff -ru openjdk.orig/hotspot/src/os/lin
diff -ru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-11-08 11:36:15.000000000 +0000
-@@ -171,6 +171,12 @@
+@@ -174,6 +174,12 @@
# else
static char cpu_arch[] = "sparc";
# endif
@@ -70,7 +70,7 @@ diff -ru openjdk.orig/hotspot/src/os/lin
#else
#error Add appropriate cpu_arch setting
#endif
-@@ -2372,7 +2378,8 @@
+@@ -2370,7 +2376,8 @@
// format has been changed), we'll use the largest page size supported by
// the processor.
@@ -83,7 +83,7 @@ diff -ru openjdk.orig/hotspot/src/share/
diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2007-11-08 11:36:15.000000000 +0000
-@@ -147,7 +147,8 @@
+@@ -146,7 +146,8 @@
#define CPU IA32_ONLY("x86") \
IA64_ONLY("ia64") \
AMD64_ONLY("amd64") \
@@ -96,7 +96,7 @@ diff -ru openjdk.orig/hotspot/src/share/
diff -ru openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp
--- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2007-11-08 11:36:15.000000000 +0000
-@@ -176,6 +176,14 @@
+@@ -156,6 +156,14 @@
#define NOT_SPARC(code) code
#endif
More information about the distro-pkg-dev
mailing list