/hg/icedtea6: Support newer X11 headers for awt_GraphicsEnv.h.

[mjw-5]

changeset c75348f9db6a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c75348f9db6a
author: Mark Wielaard <mark@...>
date: Tue Nov 03 12:50:30 2009 +0100

        Support newer X11 headers for awt_GraphicsEnv.h.

        2009-11-02 Mark Wielaard <mjw@...> Vlastimil
        Babka <caster@...>

         * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-xshm.patch
            * patches/icedtea-xshm.patch: New patch.
            * HACKING: Document new patch.


diffstat:

4 files changed, 22 insertions(+)
ChangeLog                  |    7 +++++++
HACKING                    |    1 +
Makefile.am                |    1 +
patches/icedtea-xshm.patch |   13 +++++++++++++

diffs (53 lines):

diff -r 547923046557 -r c75348f9db6a ChangeLog
--- a/ChangeLog Fri Oct 30 13:35:54 2009 +0000
+++ b/ChangeLog Tue Nov 03 12:50:30 2009 +0100
@@ -1,3 +1,10 @@ 2009-10-30  Edward Nevill   <ed@...
[phone]  Mark Wielaard  <mjw@...>
+    Vlastimil Babka  <caster@...>
+
+ * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-xshm.patch
+ * patches/icedtea-xshm.patch: New patch.
+ * HACKING: Document new patch.
+
 2009-10-30  Edward Nevill   <ed@...>
 
  * move mkbc.c to hotspot/tools
diff -r 547923046557 -r c75348f9db6a HACKING
--- a/HACKING Fri Oct 30 13:35:54 2009 +0000
+++ b/HACKING Tue Nov 03 12:50:30 2009 +0100
@@ -107,6 +107,7 @@ The following patches are currently appl
 * icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
 * icedtea-shark.patch: Add support for the Shark JIT.
 * icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390.
+* icedtea-xshm.patch: Support newer X11 headers for awt_GraphicsEnv.h.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 547923046557 -r c75348f9db6a Makefile.am
--- a/Makefile.am Fri Oct 30 13:35:54 2009 +0000
+++ b/Makefile.am Tue Nov 03 12:50:30 2009 +0100
@@ -664,6 +664,7 @@ ICEDTEA_PATCHES += \
  patches/icedtea-s390-serialize.patch \
  patches/openjdk/6879689-hotspot_warning_fix.patch \
  patches/icedtea-no-precompiled.patch \
+ patches/icedtea-xshm.patch \
  $(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r 547923046557 -r c75348f9db6a patches/icedtea-xshm.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xshm.patch Tue Nov 03 12:50:30 2009 +0100
@@ -0,0 +1,13 @@
+--- 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-30 13:25:52.000000000 -0400
+@@ -42,6 +42,10 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
++#ifndef X_ShmAttach
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
++#endif
+
+ extern int XShmQueryExtension();
+