summaryrefslogtreecommitdiff
path: root/libre/java8-openjdk
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-07-20 16:12:58 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-07-20 18:43:46 -0300
commit26fb14e2770fee0772e9e6bd149ad5863f3dcd28 (patch)
tree407ffc9c6b72805b6d08b6aba5127f8b99d8da9b /libre/java8-openjdk
parent1fa05cf9b89755eb3390b398ba47f074d7765614 (diff)
downloadabslibre-26fb14e2770fee0772e9e6bd149ad5863f3dcd28.tar.gz
abslibre-26fb14e2770fee0772e9e6bd149ad5863f3dcd28.tar.bz2
abslibre-26fb14e2770fee0772e9e6bd149ad5863f3dcd28.zip
java8-openjdk-8.u51-1.parabola1: updating version
Diffstat (limited to 'libre/java8-openjdk')
-rw-r--r--libre/java8-openjdk/JDK-8074312-hotspot.patch12
-rw-r--r--libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch46
-rw-r--r--libre/java8-openjdk/PKGBUILD40
3 files changed, 85 insertions, 13 deletions
diff --git a/libre/java8-openjdk/JDK-8074312-hotspot.patch b/libre/java8-openjdk/JDK-8074312-hotspot.patch
new file mode 100644
index 000000000..a4e3f607f
--- /dev/null
+++ b/libre/java8-openjdk/JDK-8074312-hotspot.patch
@@ -0,0 +1,12 @@
+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.
+
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+
diff --git a/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch b/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
new file mode 100644
index 000000000..f6bd4ae98
--- /dev/null
+++ b/libre/java8-openjdk/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/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD
index c906d16d9..4e5834fb4 100644
--- a/libre/java8-openjdk/PKGBUILD
+++ b/libre/java8-openjdk/PKGBUILD
@@ -7,11 +7,13 @@
# pulse
# add policytool desktop files
+# Package 'openjfx' must be updated when this one is
pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk')
pkgbase=java8-openjdk
_java_ver=8
-_jdk_update=45
-_jdk_build=14
+# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+_jdk_update=51
+_jdk_build=16
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
pkgrel=1.parabola1
@@ -28,16 +30,20 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
- nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
-
-sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
- '6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
- '1dc7c5038f57f77a1e92cf1b48a188a0291805e69f570e1164efb7adb34c5a59'
- '2b125825962a2ff110afadb37784faf276e7146023c4a6cede6a3f923f48c692'
- 'e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb'
- 'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
- 'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
- 'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9')
+ nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+ 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'
+ '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50'
+ '8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05')
case "${CARCH}" in
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -60,6 +66,13 @@ prepare() {
do
ln -s ../${subrepo}-${_repo_ver} ${subrepo}
done
+
+ cd "${srcdir}/hotspot-${_repo_ver}"
+ # 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() {
@@ -186,7 +199,8 @@ package_jre8-openjdk() {
depends=("jre8-openjdk-headless=${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')