rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-libx11.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.128, 1.129

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18453

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-libx11.patch 
Log Message:
* Wed Jul 29 2009 Lillian Angel  <langel at redhat.com> - 1:1.6.0-26.b16
- Added java-1.6.0-openjdk-libx11.patch.



java-1.6.0-openjdk-libx11.patch:
 awt_GraphicsEnv.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE java-1.6.0-openjdk-libx11.patch ---
--- jdk6-orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-17 10:36:09.000000000 -0400
+++ awt_GraphicsEnv.h	2009-07-29 13:38:35.000000000 -0400
@@ -41,7 +41,8 @@
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include <X11/extensions/XShm.h>
+#include <X11/extensions/shmconst.h>
+#include <X11/extensions/shmstr.h>
 
 extern int XShmQueryExtension();
 


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- java-1.6.0-openjdk.spec	25 Jul 2009 03:55:06 -0000	1.128
+++ java-1.6.0-openjdk.spec	29 Jul 2009 17:48:48 -0000	1.129
@@ -133,7 +133,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 25.%{openjdkver}%{?dist}
+Release: 26.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -172,6 +172,7 @@ Patch6:   java-1.6.0-openjdk-sparc-fixes
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
 Patch8:	  java-1.6.0-openjdk-netx.patch
 Patch9:   java-1.6.0-openjdk-execvpe.patch
+Patch10:  java-1.6.0-openjdk-libx11.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -417,6 +418,7 @@ patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH7}
 patch -l -p0 < %{PATCH8}
 patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH10}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -964,6 +966,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Wed Jul 29 2009 Lillian Angel  <langel at redhat.com> - 1:1.6.0-26.b16
+- Added java-1.6.0-openjdk-libx11.patch.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.0.0-25.b16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild