extra/java8-openjdk to 8.u60-1

archlinuxarm · Aug 23, 2015 · aba3ee1 · aba3ee1
1 parent 45c1894
commit aba3ee1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 107 deletions.
diff --git a/extra/java8-openjdk/JDK-8074312-hotspot.patch b/extra/java8-openjdk/JDK-8074312-hotspot.patch
diff --git a/.../java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch b/.../java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
@@ -17,9 +17,10 @@
 pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
 pkgbase=java8-openjdk
 _java_ver=8
-# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-_jdk_update=51
-_jdk_build=16
+# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+_jdk_update=60
+# Found @ http://hg.openjdk.java.net/jdk8u/jdk8u
+_jdk_build=24
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 pkgrel=1
@@ -38,22 +39,16 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/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
-        JDK-8074312-hotspot.patch
-        JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
-        zero-interpreter-fix.patch
         rhbz1206656_fix_current_stack_pointer.patch)
 
-sha256sums=('02eab2b937ed83c4505e93f58ad0b84a4e1a69e6d0baa4d041ec09ed98f18c2d'
-            '00d783dda3a7d87eb55a72febe7666c4b3297616ef3f11bbd679a05f19a81825'
-            'a7236d5e5824cea20b48ca4efb8e5109007024af9b85214e9153c4d633665d0a'
-            'f7554dc2fba5dfd36af0ed618ebe4c7b1527b5a067052299a1679a4142bbbeee'
-            'aa202ddf3bcc1dc54723bb26c0ae5ccaefc1693647e6b463955065d2b1720382'
-            '5d6faf6c726392212659cebd93fdbf89a11b86bab60f5b220493d9d8e7ff0686'
-            '3171ec4dbd96747eeb876a8fd3caf1e1e52da3dc91b63308193c914a5501d6e4'
-            'ffdd0446fce7b624f2cdc80297b99eecfdf30adfee39d3b8832a78c1dc202636'
-            '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50'
-            '8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05'
-            'ed2968406c6b05e7438a0ed7cb2b6041ddce369cbcedff11fd7563c8350e0e67'
+sha256sums=('97e368187b08067d57eb10bce08fb9057e63242c263f63ab7b7dd036cbf7aebf'
+            '76736786a1205367167b1abd10b6f173885f8ca8b2c3f56d5ff94b9e65a98865'
+            '9e7830631897679c97127387a1e962bfac46bafbe2b5a4be88e8bbf238e6c84c'
+            '999f0242213a4d048cee4e990d62024d277bcc8d49ab6fd807e32271fe078985'
+            '9643d8c22c4d6a680609168d84ac5a92421aa9973aea15cac687e4ccf167ff96'
+            'cb854984714541af5cba6e920958d0c68f2de52bff5acf723387fa03d63d8c3d'
+            '93a553f2e9dfc820e50bfd70f989c96cd330857849ddba23dc50246e99ab1329'
+            '518dd422df787547bbeedb57a524501548a6efd8f96443ebc59276cc7922e801'
             '85d396e1663514390e73b0b072a5f93c51ca6e324ee0a08aa2ace599e3df83bf')
 
 case "${CARCH}" in
@@ -80,13 +75,6 @@ prepare() {
   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
-
-  patch -p2 -i ../zero-interpreter-fix.patch
   patch -p2 -i ../rhbz1206656_fix_current_stack_pointer.patch
 }
 

diff --git a/extra/java8-openjdk/zero-interpreter-fix.patch b/extra/java8-openjdk/zero-interpreter-fix.patch