[arch-commits] Commit in java7-openjdk/trunk (i586-fix.diff)

[Guillaume Alaux]

    Date: Tuesday, October 20, 2015 @ 21:16:52
  Author: guillaume
Revision: 249576

Add missing patch i586-fix.diff

Added:
  java7-openjdk/trunk/i586-fix.diff

---------------+
 i586-fix.diff |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

Added: i586-fix.diff
===================================================================
--- i586-fix.diff	                        (rev 0)
+++ i586-fix.diff	2015-10-20 19:16:52 UTC (rev 249576)
@@ -0,0 +1,21 @@
+diff -r ff3cd846027a src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Sun Jul 19 18:19:29 2015 +0100
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Thu Jul 30 14:31:59 2015 +0200
+@@ -551,8 +551,6 @@
+ {
+     XImage *img = NULL;
+     XShmSegmentInfo *shminfo;
+-    JNIEnv* env;
+-    jboolean xShmAttachResult;
+ 
+     shminfo = malloc(sizeof(XShmSegmentInfo));
+     if (shminfo == NULL) {
+@@ -603,7 +601,7 @@
+      */
+     shmctl(shminfo->shmid, IPC_RMID, 0);
+ 
+-    if (xShmAttachResult == JNI_FALSE) {
++    if (isXShmAttachFailed() == JNI_TRUE) {
+         J2dRlsTraceLn1(J2D_TRACE_ERROR,
+                        "X11SD_SetupSharedSegment XShmAttach has failed: %s",
+                        strerror(errno));