/hg/icedtea6: Added patch which fixes bug #6703377, corrected lo...

[ptisnovs at icedtea.classpath.org]

changeset d7e98386c764 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d7e98386c764
author: ptisnovs
date: Mon Oct 18 14:39:08 2010 +0200

	Added patch which fixes bug #6703377, corrected location of patch
	patches/openjdk/6853592-badwindow-warning-fix.patch in Makefile.am


diffstat:

3 files changed, 25 insertions(+), 4 deletions(-)
ChangeLog                            |   11 ++++++++++-
Makefile.am                          |    7 ++++---
patches/6703377-freetypescaler.patch |   11 +++++++++++

diffs (59 lines):

diff -r 12902038b45b -r d7e98386c764 ChangeLog
--- a/ChangeLog	Fri Oct 15 15:32:50 2010 +0200
+++ b/ChangeLog	Mon Oct 18 14:39:08 2010 +0200
@@ -1,6 +1,15 @@ 2010-10-15  Pavel Tisnovsky  <ptisnovs at r
+2010-10-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	Corrected location of patch
+	patches/openjdk/6853592-badwindow-warning-fix.patch
+	in Makefile.am
+	* patches/6703377-freetypescaler.patch:
+	Added patch which fixes bug #6703377
+
 2010-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
-	* patches/openjdk/6853592-BadWindow-warning-fix.patch:
+	* patches/openjdk/6853592-badwindow-warning-fix.patch:
 	Added patch which fixes bug #6853592 introduced by another patch
 	6678385-window_movement_crasher.patch
 
diff -r 12902038b45b -r d7e98386c764 Makefile.am
--- a/Makefile.am	Fri Oct 15 15:32:50 2010 +0200
+++ b/Makefile.am	Mon Oct 18 14:39:08 2010 +0200
@@ -314,7 +314,9 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6650759-missing_inference.patch \
 	patches/numa_on_early_glibc.patch \
 	patches/icedtea-shark-build.patch \
-	patches/openjdk/6985992-test_6933784.patch
+	patches/openjdk/6985992-test_6933784.patch \
+        patches/openjdk/6853592-badwindow-warning-fix.patch \
+        patches/6703377-freetypescaler.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
@@ -324,8 +326,7 @@ ICEDTEA_PATCHES += \
 	patches/shark-debug-option.patch \
 	patches/icedtea-shark.patch \
 	patches/icedtea-linux-separate-debuginfo.patch \
-	patches/openjdk/6951319-sparc_build_fixes.patch \
-        patches/openjdk/6853592-badwindow-warning-fix.patch
+	patches/openjdk/6951319-sparc_build_fixes.patch
 endif
 
 if WITH_RHINO
diff -r 12902038b45b -r d7e98386c764 patches/6703377-freetypescaler.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/6703377-freetypescaler.patch	Mon Oct 18 14:39:08 2010 +0200
@@ -0,0 +1,11 @@
+--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	2010-10-15 15:19:35.000000000 +0200
++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	2010-10-15 15:19:35.000000000 +0200
+@@ -979,7 +979,7 @@
+ }
+ 
+ 
+-#define FloatToF26Dot6(x) ((unsigned int) ((x)*64))
++#define FloatToF26Dot6(x) ((int) ((x)*64))
+ 
+ static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
+         FTScalerContext *context, FTScalerInfo* scalerInfo,