changeset in /hg/icedtea: Add OpenJDK colorspace patch from Java...

[gnu_andrew at member.fsf.org]

changeset a5623b3737c3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a5623b3737c3
description:
	Add OpenJDK colorspace patch from Java2D tree.

diffstat:

2 files changed, 45 insertions(+), 6 deletions(-)
Makefile.am |   25 ++++++++++++++++++++++---
Makefile.in |   26 +++++++++++++++++++++++---

diffs (111 lines):

diff -r 9757152b5938 -r a5623b3737c3 Makefile.am
--- a/Makefile.am	Mon May 19 23:00:07 2008 +0100
+++ b/Makefile.am	Fri May 23 19:55:07 2008 +0100
@@ -39,7 +39,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc tools-copy contrib ports \
 	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
-	patches/icedtea-cacao.patch
+	patches/icedtea-cacao.patch $(OPENJDK_PATCHES)
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
 # name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -265,6 +265,11 @@ else
 else
   GCC_PATCH = patches/icedtea-gcc-4.3.patch
 endif
+
+# Patches from the other OpenJDK trees (should be removed
+# when in an official bxx release)
+OPENJDK_PATCHES = \
+	patches/openjdk-color.patch
 
 # If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
@@ -343,14 +348,28 @@ endif
 
 stamps/patch.stamp: stamps/clone.stamp
 	all_patches_ok=yes; \
+	cd $(abs_top_builddir)/openjdk/jdk; \
+	for p in $(OPENJDK_PATCHES) ; \
+	do \
+	  if test x$${all_patches_ok} == "xyes" \
+	     && echo Checking $$p \
+	     && $(PATCH) -l -p1 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
+	  then \
+	    echo Applying $$p ; \
+	    $(PATCH) -l -p1 < $(abs_top_srcdir)/$$p ; \
+	  else \
+	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
+	  fi ; \
+	done ; \
+	cd $(abs_top_builddir) ; \
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
diff -r 9757152b5938 -r a5623b3737c3 Makefile.in
--- a/Makefile.in	Mon May 19 23:00:07 2008 +0100
+++ b/Makefile.in	Fri May 23 19:55:07 2008 +0100
@@ -254,7 +254,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc tools-copy contrib ports \
 	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
-	patches/icedtea-cacao.patch
+	patches/icedtea-cacao.patch $(OPENJDK_PATCHES)
 
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -360,6 +360,12 @@ OPENJDK_URL = http://hg.openjdk.java.net
 
 # If new gcc is installed, apply 4.3 patch
 @GCC_OLD_TRUE at GCC_PATCH = 
+
+# Patches from the other OpenJDK trees (should be removed
+# when in an official bxx release)
+OPENJDK_PATCHES = \
+	patches/openjdk-color.patch
+
 
 # If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
@@ -848,14 +854,28 @@ stamps/ports.stamp: stamps/clone.stamp
 
 stamps/patch.stamp: stamps/clone.stamp
 	all_patches_ok=yes; \
+	cd $(abs_top_builddir)/openjdk/jdk; \
+	for p in $(OPENJDK_PATCHES) ; \
+	do \
+	  if test x$${all_patches_ok} == "xyes" \
+	     && echo Checking $$p \
+	     && $(PATCH) -l -p1 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
+	  then \
+	    echo Applying $$p ; \
+	    $(PATCH) -l -p1 < $(abs_top_srcdir)/$$p ; \
+	  else \
+	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
+	  fi ; \
+	done ; \
+	cd $(abs_top_builddir) ; \
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \