changeset 2865:21237eb24ba1

Bump to icedtea-2.7.0pre05. Upstream changes: - PR2557: Forwardport Fedora font configuration support - PR2557: Forwardport Gentoo font configuration support - PR2683: AArch64 port has broken Zero on AArch64 - PR2852: Apply ReservedCodeCacheSize default limiting to AArch64 only. - PR2889: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) - PR2914: byte_map_base is not page aligned on OpenJDK 7 - S6425769, PR2858: Allow specifying an address to bind JMX remote connector - S8028727, PR2814: [parfait] warnings from b116 for jdk.src.share.native.sun.security.ec: JNI pending exceptions - S8034797, PR2851: AIX: Fix os::naked_short_sleep() in os_aix.cpp after 8028280 - S8048512, PR2814: Uninitialised memory in jdk/src/share/native/sun/security/ec/ECC_JNI.cpp - S8071705. PR2819, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically - S8076221, PR2809: Disable RC4 cipher suites - S8081289: aarch64: add support for RewriteFrequentPairs in interpreter - S8131483: aarch64: illegal stlxr instructions - S8133196, PR2712: HTTPS hostname invalid issue with InetAddress - S8133352: aarch64: generates constrained unpredictable instructions - S8133842: aarch64: C2 generates illegal instructions with int shifts >=32 - S8134322: AArch64: Fix several errors in C2 biased locking implementation - S8136615: aarch64: elide DecodeN when followed by CmpP 0 - S8138575: Improve generated code for profile counters - S8138641: Disable C2 peephole by default for aarch64 - S8138966: Intermittent SEGV running ParallelGC - S8139258, PR2851: PPC64LE: argument passing problem when passing 15 floats in native call - S8139421, PR2851: PPC64LE: MacroAssembler::bxx64_patchable kill register R12 - S8140620, PR2710: Find and load default.sf2 as the default soundbank on Linux - S8143067: aarch64: guarantee failure in javac - S8143285: aarch64: Missing load acquire when checking if ConstantPoolCacheEntry is resolved - S8143584: Load constant pool tag and class status with load acquire - S8144201: aarch64: jdk/test/com/sun/net/httpserver/Test6a.java fails with --enable-unlimited-crypto - S8144582: AArch64 does not generate correct branch profile data - S8145982, PR2858: JMXInterfaceBindingTest is failing intermittently - S8146015, PR2858: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses - S8146709: AArch64: Incorrect use of ADRP for byte_map_base - S8147805: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject - S8148240: aarch64: random infrequent null pointer exceptions in javac - S8150954, PR2866, RH1176206: AWT Robot not compatible with GNOME Shell - Summary: Add support for large code cache ChangeLog: 2016-04-16 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.7.0pre05. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.7.0pre05. * hotspot.map.in: Update to icedtea-2.7.0pre05. 2015-11-13 Andrew John Hughes <gnu.andrew@redhat.com> * patches/f14-fonts.patch, * patches/fonts-gentoo.patch: Removed as now applied directly in the forest. * Makefile.am: (ICEDTEA_PATCHES): Reset to empty. (fonts): No need to copy Fedora files any more. Make a backup of the forest Gentoo fontconfig file before replacing with locally generated one. (clean-fonts): No need to remove Fedora files which are now provided in the forest. Restore the original Gentoo fontconfig from the backup.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sun, 17 Apr 2016 00:38:08 +0100
parents 3531bf8bba6f
children 89430c9d091b
files ChangeLog Makefile.am NEWS configure.ac hotspot.map.in patches/f14-fonts.patch patches/fonts-gentoo.patch
diffstat 7 files changed, 58 insertions(+), 729 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 15 04:28:35 2016 +0100
+++ b/ChangeLog	Sun Apr 17 00:38:08 2016 +0100
@@ -1,3 +1,36 @@
+2016-04-16  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.7.0pre05.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Updated.
+	* configure.ac: Bump to 2.7.0pre05.
+	* hotspot.map.in: Update to icedtea-2.7.0pre05.
+
+2015-11-13  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/f14-fonts.patch,
+	* patches/fonts-gentoo.patch:
+	Removed as now applied directly in the forest.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Reset to empty.
+	(fonts): No need to copy Fedora files any more.
+	Make a backup of the forest Gentoo fontconfig
+	file before replacing with locally generated one.
+	(clean-fonts): No need to remove Fedora files
+	which are now provided in the forest. Restore
+	the original Gentoo fontconfig from the backup.
+
 2015-10-22  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2686: Add generated Fedora & Gentoo font
