Mercurial > hg > release > icedtea6-1.11
changeset 1914:54daa005cac0
Drop XShm patch -- applied upstream.
2010-02-15 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-6897844-xshm.patch:
Dropped, applied upstream.
* Makefile.am: Remove above patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 15 Feb 2010 21:01:55 +0000 |
| parents | b1855c484f79 |
| children | 18446e8c463f |
| files | ChangeLog Makefile.am patches/icedtea-6897844-xshm.patch |
| diffstat | 3 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 15 21:00:53 2010 +0000 +++ b/ChangeLog Mon Feb 15 21:01:55 2010 +0000 @@ -1,3 +1,9 @@ +2010-02-15 Andrew John Hughes <ahughes@redhat.com> + + * patches/icedtea-6897844-xshm.patch: + Dropped, applied upstream. + * Makefile.am: Remove above patch. + 2010-02-15 Andrew John Hughes <ahughes@redhat.com> * rewriter/agpl-3.0.txt,
--- a/Makefile.am Mon Feb 15 21:00:53 2010 +0000 +++ b/Makefile.am Mon Feb 15 21:01:55 2010 +0000 @@ -296,7 +296,6 @@ patches/icedtea-gcc-stack-markings.patch \ patches/openjdk/6879689-hotspot_warning_fix.patch \ patches/icedtea-no-precompiled.patch \ - patches/icedtea-6897844-xshm.patch \ patches/icedtea-linux-separate-debuginfo.patch \ patches/icedtea-parisc.patch \ patches/icedtea-sh4-support.patch \
--- a/patches/icedtea-6897844-xshm.patch Mon Feb 15 21:00:53 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ ---- 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(); -