Date: Fri, 16 Apr 2010 22:40:28 +1100 From: "Dima Panov" <fluffy@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/145757: java/openjdk6: allow to build againist modern xorg Message-ID: <1271418028.49891@Fluffy.Khv.RU> Resent-Message-ID: <201004161150.o3GBo1GF056414@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145757
>Category: ports
>Synopsis: java/openjdk6: allow to build againist modern xorg
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 16 11:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 9.0-900010-CURRENT amd64
>Organization:
Fluffy.Khv.RU
>Environment:
System: FreeBSD 9.0-900010-CURRENT #0 r206514M: Tue Apr 13 10:15:09 VLAST 2010
fluffy@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot
>Description:
java/openjdk6: allow to build againist modern xorg
>How-To-Repeat:
Install xorg75 and try to build java/openjdk6
Will get complains about missed MIT-SHM functions, they are moved to another proto includes
>Fix:
--- openjdk6.diff begins here ---
Index: java/openjdk6/files/patch-set
===================================================================
RCS file: /home/ncvs/ports/java/openjdk6/files/patch-set,v
retrieving revision 1.4
diff -u -r1.4 patch-set
--- java/openjdk6/files/patch-set 21 Jan 2010 08:51:59 -0000 1.4
+++ java/openjdk6/files/patch-set 16 Apr 2010 11:38:19 -0000
@@ -15860,6 +15860,20 @@
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
--- openjdk6.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1271418028.49891>