--- a/Makefile.am	Fri Apr 15 04:28:35 2016 +0100
+++ b/Makefile.am	Sun Apr 17 00:38:08 2016 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 52740a0992cf
-JAXP_CHANGESET = 3cc8e02e66bc
-JAXWS_CHANGESET = ffef9af0446a
-JDK_CHANGESET = 91216176dcc7
-LANGTOOLS_CHANGESET = e15dd34800b5
-OPENJDK_CHANGESET = 613ca59d428d
-
-CORBA_SHA256SUM = d8cfca4bd056e0cdd3a69c9f2c13f5815ece29eabf791e7c1f798d3c31d24a0f
-JAXP_SHA256SUM = a621b407bd3b96e3d676c2e7d2358607dfe54fc97197b578d301c662f632e4e6
-JAXWS_SHA256SUM = bd2931f7c909160124b59c1f1b723930140741a5d3c9793330b8a391189fe461
-JDK_SHA256SUM = e72e00a3a311f3daeaefc23d2b11ea183fee4f0e1e431c12c9187c80d4ab330a
-LANGTOOLS_SHA256SUM = 03672c1c6e8c3a46c4f981821d45075c7c53facec3029728fbbea3fba094c69c
-OPENJDK_SHA256SUM = 492a567851ac54bcf93dae182d8421178b20b9d613b00254ff409e7a8587486a
+CORBA_CHANGESET = cbe0edb3d345
+JAXP_CHANGESET = 4b0a1c213416
+JAXWS_CHANGESET = 76aade5c18f8
+JDK_CHANGESET = 3fc5cbcd46dd
+LANGTOOLS_CHANGESET = caa50dd46a14
+OPENJDK_CHANGESET = 7f245987a287
+
+CORBA_SHA256SUM = b1257121829a728d1850382ac3ae1ea65ecf0461605824ad6e6b3583ebf8908f
+JAXP_SHA256SUM = 77e3b7f148a5876299d535b084f1b8bbfb58e173e9697a3560f2e59931aa73a2
+JAXWS_SHA256SUM = bc65e3078623f2d85df47f7a877121e57248068859c18ea03960b533af44a80e
+JDK_SHA256SUM = 44adca39f854ce57defd7692796c193f9bf638a1110e283cc369552ec66bbba2
+LANGTOOLS_SHA256SUM = 1a7195adfc1f05ecdf17559dd8afccbbd9b8c61e96f290a1e2ca9659856b4fa7
+OPENJDK_SHA256SUM = 72ab3fe89fab55d430af49ffaae216317e8a88b963350a7a695870f7fd744c33
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -369,7 +369,7 @@
 
 # Patch list
 
-ICEDTEA_PATCHES = patches/f14-fonts.patch patches/fonts-gentoo.patch
+ICEDTEA_PATCHES = 
 
 # Conditional patches
 
@@ -1634,17 +1634,14 @@
 	rm -f stamps/generated.stamp
 
 stamps/fonts.stamp: stamps/extract.stamp
-	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.9.properties
-	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.10.properties
-	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.11.properties
-	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties
+	cp $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{,.old}
 	cp linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH)
 	mkdir -p stamps
 	touch $@
 
 clean-fonts:
-	rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.{9,10,11,12}.properties
 	rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties
+	mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,}
 	rm -f stamps/fonts.stamp
 
 stamps/patch-fsg.stamp: stamps/extract.stamp stamps/fonts.stamp
--- a/NEWS	Fri Apr 15 04:28:35 2016 +0100
+++ b/NEWS	Sun Apr 17 00:38:08 2016 +0100
@@ -14,6 +14,13 @@
 
 New in release 2.7.0 (201X-XX-XX):
 
+* Backports
+  - S8076221, PR2809: Disable RC4 cipher suites
+* Bug fixes
+  - PR2889: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+* AArch64 port
+  - PR2914: byte_map_base is not page aligned on OpenJDK 7
+
 New in release 2.6.5 (2016-03-24):
 
 * Security fixes
