summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrejs Mivre┼ćiks2015-08-18 20:41:35 +0300
committerAndrejs Mivre┼ćiks2015-08-18 20:41:35 +0300
commit0c4e2b7d374540c5cc0624e2b41af49bbf51a48b (patch)
treeef40cc0dc5f5e40ec23e37700b385e3869f3811f
parentb45000f2569d87d2add80c1917d9b98fa7adb729 (diff)
downloadaur-0c4e2b7d374540c5cc0624e2b41af49bbf51a48b.tar.gz
Merge changes from the original package
-rw-r--r--.SRCINFO45
-rw-r--r--JDK-8074312-hotspot.patch (renamed from 006_allow-linux-4.patch)7
-rw-r--r--JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch46
-rw-r--r--PKGBUILD40
4 files changed, 98 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5cd42d17810..f75e396324e 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
diff --git a/006_allow-linux-4.patch b/JDK-8074312-hotspot.patch
index dd946db4694..a4e3f607f25 100644
--- a/006_allow-linux-4.patch
+++ b/JDK-8074312-hotspot.patch
@@ -1,6 +1,7 @@
---- a/make/linux/Makefile 2015-04-25 16:11:11.030365435 +0200
-+++ b/make/linux/Makefile 2015-04-25 16:11:36.447912960 +0200
-@@ -229,7 +229,7 @@ checks: check_os_version check_j2se_vers
+diff -r 61edd5c7412e make/linux/Makefile
+--- a/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000
++++ b/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100
+@@ -233,7 +233,7 @@
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
diff --git a/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch b/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
new file mode 100644
index 00000000000..f6bd4ae9855
--- /dev/null
+++ b/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
@@ -0,0 +1,46 @@
+
+# HG changeset patch
+# User sgehwolf
+# Date 1430335428 25200
+# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
+# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565
+8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
+Summary: do the math on the unsigned type where overflows are well defined
+Reviewed-by: kvn, aph
+
+diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp
+--- a/src/share/vm/opto/type.cpp Wed Jun 10 20:15:29 2015 -0400
++++ b/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700
+@@ -1180,11 +1180,11 @@
+ // Certain normalizations keep us sane when comparing types.
+ // The 'SMALLINT' covers constants and also CC and its relatives.
+ if (lo <= hi) {
+- if ((juint)(hi - lo) <= SMALLINT) w = Type::WidenMin;
+- if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
++ if (((juint)hi - lo) <= SMALLINT) w = Type::WidenMin;
++ if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
+ } else {
+- if ((juint)(lo - hi) <= SMALLINT) w = Type::WidenMin;
+- if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
++ if (((juint)lo - hi) <= SMALLINT) w = Type::WidenMin;
++ if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
+ }
+ return w;
+ }
+@@ -1438,11 +1438,11 @@
+ // Certain normalizations keep us sane when comparing types.
+ // The 'SMALLINT' covers constants.
+ if (lo <= hi) {
+- if ((julong)(hi - lo) <= SMALLINT) w = Type::WidenMin;
+- if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
++ if (((julong)hi - lo) <= SMALLINT) w = Type::WidenMin;
++ if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
+ } else {
+- if ((julong)(lo - hi) <= SMALLINT) w = Type::WidenMin;
+- if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
++ if (((julong)lo - hi) <= SMALLINT) w = Type::WidenMin;
++ if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
+ }
+ return w;
+ }
+
diff --git a/PKGBUILD b/PKGBUILD
index a9206f21efa..e4aae4bb405 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
# Contributor: Christoph Bayer <chrbayer@criby.de>
# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Boyan Ding <stu_dby@126.com>
# TODO
# once icedtea:
@@ -9,11 +10,12 @@
pkgname=('jre8-openjdk-headless-infinality' 'jre8-openjdk-infinality' 'jdk8-openjdk-infinality')
pkgbase=java8-openjdk
_java_ver=8
+# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
_jdk_update=51
-_jdk_build=14
+_jdk_build=16
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://openjdk.java.net/'
license=('custom')
@@ -30,19 +32,21 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
004_add-fontconfig.patch
005_enable-infinality.patch
- 006_allow-linux-4.patch)
-
-sha256sums=('d0aa9ce02ec3db609e13171f497292542756c08a55960991bdb087c0cd4b199b'
- 'a751bea9bb51425ce952c3bed5df1f57cd746789376ebeec28c6ba78b7d6e3be'
- '5fe038a9a0a7248a693ff441cf56082dc7d18af26a509d2c63604e00d1ed4dc3'
- 'efa924c3bea56bd52cb716b60cfc603520d4b667f9a86f3021619a02e8a7de05'
- 'fb0a9f5cb25c33e5b278d232105b24824e90371c444bf76d67e51ba865f79cb0'
- 'ff7d23f4393c4d711aff46fb369d65ad7c788b29a7fb0ee4bb71a2c731e4b144'
- '225c21a101ae81f2228902f0f9b76879ef5f14cc7191fd593e8eb6865245abdc'
- 'c19ff4f7da1eeca43f8e25cf75c0a5c30e011fd7996d8dce1052f95c88bed689'
+ JDK-8074312-hotspot.patch
+ JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch)
+
+sha256sums=('02eab2b937ed83c4505e93f58ad0b84a4e1a69e6d0baa4d041ec09ed98f18c2d'
+ '00d783dda3a7d87eb55a72febe7666c4b3297616ef3f11bbd679a05f19a81825'
+ 'a7236d5e5824cea20b48ca4efb8e5109007024af9b85214e9153c4d633665d0a'
+ 'f7554dc2fba5dfd36af0ed618ebe4c7b1527b5a067052299a1679a4142bbbeee'
+ 'aa202ddf3bcc1dc54723bb26c0ae5ccaefc1693647e6b463955065d2b1720382'
+ '5d6faf6c726392212659cebd93fdbf89a11b86bab60f5b220493d9d8e7ff0686'
+ '3171ec4dbd96747eeb876a8fd3caf1e1e52da3dc91b63308193c914a5501d6e4'
+ 'ffdd0446fce7b624f2cdc80297b99eecfdf30adfee39d3b8832a78c1dc202636'
'7eccdeda71d651423a066c942b3d300eccd8d95e161725fa508d84f0bc010ceb'
'efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac'
- '769cd85c0fe71345224eb5a61faff7441070e612a3ccfbb8e92d4dd827d21b04')
+ '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50'
+ '8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05')
case "${CARCH}" in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -72,8 +76,11 @@ prepare() {
patch -p1 < "${srcdir}/005_enable-infinality.patch"
cd "${srcdir}/hotspot-${_repo_ver}"
- # Apply linux version patch
- patch -p1 < "${srcdir}/006_allow-linux-4.patch"
+ # https://bugs.openjdk.java.net/browse/JDK-8074312
+ patch -p1 < "${srcdir}"/JDK-8074312-hotspot.patch
+ # https://bugs.archlinux.org/task/45386
+ # https://bugs.openjdk.java.net/browse/JDK-8078666
+ patch -p1 < "${srcdir}"/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
}
build() {
@@ -202,7 +209,8 @@ package_jre8-openjdk-infinality() {
depends=("jre8-openjdk-headless-infinality=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
optdepends=('icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
- 'gtk2: for the Gtk+ look and feel - desktop usage')
+ 'gtk2: for the Gtk+ look and feel - desktop usage'
+ 'java-openjfx: for JavaFX GUI components support')
# TODO when adding IcedTea: 'giflib: for gif format support'
# TODO when adding IcedTea: 'libpulse: for advanced sound support'
provides=('java-runtime=8' 'java-runtime-openjdk=8')