rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-x11.patch,1.3,1.4

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18252

Modified Files:
	java-1.6.0-openjdk-x11.patch 
Log Message:
Fixed patch



java-1.6.0-openjdk-x11.patch:
 awt_GraphicsEnv.h |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Index: java-1.6.0-openjdk-x11.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-x11.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- java-1.6.0-openjdk-x11.patch	30 Jul 2009 16:43:08 -0000	1.3
+++ java-1.6.0-openjdk-x11.patch	30 Jul 2009 16:52:40 -0000	1.4
@@ -1,5 +1,5 @@
---- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-17 10:36:09.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-29 13:38:35.000000000 -0400
+--- awt_GraphicsEnv.h	2009-07-30 12:51:18.000000000 -0400
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-30 12:51:41.000000000 -0400
 @@ -41,7 +41,8 @@
  
  #include <sys/ipc.h>
@@ -10,19 +10,17 @@
  
  extern int XShmQueryExtension();
  
---- old/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h	2009-07-30 11:39:44.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h	2009-07-30 12:40:27.000000000 -0400
-@@ -73,6 +73,13 @@
- typedef void ReleasePixmapBgFunc(JNIEnv *env,
-                                  X11SDOps *xsdo);
+@@ -49,6 +50,13 @@
+ void resetXShmAttachFailed();
+ jboolean isXShmAttachFailed();
  
 +typedef struct {
-+    ShmSeg shmseg;	/* resource id */
-+    int shmid;		/* kernel id */
-+    char *shmaddr;	/* address in client */
-+    Bool readOnly;	/* how the server should attach it */
++    ShmSeg shmseg;     /* resource id */
++    int shmid;         /* kernel id */
++    char *shmaddr;     /* address in client */
++    Bool readOnly;     /* how the server should attach it */
 +} XShmSegmentInfo;
 +
+ #endif /* MITSHM */
  
- #ifdef MITSHM
- typedef struct {
+ /* fieldIDs for X11GraphicsConfig fields that may be accessed from C */