[patch] replace X_ShmAttach with 1

icedtea6-1.6.1-fix-shm.patch (text/plain), 1.11 KB, created by Florian Scandella on 2009-10-13 15:28:58 UTC

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ patches/icedtea-fix-shm.patch	2009-10-13 16:06:47.107087379 +0200
@@ -0,0 +1,11 @@
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	2009-10-13 16:12:58.873720977 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	2009-10-13 16:06:47.107087379 +0200
+@@ -958,7 +960,7 @@
+ 
+ int J2DXErrHandler(Display *display, XErrorEvent *xerr) {
+     int ret = 0;
+-    if (xerr->minor_code == X_ShmAttach) {
++    if (xerr->minor_code == 1 /* X_ShmAttach */) {
+         xshmAttachFailed = JNI_TRUE;
+     } else {
+         ret = (*xerror_saved_handler)(display, xerr);
--- Makefile.in	2009-10-13 17:16:41.786665601 +0200
+++ Makefile.in	2009-10-13 17:16:57.916666822 +0200
@@ -670,6 +670,7 @@
 	patches/icedtea-explicit-target-arch.patch \
 	patches/openjdk/6648816.patch \
 	patches/openjdk/oj100103-debugger-socket-overflow.patch \
+	patches/icedtea-fix-shm.patch \
 	$(DISTRIBUTION_PATCHES)
 @ENABLE_XRENDER_TRUE@XRENDER_PATCHES = patches/xrender/icedtea-???.patch
 @ENABLE_XRENDER_TRUE@XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))