/hg/release/icedtea6-1.10: Added patch which ensures, that only ...

[ptisnovs at icedtea.classpath.org]

changeset 2b163816470c in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=2b163816470c
author: ptisnovs
date: Fri Jun 10 12:36:22 2011 +0200

	Added patch which ensures, that only one fontconfig file will be
	needed on particular RHEL version.


diffstat:

 ChangeLog                        |   8 ++++++++
 Makefile.am                      |   3 ++-
 patches/fonts-rhel-version.patch |  32 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)

diffs (65 lines):

diff -r a95c47b36218 -r 2b163816470c ChangeLog
--- a/ChangeLog	Wed Jun 08 18:16:37 2011 +0100
+++ b/ChangeLog	Fri Jun 10 12:36:22 2011 +0200
@@ -1,3 +1,11 @@
+2011-06-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Added new patch
+	* patches/fonts-rhel-version.patch:
+	Patch which ensures, that only one fontconfig file
+	will be needed on particular RHEL version
+	(ie. only one file for RHEL 6.0, RHEL 6.1 and RHEL 6.2)
+
 2011-06-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add 1.10.3.
diff -r a95c47b36218 -r 2b163816470c Makefile.am
--- a/Makefile.am	Wed Jun 08 18:16:37 2011 +0100
+++ b/Makefile.am	Fri Jun 10 12:36:22 2011 +0200
@@ -341,7 +341,8 @@
 	patches/openjdk/7031385-gcc-register-allocation-fix.patch \
 	patches/shark-llvm-2.9.patch \
 	patches/openjdk/pgram-pipe-regression.patch \
-	patches/openjdk/mutter.patch
+	patches/openjdk/mutter.patch \
+	patches/fonts-rhel-version.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r a95c47b36218 -r 2b163816470c patches/fonts-rhel-version.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fonts-rhel-version.patch	Fri Jun 10 12:36:22 2011 +0200
@@ -0,0 +1,33 @@
+--- openjdk-orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	2011-06-09 16:04:24.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	2011-06-09 16:04:24.000000000 +0200
+@@ -169,7 +169,9 @@
+                     osVersion = getVersionString(f);
+                 } else if ((f = new File("/etc/redhat-release")).canRead()) {
+                     osName = "RedHat";
+-                    osVersion = getVersionString(f);
++                    // At this time we don't need to distinguish
++                    // between RHEL 6.0 and RHEL 6.1 for example.
++                    osVersion = getMajorVersionString(f);
+                 } else if ((f = new File("/etc/turbolinux-release")).canRead()) {
+                     osName = "Turbo";
+                     osVersion = getVersionString(f);
+@@ -208,6 +210,19 @@
+         return null;
+     }
+ 
++    /**
++     * Gets the OS major version string from a Linux release-specific file.
++     */
++    private String getMajorVersionString(File f){
++        try {
++            Scanner sc  = new Scanner(f);
++            return sc.findInLine("(\\d)+");
++        }
++        catch (Exception e){
++        }
++        return null;
++    }
++
+     private static final String fontsDirPrefix = "$JRE_LIB_FONTS";
+ 
+     protected String mapFileName(String fileName) {