Mercurial > hg > release > icedtea7-2.6

changeset 2862:17770cf44bc6 icedtea-2.6.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to icedtea-2.6.3 Upstream changes: - Bump to icedtea-2.6.3 - PR2557: Forwardport Fedora font configuration support - PR2557: Forwardport Gentoo font configuration support - PR2683: AArch64 port has broken Zero on AArch64 - S8133196, PR2712, RH1251935: HTTPS hostname invalid issue with InetAddress - S8140620, PR2710: Find and load default.sf2 as the default soundbank on Linux - S8142882: rebinding of the receiver of a DirectMethodHandle may allow a protected method to be accessed 2015-11-13 Andrew John Hughes <gnu.andrew@redhat.com> * patches/f14-fonts.patch, * patches/fonts-gentoo.patch, * patches/pr2683.patch: Removed as now applied directly in the forest. * Makefile.am: (BUILD_VERSION): Bump to b02. (CORBA_CHANGESET): Update to icedtea-2.6.3. (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. (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. * NEWS: Updated. * configure.ac: Bump to 2.6.3. * hotspot.map.in: Update to icedtea-2.6.3.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 13 Nov 2015 06:58:45 +0000
parents f8e86ee7c896
children 0c61848b587d
files ChangeLog Makefile.am NEWS configure.ac hotspot.map.in patches/f14-fonts.patch patches/fonts-gentoo.patch patches/pr2683.patch
diffstat 8 files changed, 57 insertions(+), 748 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Nov 03 17:10:26 2015 +0000
+++ b/ChangeLog	Fri Nov 13 06:58:45 2015 +0000
@@ -1,3 +1,34 @@
+2015-11-13  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/f14-fonts.patch,
+	* patches/fonts-gentoo.patch,
+	* patches/pr2683.patch:
+	Removed as now applied directly in the forest.
+	* Makefile.am:
+	(BUILD_VERSION): Bump to b02.
+	(CORBA_CHANGESET): Update to icedtea-2.6.3.
+	(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.
+	(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.
+	* NEWS: Updated.
+	* configure.ac: Bump to 2.6.3.
+	* hotspot.map.in: Update to icedtea-2.6.3.
+
 2015-11-03  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* NEWS: Fix typos in 2.6.2 release
--- a/Makefile.am	Tue Nov 03 17:10:26 2015 +0000
+++ b/Makefile.am	Fri Nov 13 06:58:45 2015 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
 JDK_UPDATE_VERSION = 91
-BUILD_VERSION = b01
+BUILD_VERSION = b02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = a4d55c5cec23
-JAXP_CHANGESET = f1202fb27695
-JAXWS_CHANGESET = 14c411b1183c
-JDK_CHANGESET = db69ae53157a
-LANGTOOLS_CHANGESET = 73356b81c5c7
-OPENJDK_CHANGESET = 601ca7147b8c
-
-CORBA_SHA256SUM = 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af
-JAXP_SHA256SUM = 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0
-JAXWS_SHA256SUM = 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4
-JDK_SHA256SUM = 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1
-LANGTOOLS_SHA256SUM = a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335
-OPENJDK_SHA256SUM = 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49
+CORBA_CHANGESET = 9a3ca529125a
+JAXP_CHANGESET = f7bf82fcbd09
+JAXWS_CHANGESET = 39ef53b9c403
+JDK_CHANGESET = 5215185a1d57
+LANGTOOLS_CHANGESET = 91fdb0c83e50
+OPENJDK_CHANGESET = f0e7f22f09ef
+
+CORBA_SHA256SUM = 1052ae3c70908aa3374818ada320685cb7abdc7bd7bbd3cfb4f26fbbe7435ec6
+JAXP_SHA256SUM = a0e978bc07371901560a746cae492edf0bcb22ddbb9e47b77319ffda1351806b
+JAXWS_SHA256SUM = 55897d92e368ac7df3e04d4f235e9dba12ea8264e20d4bd6b68e8c13e5addc1e
+JDK_SHA256SUM = 583898549b52e958521474db34f2ce535b6a0926c7df1fa99a3f0321b3a109f5
+LANGTOOLS_SHA256SUM = f14716df84e047b19884ac5b0830e87b6cdf1925d0951195255c9124e89df27e
+OPENJDK_SHA256SUM = 9e5d26bb1888a8a1378e078953aa04314d4fb4f263ebbaf7f459110c21f8d46d
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -370,8 +370,7 @@
 
 # Patch list
 
-ICEDTEA_PATCHES = patches/f14-fonts.patch patches/fonts-gentoo.patch \
-	patches/pr2683.patch
+ICEDTEA_PATCHES = 
 
 # Conditional patches
 
@@ -1635,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	Tue Nov 03 17:10:26 2015 +0000
+++ b/NEWS	Fri Nov 13 06:58:45 2015 +0000
@@ -12,7 +12,13 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.6.3 (2016-01-XX):
+New in release 2.6.3 (2015-11-13):
+
+* Security fixes
+  - S8142882, CVE-2015-4871: rebinding of the receiver of a DirectMethodHandle may allow a protected method to be accessed
+* Backports
+  - S8133196, PR2712, RH1251935: HTTPS hostname invalid issue with InetAddress
+  - S8140620, PR2710: Find and load default.sf2 as the default soundbank on Linux
 
 New in release 2.6.2 (2015-10-22):
 
--- a/configure.ac	Tue Nov 03 17:10:26 2015 +0000
+++ b/configure.ac	Fri Nov 13 06:58:45 2015 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.3pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.3], [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	Tue Nov 03 17:10:26 2015 +0000
+++ b/hotspot.map.in	Fri Nov 13 06:58:45 2015 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ f40363c11191 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ c3cde6774003 dd8f3771439b4d51fa84e3f9b384b80e6656cf1a19ee3492b4f2fe09b37eef0e
--- a/patches/f14-fonts.patch	Tue Nov 03 17:10:26 2015 +0000
+++ /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	Tue Nov 03 17:10:26 2015 +0000
+++ /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.
--- a/patches/pr2683.patch	Tue Nov 03 17:10:26 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -r f40363c11191 src/share/vm/runtime/vmStructs.cpp
---- openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed Oct 21 03:15:32 2015 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp	Thu Oct 22 22:52:31 2015 +0100
-@@ -843,10 +843,10 @@
-   /***********************************/                                                                                              \
-                                                                                                                                      \
-      static_field(StubRoutines,                _call_stub_return_address,                     address)                               \
--  AARCH64_ONLY(                                      \
-+  AARCH64_ONLY(NOT_ZERO(						\
-       static_field(StubRoutines,                _updateBytesCRC32,                             address)                              \
-      static_field(StubRoutines,                _crc_table_adr,                                address)                               \
--  )                                                  \
-+  ))   \
-                                                                                                                                      \
-   /***************************************/                                                                                          \
-   /* PcDesc and other compiled code info */                                                                                          \