diff options
| author | fluffy <fluffy@FreeBSD.org> | 2010-05-03 07:27:16 +0800 |
|---|---|---|
| committer | fluffy <fluffy@FreeBSD.org> | 2010-05-03 07:27:16 +0800 |
| commit | 136f22943533b71fe0eb9577ffc9e0520fb4c134 (patch) | |
| tree | 66c5a763d3dbbc3d46a1eb99fb192ee2f6b43661 /java | |
| parent | be077fe62b950a256b89cb231e85ec6640678142 (diff) | |
| download | freebsd-ports-gnome-136f22943533b71fe0eb9577ffc9e0520fb4c134.tar.gz freebsd-ports-gnome-136f22943533b71fe0eb9577ffc9e0520fb4c134.tar.zst freebsd-ports-gnome-136f22943533b71fe0eb9577ffc9e0520fb4c134.zip | |
- java/openjdk6: allow to build againist modern xorg (7.5)
PR: 145757
Submitted by: myself
Approved by: mainatner timeout ( over 3 weeks)
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/files/patch-set | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index 8548c42baae9..0af257811be7 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -15860,6 +15860,20 @@ diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/sol if (pLibRandR == NULL) { J2dRlsTraceLn(J2D_TRACE_ERROR, "X11GD_InitXrandrFuncs: Could not open libXrandr.so.2"); +diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h +--- ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h.orig 2009-10-15 04:17:58.000000000 +1100 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2010-04-16 22:34:10.692700677 +1100 +@@ -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(); + diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c --- ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2009-10-14 10:17:58.000000000 -0700 +++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2009-10-28 20:01:48.000000000 -0700 |