Mercurial > hg > release > icedtea-1.10
changeset 1830:03cb176986bc
Merge.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Sat, 23 May 2009 00:41:28 +0100 |
| parents | e160d9e94f4e (current diff) 23732a06b248 (diff) |
| children | 5744d25c5a37 |
| files | ChangeLog |
| diffstat | 2 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 22 23:35:26 2009 +0100 +++ b/ChangeLog Sat May 23 00:41:28 2009 +0100 @@ -1,5 +1,11 @@ 2009-05-22 Andrew John Hughes <ahughes@redhat.com> + * patches/xrender/icedtea-002.patch: Correct rebase. Add + Java_sun_java2d_x11_XSurfaceData_isDrawableValid and + Java_sun_java2d_x11_XSurfaceData_setInvalid back. + +2009-05-22 Mark Wielaard <mark@klomp.org> + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Define InlineSmallCode, using x86 value to begin with.
--- a/patches/xrender/icedtea-002.patch Fri May 22 23:35:26 2009 +0100 +++ b/patches/xrender/icedtea-002.patch Sat May 23 00:41:28 2009 +0100 @@ -10,10 +10,9 @@ $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ifeq ($(PLATFORM), solaris) -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 2009-01-18 01:30:31.000000000 +0000 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-01-18 01:48:17.000000000 +0000 -@@ -316,6 +316,13 @@ +--- openjdk/jdk/make/sun/xawt/mapfile-vers.orig 2009-05-22 22:09:17.215916337 +0200 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-05-22 22:11:26.919916611 +0200 +@@ -334,6 +334,15 @@ Java_sun_java2d_opengl_GLXSurfaceData_initOps; Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer; @@ -22,13 +21,20 @@ + Java_sun_java2d_x11_XSurfaceData_XResetClip; + Java_sun_java2d_x11_XSurfaceData_XSetClip; + Java_sun_java2d_x11_XSurfaceData_flushNativeSurface; ++ Java_sun_java2d_x11_XSurfaceData_isDrawableValid; ++ Java_sun_java2d_x11_XSurfaceData_setInvalid; + Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures; + Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg; Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit; Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask; -@@ -338,16 +345,10 @@ - Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; +@@ -351,21 +360,13 @@ + Java_sun_java2d_x11_X11Renderer_XFillRect; + Java_sun_java2d_x11_X11Renderer_XFillRoundRect; + Java_sun_java2d_x11_X11Renderer_devCopyArea; +- Java_sun_java2d_x11_X11SurfaceData_setInvalid; + Java_sun_java2d_x11_X11SurfaceData_initIDs; +- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable; Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable; - Java_sun_java2d_x11_X11SurfaceData_initOps;