changeset in /hg/icedtea6: 2008-03-27 Christian Thalinger <twi...

[Christian Thalinger]

changeset e92bc60d59b8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e92bc60d59b8
description:
	2008-03-27  Christian Thalinger  <twisti at complang.tuwien.ac.at>

		* patches/icedtea-cacao.patch: Fixed the paths so the patch
		actually applies.

diffstat:

2 files changed, 11 insertions(+), 6 deletions(-)
ChangeLog                   |    5 +++++
patches/icedtea-cacao.patch |   12 ++++++------

diffs (48 lines):

diff -r fc06aaf1e991 -r e92bc60d59b8 ChangeLog
--- a/ChangeLog	Thu Mar 27 08:58:31 2008 +0000
+++ b/ChangeLog	Thu Mar 27 13:55:36 2008 +0100
@@ -1,3 +1,8 @@ 2008-03-27  Gary Benson  <gbenson at redhat
+2008-03-27  Christian Thalinger  <twisti at complang.tuwien.ac.at>
+
+	* patches/icedtea-cacao.patch: Fixed the paths so the patch
+	actually applies.
+
 2008-03-27  Gary Benson  <gbenson at redhat.com>
 
 	* Makefile.am
diff -r fc06aaf1e991 -r e92bc60d59b8 patches/icedtea-cacao.patch
--- a/patches/icedtea-cacao.patch	Thu Mar 27 08:58:31 2008 +0000
+++ b/patches/icedtea-cacao.patch	Thu Mar 27 13:55:36 2008 +0100
@@ -11,8 +11,8 @@
  }
  
 diff -r 63b67d07d5e9 openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- a/openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Tue Mar 25 16:27:33 2008 +0000
-+++ b/openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Wed Mar 26 08:24:35 2008 +0000
+--- ../openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Tue Mar 25 16:27:33 2008 +0000
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Wed Mar 26 08:24:35 2008 +0000
 @@ -75,28 +75,51 @@ ifeq ($(PLATFORM), linux)
      REQUIRED_CC_VER = 3.2
      REQUIRED_GCC_VER = 3.2.*
@@ -77,8 +77,8 @@ diff -r 63b67d07d5e9 openjdk/jdk/make/co
    endif
    # Option used to create a shared library
 diff -r 63b67d07d5e9 openjdk/jdk/make/javax/sound/SoundDefs.gmk
---- a/openjdk/jdk/make/javax/sound/SoundDefs.gmk	Tue Mar 25 16:27:33 2008 +0000
-+++ b/openjdk/jdk/make/javax/sound/SoundDefs.gmk	Wed Mar 26 08:29:28 2008 +0000
+--- ../openjdk/jdk/make/javax/sound/SoundDefs.gmk	Tue Mar 25 16:27:33 2008 +0000
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk	Wed Mar 26 08:29:28 2008 +0000
 @@ -58,9 +58,45 @@ ifdef ICEDTEA_ZERO_BUILD
  ifdef ICEDTEA_ZERO_BUILD
    CPPFLAGS += -DX_ARCH=X_ZERO
@@ -137,8 +137,8 @@ diff -r 63b67d07d5e9 openjdk/jdk/make/ja
  
  
 diff -r 63b67d07d5e9 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- a/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Mar 25 16:27:33 2008 +0000
-+++ b/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Mar 26 08:38:14 2008 +0000
+--- ../openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Mar 25 16:27:33 2008 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Mar 26 08:38:14 2008 +0000
 @@ -33,12 +33,19 @@
  #define X_LINUX         3