/hg/icedtea6: 2 new changesets

[dlila at icedtea.classpath.org]

changeset 542e1eeba6ed in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=542e1eeba6ed
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 16:21:38 2011 -0400

	Fix pulse audio header generation problem.


changeset c86fdd28db8f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c86fdd28db8f
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 16:23:25 2011 -0400

	merge


diffstat:

 ChangeLog                  |  13 +++++++++++++
 Makefile.am                |  10 +++++-----
 patches/f14-fonts.patch    |   2 +-
 patches/fonts-gentoo.patch |   4 ++--
 patches/fonts-rhel.patch   |   3 +--
 5 files changed, 22 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 349dee8c337a -r c86fdd28db8f ChangeLog
--- a/ChangeLog	Thu Jun 09 13:42:07 2011 -0400
+++ b/ChangeLog	Fri Jun 10 16:23:25 2011 -0400
@@ -1,3 +1,16 @@
+2011-06-10  Denis Lila  <dlila at redhat.com>
+	* Makefile.am
+	(stamps/pulse-java-headers.stamp): Prepend the java build directory
+	to the boot class path to avoid generating headers for the system
+	pulse-java classes.
+
+2011-06-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/font-rhel.patch:
+	* patches/f14-fonts.patch:
+	* patches/fonts-gentoo.patch:
+	Patch updated: use only major RHEL version, not minor one.
+
 2011-06-09  Denis Lila <dlila at redhat.com>
 
 	* Makefile.am: Apply patches.
diff -r 349dee8c337a -r c86fdd28db8f Makefile.am
--- a/Makefile.am	Thu Jun 09 13:42:07 2011 -0400
+++ b/Makefile.am	Fri Jun 10 16:23:25 2011 -0400
@@ -1745,15 +1745,15 @@
 
 stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
 	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.EventLoop ; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.Stream ; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.Operation; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
 	  org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
 	mkdir -p stamps
 	touch stamps/pulse-java-headers.stamp
diff -r 349dee8c337a -r c86fdd28db8f patches/f14-fonts.patch
--- a/patches/f14-fonts.patch	Thu Jun 09 13:42:07 2011 -0400
+++ b/patches/f14-fonts.patch	Fri Jun 10 16:23:25 2011 -0400
@@ -8,7 +8,7 @@
 +	fontconfig.Fedora.10.properties			\
 +	fontconfig.Fedora.11.properties			\
 +	fontconfig.Fedora.12.properties			\
- 	fontconfig.RedHat.6.0.properties		\
+ 	fontconfig.RedHat.6.properties		\
  	fontconfig.Gentoo.properties
  else
 
diff -r 349dee8c337a -r c86fdd28db8f patches/fonts-gentoo.patch
--- a/patches/fonts-gentoo.patch	Thu Jun 09 13:42:07 2011 -0400
+++ b/patches/fonts-gentoo.patch	Fri Jun 10 16:23:25 2011 -0400
@@ -5,8 +5,8 @@
  	fontconfig.SuSE.properties                      \
  	fontconfig.Ubuntu.properties                    \
  	fontconfig.Fedora.properties			\
--	fontconfig.RedHat.6.0.properties
-+	fontconfig.RedHat.6.0.properties		\
+-	fontconfig.RedHat.6.properties
++	fontconfig.RedHat.6.properties		\
 +	fontconfig.Gentoo.properties
  else
  
diff -r 349dee8c337a -r c86fdd28db8f patches/fonts-rhel.patch
--- a/patches/fonts-rhel.patch	Thu Jun 09 13:42:07 2011 -0400
+++ b/patches/fonts-rhel.patch	Fri Jun 10 16:23:25 2011 -0400
@@ -7,12 +7,12 @@
  	fontconfig.Ubuntu.properties                    \
 -	fontconfig.Fedora.properties
 +	fontconfig.Fedora.properties			\
-+	fontconfig.RedHat.6.0.properties
++	fontconfig.RedHat.6.properties
  else
 
  FONTCONFIGS_SRC	= $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
 --- /dev/null	2010-12-20 09:26:08.850062021 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties	2010-12-22 11:21:32.606781127 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.properties	2010-12-22 11:21:32.606781127 +0100
 @@ -0,0 +1,441 @@
 +# 
 +# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.