--- a/AUTHORS	Thu Jun 12 21:23:05 2014 +0100
+++ b/AUTHORS	Fri Jun 13 01:30:38 2014 +0100
@@ -2,6 +2,7 @@
 Please keep this list in alphabetical order.
 
 Lillian Angel <langel@redhat.com>
+Aleksandar Antok <http://www.aleksandara.net>
 Alon Bar-Lev <alon.barlev@gmail.com>
 Gary Benson <gbenson@redhat.com>
 Tania Bento <tbento@redhat.com>
@@ -22,6 +23,7 @@
 Radim Kolar <hsn@sanatana.filez.com>
 Matthias Klose <doko@ubuntu.com>
 Francis Kung <fkung@redhat.com>
+Trustin Lee <http://t.motd.kr>
 DJ Lucas <dj@linuxfromscratch.org>
 Omair Majid <omajid@redhat.com>
 Casey Marshall <csm@gnu.org>

--- a/ChangeLog	Thu Jun 12 21:23:05 2014 +0100
+++ b/ChangeLog	Fri Jun 13 01:30:38 2014 +0100
@@ -1,3 +1,63 @@
+2014-06-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* AUTHORS:
+	Add authors of infinality patch. Websites are used
+	as present as couldn't find any e-mail addresses.
+	* INSTALL: Document --enable-infinality.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.5pre08 tag.
+	(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.
+	(DROP_URL): Added to point to drops on IcedTea server.
+	(CACAO_BASE_URL): Reference DROP_URL.
+	(JAMVM_BASE_URL): Likewise.
+	(ICEDTEA_MAJOR): Split out major release name ('IcedTea7')
+	(ICEDTEA_BRANCH): Split out branch version ('2.5')
+	(ICEDTEA_PREFIX): Use ICEDTEA_MAJOR and ICEDTEA_BRANCH.
+	(ICEDTEA_URL): Path to drops.
+	(OPENJDK_URL): Removed.
+	(CORBA_URL): Likewise.
+	(JAXP_URL): Likewise.
+	(JAXWS_URL): Likewise.
+	(JDK_URL): Likewise.
+	(LANGTOOLS_URL): Likewise.
+	(HS_TYPE): Added. Differentiate between a drop tarball
+	and a hg archive in hotspot.map.
+	(HS_URL): Bump field number by 1 following addition of type.
+	(HS_CHANGESET): Likewise.
+	(HS_SHA256SUM): Likewise.
+	(OPENJDK_SRC_ZIP): Change suffix to bz2.
+	(CORBA_SRC_ZIP): Likewise.
+	(JAXP_SRC_ZIP): Likewise.
+	(JAXWS_SRC_ZIP): Likewise.
+	(JDK_SRC_ZIP): Likewise.
+	(LANGTOOLS_SRC_ZIP): Likewise.
+	(HOTSPOT_SRC_ZIP): Likewise.
+	(ICEDTEA_ENV): Set INFINALITY_SUPPORT=true when
+	infinality is enabled.
+	(download-openjdk): Use ICEDTEA_URL for all drops.
+	(download-hotspot); Support HS_TYPE, appending
+	"archive/$(HS_CHANGESET)" to hg archive URLs and
+	"$(HOTSPOT_SRC_ZIP)" to drop URLs.
+	(ADD_ZERO_CONFIGURE_ARGS): Change suffix to bz2.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_INFINALITY): Macro for new option.
+	* configure.ac: Invoke IT_ENABLE_INFINALITY instead
+	of its dependency, IT_CHECK_FOR_FONTCONFIG. Bump to
+	pre08.
+	* hotspot.map: Update to icedtea-2.5pre08tag. Set
+	type of default to drop and aarch64 to hg.
+
 2014-06-11  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1741: Break PulseAudio provider out into IcedTea-Sound

--- a/INSTALL	Thu Jun 12 21:23:05 2014 +0100
+++ b/INSTALL	Fri Jun 13 01:30:38 2014 +0100
@@ -206,6 +206,7 @@
 * --enable-sunec: Build the SunEC crypto provider against system NSS.
 * --enable-native-debuginfo: Include debuginfo in native binaries.
 * --enable-java-debuginfo: Include debuginfo in Java class files.
+* --enable-infinality: Use fontconfig for better font rendering
 
 Testing
 =======

--- a/Makefile.am	Thu Jun 12 21:23:05 2014 +0100
+++ b/Makefile.am	Fri Jun 13 01:30:38 2014 +0100
@@ -4,45 +4,44 @@
 BUILD_VERSION = b30
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 03a1bf9a9e89
-JAXP_CHANGESET = f4ad8e860eaf
-JAXWS_CHANGESET = 9699fe5c5232
-JDK_CHANGESET = 5607f5a99784
-LANGTOOLS_CHANGESET = 454870780579
-OPENJDK_CHANGESET = d42df0b6ea9d
+CORBA_CHANGESET = 32c25f3ecdf6
+JAXP_CHANGESET = 6b28d9218dac
+JAXWS_CHANGESET = f1f1ade53c01
+JDK_CHANGESET = 9705894e1370
+LANGTOOLS_CHANGESET = f70c7b796422
+OPENJDK_CHANGESET = 6a4e58702235
 