--- a/configure.ac	Fri Apr 15 04:28:35 2016 +0100
+++ b/configure.ac	Sun Apr 17 00:38:08 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.7.0pre04], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.7.0pre05], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
--- a/hotspot.map.in	Fri Apr 15 04:28:35 2016 +0100
+++ b/hotspot.map.in	Sun Apr 17 00:38:08 2016 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 43c066bdfc9f d5bbe93d241cb8ca92649cc8b3a19952a7fc4217d33a3df80b18894c58bd52f1
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 88abb663cdf9 b98e7d51fae5dc6380a18658f5b75158b4de5ddc618a21fee616c73a2a162014
--- a/patches/f14-fonts.patch	Fri Apr 15 04:28:35 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,682 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
---- openjdk.orig/jdk/make/sun/awt/Makefile	2015-07-23 09:51:31.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/Makefile	2015-10-22 03:11:54.125969881 +0100
-@@ -482,7 +482,11 @@
- 	fontconfig.properties				\
- 	fontconfig.SuSE.properties                      \
- 	fontconfig.Ubuntu.properties                    \
--	fontconfig.Fedora.properties
-+	fontconfig.Fedora.properties			\
-+	fontconfig.Fedora.9.properties			\
-+	fontconfig.Fedora.10.properties			\
-+	fontconfig.Fedora.11.properties			\
-+	fontconfig.Fedora.12.properties
- else
- 
- FONTCONFIGS_SRC	= $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
-diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties	2015-10-22 03:05:18.236546475 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties	2015-10-22 03:09:01.004845677 +0100
-@@ -36,6 +36,8 @@
- dialog.plain.korean=Baekmuk Gulim
- dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
- dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.plain.assamese=Lohit Assamese
-+dialog.plain.devanagari=Lohit Devanagari
- dialog.plain.bengali=Lohit Bengali
- dialog.plain.gujarati=Lohit Gujarati
- dialog.plain.hindi=Lohit Hindi
-@@ -51,6 +53,8 @@
- dialog.bold.korean=Baekmuk Gulim
- dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
- dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.bold.assamese=Lohit Assamese
-+dialog.bold.devanagari=Lohit Devanagari
- dialog.bold.bengali=Lohit Bengali
- dialog.bold.gujarati=Lohit Gujarati
- dialog.bold.hindi=Lohit Hindi
-@@ -66,6 +70,8 @@
- dialog.italic.korean=Baekmuk Gulim
- dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
- dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.italic.assamese=Lohit Assamese
-+dialog.italic.devanagari=Lohit Devanagari
- dialog.italic.bengali=Lohit Bengali
- dialog.italic.gujarati=Lohit Gujarati
- dialog.italic.hindi=Lohit Hindi
-@@ -81,6 +87,8 @@
- dialog.bolditalic.korean=Baekmuk Gulim
- dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.bolditalic.assamese=Lohit Assamese
-+dialog.bolditalic.devanagari=Lohit Devanagari
- dialog.bolditalic.bengali=Lohit Bengali
- dialog.bolditalic.gujarati=Lohit Gujarati
- dialog.bolditalic.hindi=Lohit Hindi
-@@ -96,6 +104,8 @@
- sansserif.plain.korean=Baekmuk Gulim
- sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.plain.assamese=Lohit Assamese
-+sansserif.plain.devanagari=Lohit Devanagari
- sansserif.plain.bengali=Lohit Bengali
- sansserif.plain.gujarati=Lohit Gujarati
- sansserif.plain.hindi=Lohit Hindi
-@@ -111,6 +121,8 @@
- sansserif.bold.korean=Baekmuk Gulim
- sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.bold.assamese=Lohit Assamese
-+sansserif.bold.devanagari=Lohit Devanagari
- sansserif.bold.bengali=Lohit Bengali
- sansserif.bold.gujarati=Lohit Gujarati
- sansserif.bold.hindi=Lohit Hindi
-@@ -126,6 +138,8 @@
- sansserif.italic.korean=Baekmuk Gulim
- sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.italic.assamese=Lohit Assamese
-+sansserif.italic.devanagari=Lohit Devanagari
- sansserif.italic.bengali=Lohit Bengali
- sansserif.italic.gujarati=Lohit Gujarati
- sansserif.italic.hindi=Lohit Hindi
-@@ -141,6 +155,8 @@
- sansserif.bolditalic.korean=Baekmuk Gulim
- sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.bolditalic.assamese=Lohit Assamese
-+sansserif.bolditalic.devanagari=Lohit Devanagari
- sansserif.bolditalic.bengali=Lohit Bengali
- sansserif.bolditalic.gujarati=Lohit Gujarati
- sansserif.bolditalic.hindi=Lohit Hindi
-@@ -156,6 +172,8 @@
- serif.plain.korean=Baekmuk Batang
- serif.plain.chinese-big5=AR PL ZenKai Uni
- serif.plain.chinese-gb18030=AR PL ZenKai Uni
-+serif.plain.assamese=Lohit Assamese
-+serif.plain.devanagari=Lohit Devanagari
- serif.plain.bengali=Lohit Bengali
- serif.plain.gujarati=Lohit Gujarati
- serif.plain.hindi=Lohit Hindi
-@@ -171,6 +189,8 @@
- serif.bold.korean=Baekmuk Batang
- serif.bold.chinese-big5=AR PL ZenKai Uni
- serif.bold.chinese-gb18030=AR PL ZenKai Uni
-+serif.bold.assamese=Lohit Assamese
-+serif.bold.devanagari=Lohit Devanagari
- serif.bold.bengali=Lohit Bengali
- serif.bold.gujarati=Lohit Gujarati
- serif.bold.hindi=Lohit Hindi
-@@ -186,6 +206,8 @@
- serif.italic.korean=Baekmuk Batang
- serif.italic.chinese-big5=AR PL ZenKai Uni
- serif.italic.chinese-gb18030=AR PL ZenKai Uni
-+serif.italic.assamese=Lohit Assamese
-+serif.italic.devanagari=Lohit Devanagari
- serif.italic.bengali=Lohit Bengali
- serif.italic.gujarati=Lohit Gujarati
- serif.italic.hindi=Lohit Hindi
-@@ -201,6 +223,8 @@
- serif.bolditalic.korean=Baekmuk Batang
- serif.bolditalic.chinese-big5=AR PL ZenKai Uni
- serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
-+serif.bolditalic.assamese=Lohit Assamese
-+serif.bolditalic.devanagari=Lohit Devanagari
- serif.bolditalic.bengali=Lohit Bengali
- serif.bolditalic.gujarati=Lohit Gujarati
- serif.bolditalic.hindi=Lohit Hindi
-@@ -216,6 +240,8 @@
- monospaced.plain.korean=Baekmuk Gulim
- monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.plain.assamese=Lohit Assamese
-+monospaced.plain.devanagari=Lohit Devanagari
- monospaced.plain.bengali=Lohit Bengali
- monospaced.plain.gujarati=Lohit Gujarati
- monospaced.plain.hindi=Lohit Hindi
-@@ -231,6 +257,8 @@
- monospaced.bold.korean=Baekmuk Gulim
- monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.bold.assamese=Lohit Assamese
-+monospaced.bold.devanagari=Lohit Devanagari
- monospaced.bold.bengali=Lohit Bengali
- monospaced.bold.gujarati=Lohit Gujarati
- monospaced.bold.hindi=Lohit Hindi
-@@ -246,6 +274,8 @@
- monospaced.italic.korean=Baekmuk Gulim
- monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.italic.assamese=Lohit Assamese
-+monospaced.italic.devanagari=Lohit Devanagari
- monospaced.italic.bengali=Lohit Bengali
- monospaced.italic.gujarati=Lohit Gujarati
- monospaced.italic.hindi=Lohit Hindi
-@@ -261,6 +291,8 @@
- monospaced.bolditalic.korean=Baekmuk Gulim
- monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.bolditalic.assamese=Lohit Assamese
-+monospaced.bolditalic.devanagari=Lohit Devanagari
- monospaced.bolditalic.bengali=Lohit Bengali
- monospaced.bolditalic.gujarati=Lohit Gujarati
- monospaced.bolditalic.hindi=Lohit Hindi
-@@ -276,6 +308,8 @@
- dialoginput.plain.korean=Baekmuk Gulim
- dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.plain.assamese=Lohit Assamese
-+dialoginput.plain.devanagari=Lohit Devanagari
- dialoginput.plain.bengali=Lohit Bengali
- dialoginput.plain.gujarati=Lohit Gujarati
- dialoginput.plain.hindi=Lohit Hindi
-@@ -291,6 +325,8 @@
- dialoginput.bold.korean=Baekmuk Gulim
- dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.bold.assamese=Lohit Assamese
-+dialoginput.bold.devanagari=Lohit Devanagari
- dialoginput.bold.bengali=Lohit Bengali
- dialoginput.bold.gujarati=Lohit Gujarati
- dialoginput.bold.hindi=Lohit Hindi
-@@ -306,6 +342,8 @@
- dialoginput.italic.korean=Baekmuk Gulim
- dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.italic.assamese=Lohit Assamese
-+dialoginput.italic.devanagari=Lohit Devanagari
- dialoginput.italic.bengali=Lohit Bengali
- dialoginput.italic.gujarati=Lohit Gujarati
- dialoginput.italic.hindi=Lohit Hindi
-@@ -321,6 +359,8 @@
- dialoginput.bolditalic.korean=Baekmuk Gulim
- dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.bolditalic.assamese=Lohit Assamese
-+dialoginput.bolditalic.devanagari=Lohit Devanagari
- dialoginput.bolditalic.bengali=Lohit Bengali
- dialoginput.bolditalic.gujarati=Lohit Gujarati
- dialoginput.bolditalic.hindi=Lohit Hindi
-@@ -357,21 +397,24 @@
- filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
- filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
- 
--filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf
- filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc
- filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc
--filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf
-+
-+filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf
-+filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
-+filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/Lohit-Hindi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf
-+filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf
- 
--filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf
--filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
- filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
- 
-diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties	2015-10-22 03:05:18.236546475 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties	2015-10-22 03:09:01.008845611 +0100
-@@ -36,6 +36,8 @@
- dialog.plain.korean=Baekmuk Gulim
- dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
- dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.plain.assamese=Lohit Assamese
-+dialog.plain.devanagari=Lohit Devanagari
- dialog.plain.bengali=Lohit Bengali
- dialog.plain.gujarati=Lohit Gujarati
- dialog.plain.hindi=Lohit Hindi
-@@ -51,6 +53,8 @@
- dialog.bold.korean=Baekmuk Gulim
- dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
- dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.bold.assamese=Lohit Assamese
-+dialog.bold.devanagari=Lohit Devanagari
- dialog.bold.bengali=Lohit Bengali
- dialog.bold.gujarati=Lohit Gujarati
- dialog.bold.hindi=Lohit Hindi
-@@ -66,6 +70,8 @@
- dialog.italic.korean=Baekmuk Gulim
- dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
- dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.italic.assamese=Lohit Assamese
-+dialog.italic.devanagari=Lohit Devanagari
- dialog.italic.bengali=Lohit Bengali
- dialog.italic.gujarati=Lohit Gujarati
- dialog.italic.hindi=Lohit Hindi
-@@ -81,6 +87,8 @@
- dialog.bolditalic.korean=Baekmuk Gulim
- dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.bolditalic.assamese=Lohit Assamese
-+dialog.bolditalic.devanagari=Lohit Devanagari
- dialog.bolditalic.bengali=Lohit Bengali
- dialog.bolditalic.gujarati=Lohit Gujarati
- dialog.bolditalic.hindi=Lohit Hindi
-@@ -96,6 +104,8 @@
- sansserif.plain.korean=Baekmuk Gulim
- sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.plain.assamese=Lohit Assamese
-+sansserif.plain.devanagari=Lohit Devanagari
- sansserif.plain.bengali=Lohit Bengali
- sansserif.plain.gujarati=Lohit Gujarati
- sansserif.plain.hindi=Lohit Hindi
-@@ -111,6 +121,8 @@
- sansserif.bold.korean=Baekmuk Gulim
- sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.bold.assamese=Lohit Assamese
-+sansserif.bold.devanagari=Lohit Devanagari
- sansserif.bold.bengali=Lohit Bengali
- sansserif.bold.gujarati=Lohit Gujarati
- sansserif.bold.hindi=Lohit Hindi
-@@ -126,6 +138,8 @@
- sansserif.italic.korean=Baekmuk Gulim
- sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.italic.assamese=Lohit Assamese
-+sansserif.italic.devanagari=Lohit Devanagari
- sansserif.italic.bengali=Lohit Bengali
- sansserif.italic.gujarati=Lohit Gujarati
- sansserif.italic.hindi=Lohit Hindi
-@@ -141,6 +155,8 @@
- sansserif.bolditalic.korean=Baekmuk Gulim
- sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.bolditalic.assamese=Lohit Assamese
-+sansserif.bolditalic.devanagari=Lohit Devanagari
- sansserif.bolditalic.bengali=Lohit Bengali
- sansserif.bolditalic.gujarati=Lohit Gujarati
- sansserif.bolditalic.hindi=Lohit Hindi
-@@ -156,6 +172,8 @@
- serif.plain.korean=Baekmuk Batang
- serif.plain.chinese-big5=AR PL ZenKai Uni
- serif.plain.chinese-gb18030=AR PL ZenKai Uni
-+serif.plain.assamese=Lohit Assamese
-+serif.plain.devanagari=Lohit Devanagari
- serif.plain.bengali=Lohit Bengali
- serif.plain.gujarati=Lohit Gujarati
- serif.plain.hindi=Lohit Hindi
-@@ -171,6 +189,8 @@
- serif.bold.korean=Baekmuk Batang
- serif.bold.chinese-big5=AR PL ZenKai Uni
- serif.bold.chinese-gb18030=AR PL ZenKai Uni
-+serif.bold.assamese=Lohit Assamese
-+serif.bold.devanagari=Lohit Devanagari
- serif.bold.bengali=Lohit Bengali
- serif.bold.gujarati=Lohit Gujarati
- serif.bold.hindi=Lohit Hindi
-@@ -186,6 +206,8 @@
- serif.italic.korean=Baekmuk Batang
- serif.italic.chinese-big5=AR PL ZenKai Uni
- serif.italic.chinese-gb18030=AR PL ZenKai Uni
-+serif.italic.assamese=Lohit Assamese
-+serif.italic.devanagari=Lohit Devanagari
- serif.italic.bengali=Lohit Bengali
- serif.italic.gujarati=Lohit Gujarati
- serif.italic.hindi=Lohit Hindi
-@@ -201,6 +223,8 @@
- serif.bolditalic.korean=Baekmuk Batang
- serif.bolditalic.chinese-big5=AR PL ZenKai Uni
- serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
-+serif.bolditalic.assamese=Lohit Assamese
-+serif.bolditalic.devanagari=Lohit Devanagari
- serif.bolditalic.bengali=Lohit Bengali
- serif.bolditalic.gujarati=Lohit Gujarati
- serif.bolditalic.hindi=Lohit Hindi
-@@ -216,6 +240,8 @@
- monospaced.plain.korean=Baekmuk Gulim
- monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.plain.assamese=Lohit Assamese
-+monospaced.plain.devanagari=Lohit Devanagari
- monospaced.plain.bengali=Lohit Bengali
- monospaced.plain.gujarati=Lohit Gujarati
- monospaced.plain.hindi=Lohit Hindi
-@@ -231,6 +257,8 @@
- monospaced.bold.korean=Baekmuk Gulim
- monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.bold.assamese=Lohit Assamese
-+monospaced.bold.devanagari=Lohit Devanagari
- monospaced.bold.bengali=Lohit Bengali
- monospaced.bold.gujarati=Lohit Gujarati
- monospaced.bold.hindi=Lohit Hindi
-@@ -246,6 +274,8 @@
- monospaced.italic.korean=Baekmuk Gulim
- monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.italic.assamese=Lohit Assamese
-+monospaced.italic.devanagari=Lohit Devanagari
- monospaced.italic.bengali=Lohit Bengali
- monospaced.italic.gujarati=Lohit Gujarati
- monospaced.italic.hindi=Lohit Hindi
-@@ -261,6 +291,8 @@
- monospaced.bolditalic.korean=Baekmuk Gulim
- monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.bolditalic.assamese=Lohit Assamese
-+monospaced.bolditalic.devanagari=Lohit Devanagari
- monospaced.bolditalic.bengali=Lohit Bengali
- monospaced.bolditalic.gujarati=Lohit Gujarati
- monospaced.bolditalic.hindi=Lohit Hindi
-@@ -276,6 +308,8 @@
- dialoginput.plain.korean=Baekmuk Gulim
- dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.plain.assamese=Lohit Assamese
-+dialoginput.plain.devanagari=Lohit Devanagari
- dialoginput.plain.bengali=Lohit Bengali
- dialoginput.plain.gujarati=Lohit Gujarati
- dialoginput.plain.hindi=Lohit Hindi
-@@ -291,6 +325,8 @@
- dialoginput.bold.korean=Baekmuk Gulim
- dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.bold.assamese=Lohit Assamese
-+dialoginput.bold.devanagari=Lohit Devanagari
- dialoginput.bold.bengali=Lohit Bengali
- dialoginput.bold.gujarati=Lohit Gujarati
- dialoginput.bold.hindi=Lohit Hindi
-@@ -306,6 +342,8 @@
- dialoginput.italic.korean=Baekmuk Gulim
- dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.italic.assamese=Lohit Assamese
-+dialoginput.italic.devanagari=Lohit Devanagari
- dialoginput.italic.bengali=Lohit Bengali
- dialoginput.italic.gujarati=Lohit Gujarati
- dialoginput.italic.hindi=Lohit Hindi
-@@ -321,6 +359,8 @@
- dialoginput.bolditalic.korean=Baekmuk Gulim
- dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.bolditalic.assamese=Lohit Assamese
-+dialoginput.bolditalic.devanagari=Lohit Devanagari
- dialoginput.bolditalic.bengali=Lohit Bengali
- dialoginput.bolditalic.gujarati=Lohit Gujarati
- dialoginput.bolditalic.hindi=Lohit Hindi
-@@ -357,21 +397,24 @@
- filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
- filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
- 
--filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf
- filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc
- filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc
--filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf
-+
-+filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf
-+filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
-+filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf
-+filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf
- 
--filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf
--filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
- filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
- 
-diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2015-07-23 09:51:31.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2015-10-22 03:09:01.008845611 +0100
-@@ -36,6 +36,8 @@
- dialog.plain.korean=Baekmuk Gulim
- dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
- dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.plain.assamese=Lohit Assamese
-+dialog.plain.devanagari=Lohit Devanagari
- dialog.plain.bengali=Lohit Bengali
- dialog.plain.gujarati=Lohit Gujarati
- dialog.plain.hindi=Lohit Hindi
-@@ -51,6 +53,8 @@
- dialog.bold.korean=Baekmuk Gulim
- dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
- dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.bold.assamese=Lohit Assamese
-+dialog.bold.devanagari=Lohit Devanagari
- dialog.bold.bengali=Lohit Bengali
- dialog.bold.gujarati=Lohit Gujarati
- dialog.bold.hindi=Lohit Hindi
-@@ -66,6 +70,8 @@
- dialog.italic.korean=Baekmuk Gulim
- dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
- dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.italic.assamese=Lohit Assamese
-+dialog.italic.devanagari=Lohit Devanagari
- dialog.italic.bengali=Lohit Bengali
- dialog.italic.gujarati=Lohit Gujarati
- dialog.italic.hindi=Lohit Hindi
-@@ -81,6 +87,8 @@
- dialog.bolditalic.korean=Baekmuk Gulim
- dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialog.bolditalic.assamese=Lohit Assamese
-+dialog.bolditalic.devanagari=Lohit Devanagari
- dialog.bolditalic.bengali=Lohit Bengali
- dialog.bolditalic.gujarati=Lohit Gujarati
- dialog.bolditalic.hindi=Lohit Hindi
-@@ -96,6 +104,8 @@
- sansserif.plain.korean=Baekmuk Gulim
- sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.plain.assamese=Lohit Assamese
-+sansserif.plain.devanagari=Lohit Devanagari
- sansserif.plain.bengali=Lohit Bengali
- sansserif.plain.gujarati=Lohit Gujarati
- sansserif.plain.hindi=Lohit Hindi
-@@ -111,6 +121,8 @@
- sansserif.bold.korean=Baekmuk Gulim
- sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.bold.assamese=Lohit Assamese
-+sansserif.bold.devanagari=Lohit Devanagari
- sansserif.bold.bengali=Lohit Bengali
- sansserif.bold.gujarati=Lohit Gujarati
- sansserif.bold.hindi=Lohit Hindi
-@@ -126,6 +138,8 @@
- sansserif.italic.korean=Baekmuk Gulim
- sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.italic.assamese=Lohit Assamese
-+sansserif.italic.devanagari=Lohit Devanagari
- sansserif.italic.bengali=Lohit Bengali
- sansserif.italic.gujarati=Lohit Gujarati
- sansserif.italic.hindi=Lohit Hindi
-@@ -141,6 +155,8 @@
- sansserif.bolditalic.korean=Baekmuk Gulim
- sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+sansserif.bolditalic.assamese=Lohit Assamese
-+sansserif.bolditalic.devanagari=Lohit Devanagari
- sansserif.bolditalic.bengali=Lohit Bengali
- sansserif.bolditalic.gujarati=Lohit Gujarati
- sansserif.bolditalic.hindi=Lohit Hindi
-@@ -156,6 +172,8 @@
- serif.plain.korean=Baekmuk Batang
- serif.plain.chinese-big5=AR PL ZenKai Uni
- serif.plain.chinese-gb18030=AR PL ZenKai Uni
-+serif.plain.assamese=Lohit Assamese
-+serif.plain.devanagari=Lohit Devanagari
- serif.plain.bengali=Lohit Bengali
- serif.plain.gujarati=Lohit Gujarati
- serif.plain.hindi=Lohit Hindi
-@@ -171,6 +189,8 @@
- serif.bold.korean=Baekmuk Batang
- serif.bold.chinese-big5=AR PL ZenKai Uni
- serif.bold.chinese-gb18030=AR PL ZenKai Uni
-+serif.bold.assamese=Lohit Assamese
-+serif.bold.devanagari=Lohit Devanagari
- serif.bold.bengali=Lohit Bengali
- serif.bold.gujarati=Lohit Gujarati
- serif.bold.hindi=Lohit Hindi
-@@ -186,6 +206,8 @@
- serif.italic.korean=Baekmuk Batang
- serif.italic.chinese-big5=AR PL ZenKai Uni
- serif.italic.chinese-gb18030=AR PL ZenKai Uni
-+serif.italic.assamese=Lohit Assamese
-+serif.italic.devanagari=Lohit Devanagari
- serif.italic.bengali=Lohit Bengali
- serif.italic.gujarati=Lohit Gujarati
- serif.italic.hindi=Lohit Hindi
-@@ -201,6 +223,8 @@
- serif.bolditalic.korean=Baekmuk Batang
- serif.bolditalic.chinese-big5=AR PL ZenKai Uni
- serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
-+serif.bolditalic.assamese=Lohit Assamese
-+serif.bolditalic.devanagari=Lohit Devanagari
- serif.bolditalic.bengali=Lohit Bengali
- serif.bolditalic.gujarati=Lohit Gujarati
- serif.bolditalic.hindi=Lohit Hindi
-@@ -216,6 +240,8 @@
- monospaced.plain.korean=Baekmuk Gulim
- monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.plain.assamese=Lohit Assamese
-+monospaced.plain.devanagari=Lohit Devanagari
- monospaced.plain.bengali=Lohit Bengali
- monospaced.plain.gujarati=Lohit Gujarati
- monospaced.plain.hindi=Lohit Hindi
-@@ -231,6 +257,8 @@
- monospaced.bold.korean=Baekmuk Gulim
- monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.bold.assamese=Lohit Assamese
-+monospaced.bold.devanagari=Lohit Devanagari
- monospaced.bold.bengali=Lohit Bengali
- monospaced.bold.gujarati=Lohit Gujarati
- monospaced.bold.hindi=Lohit Hindi
-@@ -246,6 +274,8 @@
- monospaced.italic.korean=Baekmuk Gulim
- monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.italic.assamese=Lohit Assamese
-+monospaced.italic.devanagari=Lohit Devanagari
- monospaced.italic.bengali=Lohit Bengali
- monospaced.italic.gujarati=Lohit Gujarati
- monospaced.italic.hindi=Lohit Hindi
-@@ -261,6 +291,8 @@
- monospaced.bolditalic.korean=Baekmuk Gulim
- monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+monospaced.bolditalic.assamese=Lohit Assamese
-+monospaced.bolditalic.devanagari=Lohit Devanagari
- monospaced.bolditalic.bengali=Lohit Bengali
- monospaced.bolditalic.gujarati=Lohit Gujarati
- monospaced.bolditalic.hindi=Lohit Hindi
-@@ -276,6 +308,8 @@
- dialoginput.plain.korean=Baekmuk Gulim
- dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.plain.assamese=Lohit Assamese
-+dialoginput.plain.devanagari=Lohit Devanagari
- dialoginput.plain.bengali=Lohit Bengali
- dialoginput.plain.gujarati=Lohit Gujarati
- dialoginput.plain.hindi=Lohit Hindi
-@@ -291,6 +325,8 @@
- dialoginput.bold.korean=Baekmuk Gulim
- dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.bold.assamese=Lohit Assamese
-+dialoginput.bold.devanagari=Lohit Devanagari
- dialoginput.bold.bengali=Lohit Bengali
- dialoginput.bold.gujarati=Lohit Gujarati
- dialoginput.bold.hindi=Lohit Hindi
-@@ -306,6 +342,8 @@
- dialoginput.italic.korean=Baekmuk Gulim
- dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.italic.assamese=Lohit Assamese
-+dialoginput.italic.devanagari=Lohit Devanagari
- dialoginput.italic.bengali=Lohit Bengali
- dialoginput.italic.gujarati=Lohit Gujarati
- dialoginput.italic.hindi=Lohit Hindi
-@@ -321,6 +359,8 @@
- dialoginput.bolditalic.korean=Baekmuk Gulim
- dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
- dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
-+dialoginput.bolditalic.assamese=Lohit Assamese
-+dialoginput.bolditalic.devanagari=Lohit Devanagari
- dialoginput.bolditalic.bengali=Lohit Bengali
- dialoginput.bolditalic.gujarati=Lohit Gujarati
- dialoginput.bolditalic.hindi=Lohit Hindi
-@@ -357,21 +397,24 @@
- filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
- filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
- 
--filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc
--filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc
--filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf
--filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkuni-uming/uming.ttc
-+filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkuni-ukai/ukai.ttc
-+filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf/gulim.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf/batang.ttf
-+
-+filename.Lohit_Assamese=/usr/share/fonts/lohit-assamese/Lohit-Assamese.ttf
-+filename.Lohit_Devanagari=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
-+filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/Lohit-Bengali.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/Lohit-Gujarati.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/Lohit-Kannada.ttf
-+filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/Lohit-Malayalam.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/Lohit-Oriya.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/Lohit-Punjabi.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/Lohit-Telugu.ttf
-+
- filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
- 
--- a/patches/fonts-gentoo.patch	Fri Apr 15 04:28:35 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
---- openjdk.orig/jdk/make/sun/awt/Makefile	2015-10-22 03:21:58.927759489 +0100
-+++ openjdk/jdk/make/sun/awt/Makefile	2015-10-22 03:31:55.553678663 +0100
-@@ -486,7 +486,8 @@
- 	fontconfig.Fedora.9.properties			\
- 	fontconfig.Fedora.10.properties			\
- 	fontconfig.Fedora.11.properties			\
--	fontconfig.Fedora.12.properties
-+	fontconfig.Fedora.12.properties			\
-+	fontconfig.Gentoo.properties
- else
- 
- FONTCONFIGS_SRC	= $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
-diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java
---- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	2015-07-23 09:51:31.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	2015-10-22 03:31:36.429997969 +0100
-@@ -178,6 +178,9 @@
-                 } else if ((f = new File("/etc/SuSE-release")).canRead()) {
-                     osName = "SuSE";
-                     osVersion = getVersionString(f);
-+                } else if ((f = new File("/etc/gentoo-release")).canRead()) {
-+                    osName = "Gentoo";
-+                    osVersion = getVersionString(f);
-                 } else if ((f = new File("/etc/lsb-release")).canRead()) {
-                     /* Ubuntu and (perhaps others) use only lsb-release.
-                      * Syntax and encoding is compatible with java properties.