From b6bf0cbfb2d9a468f9bc31189fcfaea8ffa4c0e3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 15 Mar 2015 17:28:07 -0300
Subject: java8-openjdk-8.u40-1.parabola1: updating version

* fix FS#43896 -> https://bugs.archlinux.org/task/43896
---
 libre/java8-openjdk/PKGBUILD | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

(limited to 'libre/java8-openjdk/PKGBUILD')

diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD
index bb9a8c147..ddd8732c7 100644
--- a/libre/java8-openjdk/PKGBUILD
+++ b/libre/java8-openjdk/PKGBUILD
@@ -10,8 +10,8 @@
 pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk')
 pkgbase=java8-openjdk
 _java_ver=8
-_jdk_update=31
-_jdk_build=13
+_jdk_update=40
+_jdk_build=20
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 pkgrel=1.parabola1
@@ -28,20 +28,16 @@ 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
-        001_adjust-mflags-for-gmake-4.patch
-        003_nonreparenting-wm.patch)
-
-sha256sums=('824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34'
-            '47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347'
-            '485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3'
-            'b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a'
-            '04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf'
-            '74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2'
-            '3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4'
-            '2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3'
-            '682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9'
-            '7d3d7ce8661d0f33ff9ad8247f8cfef528c4dff74615e64fa0ac87f4beb78db4')
+        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
+
+sha256sums=('1fc7ca0e760af9bab0620049d2e21cde557961101949e54ea74736872295bdde'
+            '1363462eff9fa2550c803e823695a3f4086380b106dfcff78c456f10c42beb3e'
+            'd61a7a2d4d211e068e469ce0894030a2daf9788d66f3994232d5b82c16c9360d'
+            '2c4fab3a8589f3ac9ea531c7e70d4c0a8e15d995345a90bc5b3b8d8291af3f33'
+            '6de0d99d6685761c064814855d1e3401e48aadb830a7c68d03b13f0a41e0e950'
+            'ad83699c97dec550c532eaf98a8bc049c8fbf80d7211057e76a3c86e5fcc3c0f'
+            '2fb4444e00ef3d4fe2b9f8f5c4a8618e1fb0f58704c6c07246bafd43f39b41d1'
+            '39113708d318c070326b5d4543f1bd499bf7e77012f08b67ba0d0313730935ff')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -64,14 +60,6 @@ prepare() {
   do
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
-
-  cd "${srcdir}/jdk8u-${_repo_ver}/hotspot"
-  # https://bugs.openjdk.java.net/browse/JDK-8028407
-  patch -p1 < "${srcdir}/001_adjust-mflags-for-gmake-4.patch"
-
-  cd "${srcdir}/jdk8u-${_repo_ver}/jdk"
-  # https://bugs.archlinux.org/task/41846
-  patch -p0 < "${srcdir}/003_nonreparenting-wm.patch"
 }
 
 build() {
-- 
cgit v1.2.3