-CORBA_SHA256SUM = 5f7f0c37aa0b370947bda59c6799db94e8da6aba1a82750b29907109e0326069
-JAXP_SHA256SUM = 9fe737e113ecc1424c6036fefaee4f34cd6df657a4a2ecc7b61bbab1b61e8d25
-JAXWS_SHA256SUM = cc2fc8f11e30b51cde58af756814ffa395d9b8119f9849c2681c3453f0e60d83
-JDK_SHA256SUM = 6e3070303649fe2dc98a8407f8ad9fad33208302e504dd623695e8ad0b12fae8
-LANGTOOLS_SHA256SUM = e5f761b19b250d71449cf247b265ba3cb6a0b1963621133a5712dbe30643f5d0
-OPENJDK_SHA256SUM = 9ffde89bb02d1da7ef5ca77ac100d4eefd4767cb93a87cda1deaefb6a5e1a750
+CORBA_SHA256SUM = 1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253
+JAXP_SHA256SUM = 59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488
+JAXWS_SHA256SUM = ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028
+JDK_SHA256SUM = 508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83
+LANGTOOLS_SHA256SUM = 0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659
+OPENJDK_SHA256SUM = 9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859
+
+DROP_URL = http://icedtea.classpath.org/download/drops
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
-CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
+CACAO_BASE_URL = $(DROP_URL)/cacao
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
 JAMVM_VERSION = ec18fb9e49e62dce16c5094ef1527eed619463aa
 JAMVM_SHA256SUM = 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc
-JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
+JAMVM_BASE_URL = $(DROP_URL)/jamvm
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
 
-ICEDTEA_PREFIX = icedtea7-forest-2.5
+ICEDTEA_MAJOR = icedtea7
+ICEDTEA_BRANCH = 2.5
+ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest-$(ICEDTEA_BRANCH)
 ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
+ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(ICEDTEA_BRANCH)
 
-OPENJDK_URL = $(ICEDTEA_HG_URL)
-CORBA_URL = $(ICEDTEA_HG_URL)/corba
-JAXP_URL = $(ICEDTEA_HG_URL)/jaxp
-JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws
-JDK_URL = $(ICEDTEA_HG_URL)/jdk
-LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
-
-HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-HS_URL = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
 
 # Build directories
 
@@ -147,13 +146,13 @@
   LANGTOOLS_SRC_ZIP =
   HOTSPOT_SRC_ZIP =
 else
-  OPENJDK_SRC_ZIP = openjdk.tar.gz
-  CORBA_SRC_ZIP = corba.tar.gz
-  JAXP_SRC_ZIP = jaxp.tar.gz
-  JAXWS_SRC_ZIP = jaxws.tar.gz
-  JDK_SRC_ZIP = jdk.tar.gz
-  LANGTOOLS_SRC_ZIP = langtools.tar.gz
-  HOTSPOT_SRC_ZIP = hotspot.tar.gz
+  OPENJDK_SRC_ZIP = openjdk.tar.bz2
+  CORBA_SRC_ZIP = corba.tar.bz2
+  JAXP_SRC_ZIP = jaxp.tar.bz2
+  JAXWS_SRC_ZIP = jaxws.tar.bz2
+  JDK_SRC_ZIP = jdk.tar.bz2
+  LANGTOOLS_SRC_ZIP = langtools.tar.bz2
+  HOTSPOT_SRC_ZIP = hotspot.tar.bz2
 endif
 
 if WITH_HGREV
@@ -576,6 +575,11 @@
 	DEBUG_CLASSFILES="true"
 endif
 
+if ENABLE_INFINALITY
+ICEDTEA_ENV += \
+       INFINALITY_SUPPORT="true"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
@@ -870,7 +874,7 @@
 	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
 	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(OPENJDK_URL)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \
+	    $(WGET) $(ICEDTEA_URL)/$(OPENJDK_SRC_ZIP); \
 	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of OpenJDK root zip"; false; \
@@ -889,7 +893,7 @@
 	    if [ $(CORBA_SRC_ZIP) ] ; then \
 	      mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \
+	    $(WGET) $(ICEDTEA_URL)/$(CORBA_SRC_ZIP); \
 	    if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of CORBA zip"; false; \
@@ -908,7 +912,7 @@
 	    if [ $(JAXP_SRC_ZIP) ] ; then \
 	      mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \
+	    $(WGET) $(ICEDTEA_URL)/$(JAXP_SRC_ZIP); \
 	    if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JAXP zip"; false; \
@@ -927,7 +931,7 @@
 	    if [ $(JAXWS_SRC_ZIP) ] ; then \
 	      mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \
