Ticket #21500: patch-patches-ecj-icedtea.patch.diff

patches/ecj/icedtea.patch

@@ -694 +694 @@
  
      /**
       * Maximum exponent a finite {@code float} variable may have.  It
-diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h        2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h     2009-07-14 17:47:13.000000000 +0100
-@@ -27,6 +27,7 @@
- #define OGLContext_h_Included
- 
- #include "sun_java2d_pipe_BufferedContext.h"
-+#include "sun_java2d_pipe_hw_ContextCapabilities.h"
- #include "sun_java2d_opengl_OGLContext.h"
- #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h"
- 
-@@ -100,39 +101,39 @@
-  * See OGLContext.java for more on these flags.
-  */
- #define CAPS_EMPTY           \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY
- #define CAPS_RT_PLAIN_ALPHA  \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA
- #define CAPS_RT_TEXTURE_ALPHA       \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA
- #define CAPS_RT_TEXTURE_OPAQUE      \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE
- #define CAPS_MULTITEXTURE    \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE
- #define CAPS_TEXNONPOW2      \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2
- #define CAPS_TEXNONSQUARE    \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE
- #define CAPS_PS20            \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20
- #define CAPS_PS30            \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30
-+    sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30
- #define LAST_SHARED_CAP      \
-     sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP
- #define CAPS_EXT_FBOBJECT    \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT
- #define CAPS_STORED_ALPHA    \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA
- #define CAPS_DOUBLEBUFFERED  \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED
- #define CAPS_EXT_LCD_SHADER  \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER
- #define CAPS_EXT_BIOP_SHADER \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER
- #define CAPS_EXT_GRAD_SHADER \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER
- #define CAPS_EXT_TEXRECT     \
--    sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT
-+    sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT
- 
- /**
-  * Evaluates to true if the given capability bitmask is present for the
 diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
 --- openjdk-ecj.orig/langtools/make/build.properties    2009-06-30 14:25:18.000000000 +0100
 +++ openjdk-ecj/langtools/make/build.properties 2009-07-14 17:47:13.000000000 +0100