/hg/release/icedtea6-1.9: Fixed missing JNI link to native funct...

[ptisnovs at icedtea.classpath.org]

changeset adf4b68ed6af in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=adf4b68ed6af
author: ptisnovs
date: Thu Aug 26 11:14:01 2010 +0200

	Fixed missing JNI link to native function
	OGLContext.getOGLIdString() which causes many OpenGL-related
	regression tests to fail.


diffstat:

3 files changed, 20 insertions(+), 1 deletion(-)
ChangeLog                    |    8 ++++++++
Makefile.am                  |    3 ++-
patches/opengl-jni-fix.patch |   10 ++++++++++

diffs (42 lines):

diff -r d59cbcab0fe4 -r adf4b68ed6af ChangeLog
--- a/ChangeLog	Tue Aug 24 10:11:26 2010 -0400
+++ b/ChangeLog	Thu Aug 26 11:14:01 2010 +0200
@@ -1,3 +1,11 @@ 2010-08-24  Omair Majid  <omajid at redhat.
+2010-08-26  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	* 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-24  Omair Majid  <omajid at redhat.com>
 
 	Fixes rhbz601281
diff -r d59cbcab0fe4 -r adf4b68ed6af Makefile.am
--- a/Makefile.am	Tue Aug 24 10:11:26 2010 -0400
+++ b/Makefile.am	Thu Aug 26 11:14:01 2010 +0200
@@ -324,7 +324,8 @@ 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/opengl-jni-fix.patch
 endif
 
 if ENABLE_NIO2
diff -r d59cbcab0fe4 -r adf4b68ed6af patches/opengl-jni-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/opengl-jni-fix.patch	Thu Aug 26 11:14:01 2010 +0200
@@ -0,0 +1,10 @@
+--- openjdk-old/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
++++ openjdk/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
+@@ -300,6 +300,7 @@
+         Java_java_awt_FileDialog_initIDs;
+         Java_sun_awt_X11_XWindow_initIDs;
+ 
++        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
+         Java_sun_java2d_opengl_OGLMaskFill_maskFill;
+         Java_sun_java2d_opengl_OGLRenderer_drawPoly;
+         Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;