Mercurial > hg > release > icedtea6-1.11
changeset 2908:f352f5c79104
Correct issues found in building security patches.
2013-06-24 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Move 8009071 after library patch.
* NEWS: Correct bug ID referenced for OJ3.
* patches/ecj/needs-6.patch:
Add cases for javax.sound and javax.management, due
to @Override annotations in the security patches.
* patches/openjdk/6307603-xrender-01.patch:
Regenerated again as wrong last time.
* patches/security/20130618/8009071-improve_shape_handling.patch:
Include sizecalc.h in gif_lib.h.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Tue, 25 Jun 2013 15:07:59 +0100 |
| parents | d7eca687b7d2 |
| children | c5297dd496da |
| files | ChangeLog Makefile.am NEWS patches/ecj/needs-6.patch patches/openjdk/6307603-xrender-01.patch patches/security/20130618/8009071-improve_shape_handling.patch |
| diffstat | 6 files changed, 242 insertions(+), 139 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jun 22 16:38:24 2013 -0500 +++ b/ChangeLog Tue Jun 25 15:07:59 2013 +0100 @@ -1,4 +1,17 @@ -2013-06-22 Andrew John Hughes <gnu.andrew@member.fsf.org> +2013-06-24 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Move 8009071 after library patch. + * NEWS: Correct bug ID referenced for OJ3. + * patches/ecj/needs-6.patch: + Add cases for javax.sound and javax.management, due + to @Override annotations in the security patches. + * patches/openjdk/6307603-xrender-01.patch: + Regenerated again as wrong last time. + * patches/security/20130618/8009071-improve_shape_handling.patch: + Include sizecalc.h in gif_lib.h. + +2013-06-22 Andrew John Hughes <gnu.andrew@redhat.com> * patches/idresolver_fix.patch: Removed. Part of 6469266. @@ -12,7 +25,8 @@ Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES as must be applied before 8004584. Add 7171223 to end. - * patches/openjdk/6307603-xrender-01.patch, + * patches/openjdk/6307603-xrender-01.patch: + Regenerated. * patches/openjdk/6469266-xmlsec_1.4.2.patch, * patches/openjdk/6656651-windows_lcd_glyphs.patch, * patches/openjdk/6786028-wcag_bold_tags.patch, @@ -104,7 +118,7 @@ * patches/security/20130618/langtools_merge-03.patch: 2013/06/18 security patches. -2013-04-25 Andrew John Hughes <gnu.andrew@member.fsf.org> +2013-04-25 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Bump to 1.11.12pre. * NEWS: Add section for 1.11.12.
--- a/Makefile.am Sat Jun 22 16:38:24 2013 -0500 +++ b/Makefile.am Tue Jun 25 15:07:59 2013 +0100 @@ -433,7 +433,6 @@ patches/openjdk/6693253-security_warning.patch \ patches/openjdk/6444769-windowwithwarningtest.patch \ patches/openjdk/6656651-windows_lcd_glyphs.patch \ - $(SPECIAL_SECURITY_PATCH_2) \ patches/notice-safepoints.patch \ patches/parisc-opt.patch \ patches/lucene-crash.patch \ @@ -446,6 +445,7 @@ patches/gcc-suffix.patch \ patches/memory-limits.patch \ patches/libraries.patch \ + $(SPECIAL_SECURITY_PATCH_2) \ patches/jvmtiEnv.patch \ patches/lcms.patch \ patches/print_lsb_release.patch \
--- a/NEWS Sat Jun 22 16:38:24 2013 -0500 +++ b/NEWS Tue Jun 25 15:07:59 2013 +0100 @@ -72,7 +72,7 @@ - S7064279: Introspector.getBeanInfo() should release some resources in timely manner - S8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01 * Bug fixes - - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7197906) + - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7017193) - PR1362: Fedora 19 / rawhide FTBFS SIGILL - PR1319: Correct #ifdef to #if - PR1339: Simplify the rhino class rewriter to avoid use of concurrency
--- a/patches/ecj/needs-6.patch Sat Jun 22 16:38:24 2013 -0500 +++ b/patches/ecj/needs-6.patch Tue Jun 25 15:07:59 2013 +0100 @@ -22,3 +22,27 @@ GEN_DIR=$(GENSRCDIR)/sun/awt/X11 +diff -Nru openjdk-ecj.orig/jdk/make/javax/sound/Makefile openjdk-ecj/jdk/make/javax/sound/Makefile +--- openjdk-ecj.orig/jdk/make/javax/sound/Makefile 2013-06-24 00:00:22.031254425 +0100 ++++ openjdk-ecj/jdk/make/javax/sound/Makefile 2013-06-24 00:01:27.040288124 +0100 +@@ -28,6 +28,8 @@ + LIBRARY = jsound + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # include defines for sound + include SoundDefs.gmk +diff -Nru openjdk-ecj.orig/jdk/make/javax/management/Makefile openjdk-ecj/jdk/make/javax/management/Makefile +--- openjdk-ecj.orig/jdk/make/javax/management/Makefile 2011-11-14 22:11:40.000000000 +0000 ++++ openjdk-ecj/jdk/make/javax/management/Makefile 2013-06-24 00:40:59.742001431 +0100 +@@ -31,6 +31,8 @@ + PACKAGE = javax.management + PRODUCT = sun + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Files to compile
--- a/patches/openjdk/6307603-xrender-01.patch Sat Jun 22 16:38:24 2013 -0500 +++ b/patches/openjdk/6307603-xrender-01.patch Tue Jun 25 15:07:59 2013 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers ---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2013-06-22 16:01:50.561607738 -0500 -+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2013-06-22 16:16:23.516699861 -0500 +--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2013-06-25 02:34:37.152677961 +0100 ++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2013-06-25 02:36:51.142787805 +0100 @@ -312,6 +312,7 @@ Java_sun_awt_X11GraphicsEnvironment_initGLX; Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama; @@ -71,8 +71,8 @@ Java_sun_java2d_opengl_OGLContext_getOGLIdString; Java_sun_java2d_opengl_OGLMaskFill_maskFill; diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux ---- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2013-06-22 16:01:50.740608553 -0500 -+++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2013-06-22 16:16:23.517699859 -0500 +--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2013-06-25 02:34:37.324680663 +0100 ++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2013-06-25 02:36:51.150787932 +0100 @@ -428,6 +428,7 @@ Java_sun_awt_X11GraphicsEnvironment_initDisplay; Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama; @@ -82,8 +82,8 @@ diff -Nru openjdk.orig/jdk/make/sun/headless/mapfile-vers openjdk/jdk/make/sun/headless/mapfile-vers ---- openjdk.orig/jdk/make/sun/headless/mapfile-vers 2013-06-22 16:01:48.352591297 -0500 -+++ openjdk/jdk/make/sun/headless/mapfile-vers 2013-06-22 16:16:23.518699857 -0500 +--- openjdk.orig/jdk/make/sun/headless/mapfile-vers 2013-06-25 02:34:35.284648623 +0100 ++++ openjdk/jdk/make/sun/headless/mapfile-vers 2013-06-25 02:36:51.150787932 +0100 @@ -46,17 +46,20 @@ Java_sun_java2d_x11_X11Renderer_XFillRoundRect; Java_sun_java2d_x11_X11Renderer_devCopyArea; @@ -112,8 +112,8 @@ Java_java_awt_Font_initIDs; Java_sun_font_FontManager_getFontConfig; diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile ---- openjdk.orig/jdk/make/sun/jawt/Makefile 2013-06-22 16:01:49.796603467 -0500 -+++ openjdk/jdk/make/sun/jawt/Makefile 2013-06-22 16:16:23.518699857 -0500 +--- openjdk.orig/jdk/make/sun/jawt/Makefile 2013-06-25 02:34:35.940658926 +0100 ++++ openjdk/jdk/make/sun/jawt/Makefile 2013-06-25 02:36:51.150787932 +0100 @@ -118,7 +118,7 @@ # Libraries to link in. # @@ -124,8 +124,8 @@ ifeq ($(PLATFORM), linux) diff -Nru openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk ---- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2013-06-22 16:01:49.406600186 -0500 -+++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2013-06-22 16:16:23.518699857 -0500 +--- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2013-06-25 02:34:35.536652580 +0100 ++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2013-06-25 02:36:51.150787932 +0100 @@ -79,4 +79,7 @@ gtk2_interface.c \ swing_GTKEngine.c \ @@ -136,8 +136,8 @@ + XRBackendNative.c + diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile ---- openjdk.orig/jdk/make/sun/xawt/Makefile 2013-06-22 16:01:49.406600186 -0500 -+++ openjdk/jdk/make/sun/xawt/Makefile 2013-06-22 16:16:23.518699857 -0500 +--- openjdk.orig/jdk/make/sun/xawt/Makefile 2013-06-25 02:34:35.536652580 +0100 ++++ openjdk/jdk/make/sun/xawt/Makefile 2013-06-25 02:36:51.150787932 +0100 @@ -48,6 +48,11 @@ LDFLAGS += -L$(OPENWIN_LIB) @@ -169,8 +169,8 @@ ifeq ($(PLATFORM), linux) # Allows for builds on Debian GNU Linux, X11 is in a different place diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers ---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2013-06-22 16:01:51.483611926 -0500 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2013-06-22 16:16:23.518699857 -0500 +--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2013-06-25 02:34:38.056692161 +0100 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2013-06-25 02:36:51.150787932 +0100 @@ -186,6 +186,7 @@ Java_sun_font_FontManager_populateFontFileNameMap; Java_sun_awt_X11GraphicsEnvironment_initDisplay; @@ -241,8 +241,8 @@ Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow; Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box; diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java ---- openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 2013-06-22 16:16:23.519699855 -0500 +--- openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 2013-06-25 02:36:51.150787932 +0100 @@ -0,0 +1,32 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -277,8 +277,8 @@ + public void glyphDisposed(ArrayList<Long> glyphs); +} diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java openjdk/jdk/src/share/classes/sun/font/StrikeCache.java ---- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java 2013-06-22 16:01:48.356591329 -0500 -+++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java 2013-06-22 16:16:23.519699855 -0500 +--- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java 2013-06-25 02:34:35.292648748 +0100 ++++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java 2013-06-25 02:36:51.150787932 +0100 @@ -31,6 +31,7 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; @@ -440,8 +440,8 @@ public static Reference getStrikeRef(FontStrike strike) { return getStrikeRef(strike, cacheRefTypeWeak); diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java ---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2011-11-14 16:12:00.000000000 -0600 -+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2013-06-22 16:16:23.519699855 -0500 +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2011-11-14 22:12:00.000000000 +0000 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2013-06-25 02:36:51.150787932 +0100 @@ -307,7 +307,7 @@ * linear RGB space. Copied directly from the * MultipleGradientPaintContext class. @@ -452,8 +452,8 @@ input = color / 255.0f; diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java ---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2011-11-14 16:12:00.000000000 -0600 -+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2013-06-22 16:16:23.519699855 -0500 +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2011-11-14 22:12:00.000000000 +0000 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java 2013-06-25 02:36:51.150787932 +0100 @@ -131,6 +131,11 @@ curAddress = baseAddress; } @@ -467,8 +467,8 @@ * putByte() methods... */ diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine ---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2011-11-14 16:12:00.000000000 -0600 -+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2013-06-22 16:16:23.519699855 -0500 +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2011-11-14 22:12:00.000000000 +0000 ++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine 2013-06-25 02:36:51.150787932 +0100 @@ -1,2 +1,5 @@ +# Jules Rendering Engine module +sun.java2d.jules.JulesRenderingEngine @@ -478,8 +478,8 @@ +sun.java2d.pisces.PiscesRenderingEngine \ No newline at end of file diff -Nru openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c ---- openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c 2013-06-22 16:01:48.363591389 -0500 -+++ openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c 2013-06-22 16:16:23.519699855 -0500 +--- openjdk.orig/jdk/src/share/native/sun/font/AccelGlyphCache.c 2013-06-25 02:34:35.300648873 +0100 ++++ openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c 2013-06-25 02:36:51.150787932 +0100 @@ -325,6 +325,7 @@ cellInfo->glyphInfo = glyph; cellInfo->nextGCI = glyph->cellInfo; @@ -489,8 +489,8 @@ /** diff -Nru openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h ---- openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h 2013-06-22 16:01:44.530580871 -0500 -+++ openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h 2013-06-22 16:16:23.520699854 -0500 +--- openjdk.orig/jdk/src/share/native/sun/font/fontscalerdefs.h 2013-06-25 02:34:25.760499074 +0100 ++++ openjdk/jdk/src/share/native/sun/font/fontscalerdefs.h 2013-06-25 02:36:51.154787995 +0100 @@ -84,15 +84,26 @@ #define t2kScalarAverage(a, b) (((a) + (b)) / (t2kScalar)(2)) @@ -520,8 +520,8 @@ } GlyphInfo; diff -Nru openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c openjdk/jdk/src/share/native/sun/font/freetypeScaler.c ---- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c 2013-06-22 16:01:50.403607017 -0500 -+++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c 2013-06-22 16:16:23.520699854 -0500 +--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c 2013-06-25 02:34:36.620669606 +0100 ++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c 2013-06-25 02:36:51.154787995 +0100 @@ -783,6 +783,7 @@ return ptr_to_jlong(glyphInfo); } @@ -540,8 +540,8 @@ point; and a second-order control point if unset. */ current_type = SEG_CUBICTO; diff -Nru openjdk.orig/jdk/src/share/native/sun/font/sunFont.c openjdk/jdk/src/share/native/sun/font/sunFont.c ---- openjdk.orig/jdk/src/share/native/sun/font/sunFont.c 2013-06-22 16:01:48.363591389 -0500 -+++ openjdk/jdk/src/share/native/sun/font/sunFont.c 2013-06-22 16:16:23.520699854 -0500 +--- openjdk.orig/jdk/src/share/native/sun/font/sunFont.c 2013-06-25 02:34:35.300648873 +0100 ++++ openjdk/jdk/src/share/native/sun/font/sunFont.c 2013-06-25 02:36:51.154787995 +0100 @@ -294,7 +294,8 @@ for (i=0; i< len; i++) { if (ptrs[i] != 0) { @@ -572,8 +572,8 @@ } diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c ---- openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-11-14 16:12:13.000000000 -0600 -+++ openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2013-06-22 16:16:23.521699853 -0500 +--- openjdk.orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-11-14 22:12:13.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2013-06-25 02:36:51.154787995 +0100 @@ -244,6 +244,7 @@ OGLTR_AddToGlyphCache(GlyphInfo *glyph, jboolean rgbOrder) { @@ -616,8 +616,8 @@ // location of the glyph in the destination's coordinate space diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2013-06-22 16:01:48.369591440 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2013-06-22 16:16:23.521699853 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2013-06-25 02:34:35.304648936 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2013-06-25 02:36:51.154787995 +0100 @@ -37,6 +37,7 @@ import java.util.HashMap; @@ -679,8 +679,8 @@ } } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2013-06-22 16:01:48.462592225 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2013-06-22 16:16:23.522699852 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2013-06-25 02:34:35.368649941 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2013-06-25 02:36:51.154787995 +0100 @@ -26,6 +26,7 @@ package sun.awt; @@ -764,8 +764,8 @@ * Checks if Shared Memory extension can be used. * Returns: diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java ---- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 2013-06-22 16:16:23.522699852 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCacheEntry.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,206 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -974,8 +974,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java ---- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 2013-06-22 16:16:23.522699852 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/font/XRGlyphCache.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,301 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -1279,8 +1279,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2013-06-22 16:16:23.523699851 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,152 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -1435,8 +1435,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 2013-06-22 16:16:23.523699851 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/IdleTileCache.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,109 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -1548,8 +1548,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 2013-06-22 16:16:23.523699851 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,349 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -1901,8 +1901,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,271 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2176,8 +2176,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,54 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2234,8 +2234,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java 2013-06-25 02:36:51.154787995 +0100 @@ -0,0 +1,102 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2340,8 +2340,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/JulesTile.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2411,8 +2411,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TileWorker.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,146 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2561,8 +2561,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/jules/TrapezoidList.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,110 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2675,8 +2675,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2011-11-14 16:12:15.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2013-06-22 16:16:23.524699850 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2011-11-14 22:12:15.000000000 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java 2013-06-25 02:36:51.158788059 +0100 @@ -34,6 +34,8 @@ import sun.java2d.opengl.GLXGraphicsConfig; import sun.java2d.opengl.GLXVolatileSurfaceManager; @@ -2705,8 +2705,8 @@ return new X11VolatileSurfaceManager(vImg, context); } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2013-06-22 16:01:50.582607833 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2013-06-22 16:16:23.525699849 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2013-06-25 02:34:37.168678213 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2013-06-25 02:36:51.158788059 +0100 @@ -46,6 +46,7 @@ import sun.awt.SunToolkit; import sun.awt.X11ComponentPeer; @@ -2796,8 +2796,8 @@ private long xgc; private Region validatedClip; diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 2013-06-22 16:16:23.525699849 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/XSurfaceData.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,40 @@ +package sun.java2d.x11; + @@ -2840,8 +2840,8 @@ + protected static native void XSetGraphicsExposures(long xgc, boolean needExposures); +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java 2013-06-22 16:16:23.525699849 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/DirtyRegion.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,133 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -2977,8 +2977,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java 2013-06-22 16:16:23.525699849 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,127 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3108,8 +3108,8 @@ + +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java 2013-06-22 16:16:23.525699849 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,84 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3196,8 +3196,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java 2013-06-22 16:16:23.526699847 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,114 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3314,8 +3314,8 @@ + +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java 2013-06-22 16:16:23.526699847 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,62 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3380,8 +3380,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java 2013-06-22 16:16:23.526699847 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,79 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3463,8 +3463,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java 2013-06-22 16:16:23.526699847 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/MaskTile.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,166 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3633,8 +3633,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java 2013-06-22 16:16:23.526699847 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/MaskTileManager.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,327 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -3964,8 +3964,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java 2013-06-22 16:16:23.527699845 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/MutableInteger.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,57 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -4025,8 +4025,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java 2013-06-22 16:16:23.527699845 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,59 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -4088,8 +4088,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java 2013-06-22 16:16:23.527699845 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XIDGenerator.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,53 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -4145,8 +4145,8 @@ + private static native void bufferXIDs(int[] buffer, int arraySize); +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java 2013-06-22 16:16:23.527699845 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRBackend.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,117 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -4266,8 +4266,8 @@ + TrapezoidList trapList); +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java 2013-06-22 16:16:23.527699845 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRBackendNative.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,343 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -4613,8 +4613,8 @@ + int[] trapezoids); +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRColor.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,141 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -4758,8 +4758,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,334 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5096,8 +5096,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2013-06-25 02:36:51.158788059 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5167,8 +5167,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 2013-06-25 02:36:51.162788122 +0100 @@ -0,0 +1,61 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5232,8 +5232,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 2013-06-25 02:36:51.162788122 +0100 @@ -0,0 +1,94 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5330,8 +5330,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 2013-06-25 02:36:51.162788122 +0100 @@ -0,0 +1,115 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5449,8 +5449,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java 2013-06-22 16:16:23.528699843 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskImage.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,129 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5582,8 +5582,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java 2013-06-22 16:16:23.529699842 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPaints.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,314 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -5900,8 +5900,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 2013-06-22 16:16:23.529699842 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,400 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -6304,8 +6304,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 2013-06-22 16:16:23.530699841 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,331 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -6639,8 +6639,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2013-06-22 16:16:23.530699841 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,668 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -7311,8 +7311,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 2013-06-22 16:16:23.530699841 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,83 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -7398,8 +7398,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java 2013-06-22 16:16:23.530699841 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRUtils.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,261 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -7663,8 +7663,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java 2013-06-22 16:16:23.530699841 -0500 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,94 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -7761,8 +7761,8 @@ + } +} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c ---- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2013-06-22 16:01:50.563607746 -0500 -+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2013-06-22 16:19:02.233536415 -0500 +--- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2013-06-25 02:34:37.152677961 +0100 ++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2013-06-25 02:40:15.646021517 +0100 @@ -71,7 +71,7 @@ extern AwtGraphicsConfigDataPtr getGraphicsConfigFromComponentPeer(JNIEnv *env, jobject this); @@ -7794,7 +7794,7 @@ char c[4]; int i; } endian; -@@ -118,12 +109,32 @@ +@@ -118,20 +109,64 @@ endian.i = 0xff000000; nativeByteOrder = (endian.c[0]) ? MSBFirst : LSBFirst; @@ -7807,7 +7807,31 @@ - return; + return JNI_FALSE; } -+} + ++#ifdef MITSHM ++ if (getenv("NO_AWT_MITSHM") == NULL && ++ getenv("NO_J2D_MITSHM") == NULL) { ++ char * force; ++ TryInitMITShm(env, &useMitShmExt, &useMitShmPixmaps); ++ ++ if(allowShmPixmaps) { ++ useMitShmPixmaps = (useMitShmPixmaps == CAN_USE_MITSHM); ++ force = getenv("J2D_PIXMAPS"); ++ if (force != NULL) { ++ if (useMitShmPixmaps && (strcmp(force, "shared") == 0)) { ++ forceSharedPixmaps = JNI_TRUE; ++ } else if (strcmp(force, "server") == 0) { ++ useMitShmPixmaps = JNI_FALSE; ++ } ++ } ++ }else { ++ useMitShmPixmaps = JNI_FALSE; ++ } ++ } ++ ++ return JNI_TRUE; ++#endif /* MITSHM */ ++ +#endif /* !HEADLESS */ +} + @@ -7825,10 +7849,10 @@ + if(XShared_initIDs(env, JNI_TRUE)) + { + void *lib = 0; - ++ xorCompClass = (*env)->NewGlobalRef(env, XORComp); -@@ -131,7 +142,7 @@ + if (tryDGA && (getenv("NO_J2D_DGA") == NULL)) { /* we use RTLD_NOW because of bug 4032715 */ lib = dlopen("libsunwjdga.so", RTLD_NOW); } @@ -7837,6 +7861,39 @@ if (lib != NULL) { JDgaStatus ret = JDGA_FAILED; void *sym = dlsym(lib, "JDgaLibInit"); +@@ -150,31 +185,7 @@ + lib = NULL; + } + } +- +-#ifdef MITSHM +- if (getenv("NO_AWT_MITSHM") == NULL && +- getenv("NO_J2D_MITSHM") == NULL) { +- char * force; +- char * permission = getenv("J2D_MITSHM_PERMISSION"); +- if (permission != NULL) { +- if (strcmp(permission, "common") == 0) { +- mitShmPermissionMask = MITSHM_PERM_COMMON; +- } +- } +- +- TryInitMITShm(env, &useMitShmExt, &useMitShmPixmaps); +- useMitShmPixmaps = (useMitShmPixmaps == CAN_USE_MITSHM); +- force = getenv("J2D_PIXMAPS"); +- if (force != NULL) { +- if (useMitShmPixmaps && (strcmp(force, "shared") == 0)) { +- forceSharedPixmaps = JNI_TRUE; +- } else if (strcmp(force, "server") == 0) { +- useMitShmPixmaps = JNI_FALSE; +- } +- } +- } +-#endif /* MITSHM */ +- ++ } + #endif /* !HEADLESS */ + } + @@ -184,7 +195,7 @@ * Signature: ()Z */ @@ -7944,7 +8001,7 @@ JNU_ThrowOutOfMemoryError(env, "Can't create offscreen surface"); + return JNI_FALSE; -+ } + } + + return JNI_TRUE; +#endif /* !HEADLESS */ @@ -7966,7 +8023,7 @@ + X11SDOps *xsdo = X11SurfaceData_GetOps(env, xsd); + if (xsdo == NULL) { + return; - } ++ } + + if (xsdo->configData->awt_cmap == (Colormap)NULL) { + awtJNI_CreateColorData(env, xsdo->configData, 1); @@ -8026,8 +8083,8 @@ { #ifndef HEADLESS diff -Nru openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h ---- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h 2011-11-14 16:12:16.000000000 -0600 -+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h 2013-06-22 16:16:23.531699840 -0500 +--- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h 2011-11-14 22:12:16.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h 2013-06-25 02:36:51.166788185 +0100 @@ -30,6 +30,8 @@ #include <jdga.h> @@ -8056,8 +8113,8 @@ * This function returns a pointer to a native X11SDOps structure * for accessing the indicated X11 SurfaceData Java object. It diff -Nru openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c openjdk/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c ---- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c 2013-06-22 16:16:23.532699839 -0500 +--- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,784 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. @@ -8844,8 +8901,8 @@ + (*env)->ReleasePrimitiveArrayCritical(env, trapArray, traps, JNI_ABORT); +} diff -Nru openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ---- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 1969-12-31 18:00:00.000000000 -0600 -+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2013-06-22 16:16:23.532699839 -0500 +--- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2013-06-25 02:36:51.166788185 +0100 @@ -0,0 +1,116 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
--- a/patches/security/20130618/8009071-improve_shape_handling.patch Sat Jun 22 16:38:24 2013 -0500 +++ b/patches/security/20130618/8009071-improve_shape_handling.patch Tue Jun 25 15:07:59 2013 +0100 @@ -143,6 +143,14 @@ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c --- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2011-11-14 16:12:12.000000000 -0600 +++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2013-06-22 03:34:36.084702677 -0500 +@@ -27,6 +27,7 @@ + #include "splashscreen_gfx.h" + + #include <gif_lib.h> ++#include <sizecalc.h> + + #define GIF_TRANSPARENT 0x01 + #define GIF_USER_INPUT 0x02 @@ -120,7 +120,7 @@ splash->height = gif->SHeight; splash->frameCount = gif->ImageCount;