+	    $(WGET) $(ICEDTEA_URL)/$(JAXWS_SRC_ZIP); \
 	    if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JAXWS zip"; false; \
@@ -946,7 +950,7 @@
 	    if [ $(JDK_SRC_ZIP) ] ; then \
 	      mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \
+	    $(WGET) $(ICEDTEA_URL)/$(JDK_SRC_ZIP); \
 	    if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JDK zip"; false; \
@@ -965,7 +969,7 @@
 	    if [ $(LANGTOOLS_SRC_ZIP) ] ; then \
 	      mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \
+	    $(WGET) $(ICEDTEA_URL)/$(LANGTOOLS_SRC_ZIP); \
 	    if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of langtools zip"; false; \
@@ -1080,7 +1084,11 @@
 	    if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \
 	      mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+	    if test "x$(HS_TYPE)" = "xhg"; then \
+	      $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+	    else \
+	      $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+            fi ; \
 	    if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of HotSpot zip"; false; \
@@ -2246,7 +2254,7 @@
 			'--disable-bootstrap% '--enable-bootstrap% , \
 		$(CONFIGURE_ARGS)) \
 	$(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \
-	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
+	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.bz2))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \

--- a/NEWS	Thu Jun 12 21:23:05 2014 +0100
+++ b/NEWS	Fri Jun 13 01:30:38 2014 +0100
@@ -284,6 +284,11 @@
   - PR1830: Drop version requirement for LCMS 2
   - PR1833, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
   - PR1741: Break PulseAudio provider out into IcedTea-Sound
+  - PR1736: AWT loads gtk3 in all the look and feel configurations
+  - PR1808: Type-punning Warnings in Demos on PPC
+  - PR1835: Missing file in backport of ppc64le JIT support
+  - PR1839, G478960: Provide Infinality Support via fontconfig
+  - PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops
 * PPC & AIX port
   - Add AIX-specific build instructions to README-ppc.html
   - Added AIX as testing platform for more jtreg tests written in shell-script

--- a/acinclude.m4	Thu Jun 12 21:23:05 2014 +0100
+++ b/acinclude.m4	Fri Jun 13 01:30:38 2014 +0100
@@ -2786,3 +2786,31 @@
   AC_MSG_RESULT([$enable_java_debuginfo])
   AM_CONDITIONAL([ENABLE_JAVA_DEBUGINFO], test x"${enable_java_debuginfo}" = "xyes")
 ])
+
+AC_DEFUN_ONCE([IT_ENABLE_INFINALITY],
+[
+  AC_REQUIRE([IT_CHECK_FOR_FONTCONFIG])
+  AC_MSG_CHECKING([whether to use fontconfig to provide better font rendering])
+  AC_ARG_ENABLE([infinality],
+                [AS_HELP_STRING(--enable-infinality,build with fontconfig font rendering [[default=yes]])],
+  [
+    case "${enableval}" in
+      yes)
+        enable_infinality=yes
+        ;;
+      *)
+        enable_infinality=no
+        ;;
+    esac
+  ],
+  [
+    enable_infinality=yes
+  ])
+  AC_MSG_RESULT([$enable_infinality])
+  AM_CONDITIONAL([ENABLE_INFINALITY], test x"${enable_infinality}" = "xyes")
+  if test "x${enable_infinality}" = "xyes"; then
+    if test "x${ENABLE_SYSTEM_FONTCONFIG}" != "xtrue"; then
+      AC_MSG_ERROR([Infinality support requires fontconfig. Either --enable-system-fontconfig or --disable-infinality])
+    fi
+  fi
+])

--- a/configure.ac	Thu Jun 12 21:23:05 2014 +0100
+++ b/configure.ac	Fri Jun 13 01:30:38 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5pre07], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.5pre08], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -207,7 +207,7 @@
 IT_CHECK_FOR_LCMS
 IT_CHECK_FOR_GTK
 IT_CHECK_FOR_GIO
-IT_CHECK_FOR_FONTCONFIG
+IT_ENABLE_INFINALITY
 IT_CHECK_FOR_CUPS
 IT_CHECK_FOR_SYSCALLS
 IT_CHECK_FOR_PCSC

--- a/hotspot.map	Thu Jun 12 21:23:05 2014 +0100
+++ b/hotspot.map	Fri Jun 13 01:30:38 2014 +0100
@@ -1,3 +1,3 @@
-# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot f106b1f551d7 4da4d84ee1b73e0cdf537e8f5b4ee351673eac14490da6de958098d827077adb
-aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
+# version type(drop/hg) url changeset sha256sum
+default drop http://icedtea.classpath.org/download/drops/icedtea7/2.5 5dc3dd2819c8 645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26
+aarch64 hg http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c