Merge changes from the original package

1 files changed, 24 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cd42d178105..f75e396324e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java8-openjdk
 	pkgver = 8.u51
-	pkgrel = 1
+	pkgrel = 2
 	url = http://openjdk.java.net/
 	arch = i686
 	arch = x86_64
@@ -15,28 +15,30 @@ pkgbase = java8-openjdk
 	makedepends = fontconfig
 	makedepends = libcups
 	makedepends = alsa-lib
-	source = jdk8u-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u51-b14.tar.gz
-	source = corba-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u51-b14.tar.gz
-	source = hotspot-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u51-b14.tar.gz
-	source = jdk-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u51-b14.tar.gz
-	source = jaxws-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u51-b14.tar.gz
-	source = jaxp-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u51-b14.tar.gz
-	source = langtools-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u51-b14.tar.gz
-	source = nashorn-jdk8u51-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u51-b14.tar.gz
+	source = jdk8u-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u51-b16.tar.gz
+	source = corba-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u51-b16.tar.gz
+	source = hotspot-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u51-b16.tar.gz
+	source = jdk-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u51-b16.tar.gz
+	source = jaxws-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u51-b16.tar.gz
+	source = jaxp-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u51-b16.tar.gz
+	source = langtools-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u51-b16.tar.gz
+	source = nashorn-jdk8u51-b16.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u51-b16.tar.gz
 	source = 004_add-fontconfig.patch
 	source = 005_enable-infinality.patch
-	source = 006_allow-linux-4.patch
-	sha256sums = d0aa9ce02ec3db609e13171f497292542756c08a55960991bdb087c0cd4b199b
-	sha256sums = a751bea9bb51425ce952c3bed5df1f57cd746789376ebeec28c6ba78b7d6e3be
-	sha256sums = 5fe038a9a0a7248a693ff441cf56082dc7d18af26a509d2c63604e00d1ed4dc3
-	sha256sums = efa924c3bea56bd52cb716b60cfc603520d4b667f9a86f3021619a02e8a7de05
-	sha256sums = fb0a9f5cb25c33e5b278d232105b24824e90371c444bf76d67e51ba865f79cb0
-	sha256sums = ff7d23f4393c4d711aff46fb369d65ad7c788b29a7fb0ee4bb71a2c731e4b144
-	sha256sums = 225c21a101ae81f2228902f0f9b76879ef5f14cc7191fd593e8eb6865245abdc
-	sha256sums = c19ff4f7da1eeca43f8e25cf75c0a5c30e011fd7996d8dce1052f95c88bed689
+	source = JDK-8074312-hotspot.patch
+	source = JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
+	sha256sums = 02eab2b937ed83c4505e93f58ad0b84a4e1a69e6d0baa4d041ec09ed98f18c2d
+	sha256sums = 00d783dda3a7d87eb55a72febe7666c4b3297616ef3f11bbd679a05f19a81825
+	sha256sums = a7236d5e5824cea20b48ca4efb8e5109007024af9b85214e9153c4d633665d0a
+	sha256sums = f7554dc2fba5dfd36af0ed618ebe4c7b1527b5a067052299a1679a4142bbbeee
+	sha256sums = aa202ddf3bcc1dc54723bb26c0ae5ccaefc1693647e6b463955065d2b1720382
+	sha256sums = 5d6faf6c726392212659cebd93fdbf89a11b86bab60f5b220493d9d8e7ff0686
+	sha256sums = 3171ec4dbd96747eeb876a8fd3caf1e1e52da3dc91b63308193c914a5501d6e4
+	sha256sums = ffdd0446fce7b624f2cdc80297b99eecfdf30adfee39d3b8832a78c1dc202636
 	sha256sums = 7eccdeda71d651423a066c942b3d300eccd8d95e161725fa508d84f0bc010ceb
 	sha256sums = efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac
-	sha256sums = 769cd85c0fe71345224eb5a61faff7441070e612a3ccfbb8e92d4dd827d21b04
+	sha256sums = 95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50
+	sha256sums = 8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05
 
 pkgname = jre8-openjdk-headless-infinality
 	pkgdesc = OpenJDK Java 8 headless runtime environment with infinality patch applied
@@ -54,12 +56,13 @@ pkgname = jre8-openjdk-headless-infinality
 pkgname = jre8-openjdk-infinality
 	pkgdesc = OpenJDK Java 8 full runtime environment with infinality patch applied
 	install = install_jre8-openjdk.sh
-	depends = jre8-openjdk-headless-infinality=8.u51-1
+	depends = jre8-openjdk-headless-infinality=8.u51-2
 	depends = xdg-utils
 	depends = hicolor-icon-theme
 	optdepends = icedtea-web: web browser plugin + Java Web Start
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ look and feel - desktop usage
+	optdepends = java-openjfx: for JavaFX GUI components support
 	provides = java-runtime=8
 	provides = java-runtime-openjdk=8
 	conflicts = jre8-openjdk
@@ -69,7 +72,7 @@ pkgname = jdk8-openjdk-infinality
 	pkgdesc = OpenJDK Java 8 development kit with infinality patch applied
 	install = install_jdk8-openjdk.sh
 	depends = java-environment-common
-	depends = jre8-openjdk-infinality=8.u51-1
+	depends = jre8-openjdk-infinality=8.u51-2
 	provides = java-environment=8
 	provides = java-environment-openjdk=8
 	conflicts = jdk8-openjdk