From 952057a8f05a4bb05234c23f885796eeb61c5935 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 18 Oct 2018 00:44:07 +0000 Subject: [PATCH] extra/java8-openjdk to 8.u192-1 --- extra/java8-openjdk/8143245-pr3548.patch | 10 +--------- extra/java8-openjdk/PKGBUILD | 25 ++++++++++++------------ 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/extra/java8-openjdk/8143245-pr3548.patch b/extra/java8-openjdk/8143245-pr3548.patch index eccb1107b..3aa38987a 100644 --- a/extra/java8-openjdk/8143245-pr3548.patch +++ b/extra/java8-openjdk/8143245-pr3548.patch @@ -65,7 +65,7 @@ diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openj +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2016 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,14 +126,6 @@ diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openj } void os::Linux::set_fpu_control_word(int fpu) { -@@ -408,6 +418,7 @@ - - extern "C" { - int SpinPause() { -+ return -1; // silence compile warnings - } - - diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD index fd66bbb81..034348147 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -20,12 +20,11 @@ buildarch=22 pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src') pkgbase=java8-openjdk _java_ver=8 -# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html -_jdk_update=181 -_jdk_build=13 +_jdk_update=192 +_jdk_build=26 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgrel=1.1 +pkgrel=1 arch=('x86_64') url='http://openjdk.java.net/' license=('custom') @@ -45,16 +44,16 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz 8143245-pr3548.patch 8197981-pr3548.patch) -sha256sums=('2a613bc3eb3ecdb12946447e44e6c80ce80d1a7c5cbdf8127585b452f6708b66' - '3fc4793e39d2e8e9aa19707f43d61a81bef2c9de22ff47c99105e1b4a51b19ac' - '04b173f2af287c1b80aeb20b2e31563905e1e772cf5e01a25f3a985e392c7d5f' - 'c4da8f58c97c0a4d37907b099385961029482aa268331e19903c1d4738a9afa8' - 'f51a6827fd50bf29d4abb69e3a73ab13735dec45157f750b7cbfe375ebd022b9' - '2d0475ae6a925fef1f21f3fd96436ed5d11d3cb9dca5a96f96defb3040c68d3b' - '4ef19aaf1444d1d23c0f76fc6d8f55092c0b8b8e953b7c136448f6660b7165ea' - 'f2220793aa8fea31c8945566b639ea85e2d00ac68220827ba8861ca32e4aae48' +sha256sums=('4d3c656cf27bfd9dd9007ccdee7a36ed1002f3f9ecd8a4b10a2030fab4d3a5c3' + 'a3e63d3a5fb839a7efa4006068d06265ab6033251b4796a4963c31638040efd5' + '702f0e4a391ae1a7e2e0a7c26bff0c1186c4d90ffe87aba3a6e0c6e8e813bf60' + '6e7b59a098b4b4bdf3ea4c985d1c90e984f5f8313c402fdc0c02120a135107e9' + '9846bcac7b21aea41940702c12e4347eeabc440b02fa35ced0b5b1ce7a645415' + '1466776a9e11a7bdc5c4fca327d3551873885c196a6689a5febd6259a8c56ee4' + '98cc9e7cf4dfd12ae1c3377e700e9e29b52ce7d9a3e44be3944f15a43fb5066f' + '61ca69a5267bbd02d0cb979b022bfb34bde1fb1c45b93ae53944914bcb88fc53' 'f3def2ef78d96f136d9d0a103c84028789ae9e0de961a11240091b6ae60d8212' - '00ba7fa8d9b8b952c41240fd015df161c82fdfffb25280d0dea66a9cb39dcf5d' + '84db3cb182a998ba184c90f56636e5398b839b3dc7128eaeba966d78c0b6fc56' 'c0bb1ae19f08c221156df15d7d8c5a4168c55179a186f3054dd4ac0591ec8501') case "${CARCH}" in