rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-x11.patch,1.4,1.5
Lillian Angel
langel at fedoraproject.org
Thu Jul 30 17:26:25 UTC 2009
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29503
Modified Files:
java-1.6.0-openjdk-x11.patch
Log Message:
* Thu Jul 30 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-27.b16
- java-1.6.0-openjdk-x11.patch updated.
java-1.6.0-openjdk-x11.patch:
awt_GraphicsEnv.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
Index: java-1.6.0-openjdk-x11.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-x11.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- java-1.6.0-openjdk-x11.patch 30 Jul 2009 16:52:40 -0000 1.4
+++ java-1.6.0-openjdk-x11.patch 30 Jul 2009 17:26:25 -0000 1.5
@@ -1,16 +1,18 @@
---- awt_GraphicsEnv.h 2009-07-30 12:51:18.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-30 12:51:41.000000000 -0400
-@@ -41,7 +41,8 @@
+--- /notnfs/langel/jdk6-orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-17 10:36:09.000000000 -0400
++++ icedtea6-1.5/openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-30 13:25:52.000000000 -0400
+@@ -41,7 +41,10 @@
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/shmproto.h>
++
++#define ShmSeg CARD32
extern int XShmQueryExtension();
-@@ -49,6 +50,13 @@
+@@ -49,6 +52,14 @@
void resetXShmAttachFailed();
jboolean isXShmAttachFailed();
@@ -21,6 +23,7 @@
+ Bool readOnly; /* how the server should attach it */
+} XShmSegmentInfo;
+
++#undef ShmSeg
#endif /* MITSHM */
/* fieldIDs for X11GraphicsConfig fields that may be accessed from C */
More information about the fedora-extras-commits
mailing list