/hg/icedtea6: removed piscesMakefile.patch. Put its body in

[dlila at icedtea.classpath.org]

changeset 2d4768330e78 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2d4768330e78
author: Denis Lila <dlila at redhat.com>
date: Wed Mar 02 08:52:04 2011 -0500

	removed piscesMakefile.patch. Put its body in 6967436-6967433
	-floating-pt-conversion.patch


diffstat:

3 files changed, 7 insertions(+), 15 deletions(-)
ChangeLog                                                    |    5 ++++
patches/openjdk/6967436-6967433-floating-pt-conversion.patch |   12 +---------
patches/piscesMakefile.patch                                 |    5 ----

diffs (69 lines):

diff -r 4573e7757706 -r 2d4768330e78 ChangeLog
--- a/ChangeLog	Tue Mar 01 10:33:29 2011 -0500
+++ b/ChangeLog	Wed Mar 02 08:52:04 2011 -0500
@@ -1,3 +1,11 @@ 2011-03-01  Denis Lila  <dlila at redhat.co
+2011-03-01  Denis Lila  <dlila at redhat.com>
+
+	* Makefile.am:
+	Removed patch (piscesMakefile.am).
+	* patches/openjdk/piscesMakefile.patch:
+	Removed. Its body was added to
+	6967436-6967433-floating-pt-conversion.patch
+
 2011-03-01  Denis Lila  <dlila at redhat.com>
 
 	* Makefile.am:
diff -r 4573e7757706 -r 2d4768330e78 Makefile.am
--- a/Makefile.am	Tue Mar 01 10:33:29 2011 -0500
+++ b/Makefile.am	Wed Mar 02 08:52:04 2011 -0500
@@ -320,7 +320,6 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6663040-com.sun.awt.patch \
 	patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
 	patches/pr600-arm-jvm.cfg.patch \
-	patches/piscesMakefile.patch \
 	patches/openjdk/6887494-NPE-in-pisces.patch \
 	patches/openjdk/6967436-6967433-floating-pt-conversion.patch \
 	patches/openjdk/6976265-stroke-control.patch \
diff -r 4573e7757706 -r 2d4768330e78 patches/openjdk/6967436-6967433-floating-pt-conversion.patch
--- a/patches/openjdk/6967436-6967433-floating-pt-conversion.patch	Tue Mar 01 10:33:29 2011 -0500
+++ b/patches/openjdk/6967436-6967433-floating-pt-conversion.patch	Wed Mar 02 08:52:04 2011 -0500
@@ -1,13 +1,14 @@
-# HG changeset patch
-# User dlila
-# Date 1281460784 14400
-# Node ID d47bd9d94ba42529aa1adb6d521ebea8fcc00031
-# Parent  cf0c23a99823536ad6cf720e442896276f8020e5
-6967436: lines longer than 2^15 can fill window.
-6967433: dashed lines broken when using scaling transforms.
-Summary: converted pisces to floating point. Also, using better AA algorithm
-Reviewed-by: flar
-
+--- openjdk/jdk/make/sun/pisces/Makefile.orig  2011-02-23 20:16:27.116261331 -0500
++++ openjdk/jdk/make/sun/pisces/Makefile   2011-02-23 20:17:08.106141482 -0500
+@@ -28,6 +28,8 @@
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+ 
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+ #
+ # Files
+ #
 diff -r cf0c23a99823 -r d47bd9d94ba4 src/share/classes/sun/java2d/pisces/Dasher.java
 --- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java	Thu Jul 29 17:12:27 2010 -0700
 +++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java	Tue Aug 10 13:19:44 2010 -0400
diff -r 4573e7757706 -r 2d4768330e78 patches/piscesMakefile.patch
--- a/patches/piscesMakefile.patch	Tue Mar 01 10:33:29 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdk/jdk/make/sun/pisces/Makefile.orig  2011-02-23 20:16:27.116261331 -0500
-+++ openjdk/jdk/make/sun/pisces/Makefile   2011-02-23 20:17:08.106141482 -0500
-@@ -28,6 +28,8 @@
- PRODUCT = sun
- include $(BUILDDIR)/common/Defs.gmk
- 
-+LANGUAGE_VERSION = -source 6
-+CLASS_VERSION = -target 6
- #
- # Files
- #