From fc2bad08b5c1aa03ccf75523c78b6fa1afa1d476 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 10 Jun 2013 21:24:53 +0000
Subject: [PATCH] extra/java7-openjdk to 7.u40_2.4.0-1

---
 extra/java7-openjdk/PKGBUILD | 45 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index b291ad74a..e09e77b11 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -14,24 +14,23 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
          'openjdk7-src')
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u21
-_icedtea_ver=2.3.9
+_updatever=u40
+_icedtea_ver=2.4.0
 
-# check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=47a6bf94ce11
-_JAXP_CHANGESET=d2142901bcb7
-_JAXWS_CHANGESET=b1877762d45c
-_JDK_CHANGESET=8e91101e36f0
-_LANGTOOLS_CHANGESET=fd956199cb82
-_OPENJDK_CHANGESET=12b96a57263c
+# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
+_CORBA_CHANGESET=71d5ec2f3dfb
+_JAXP_CHANGESET=5eaf3bca7f68
+_JAXWS_CHANGESET=9d2007a13c02
+_JDK_CHANGESET=29ce11184945
+_LANGTOOLS_CHANGESET=ffb1b6bc4750
+_OPENJDK_CHANGESET=9c74cb4a3ae8
 
-#_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map
-_HOTSPOT_CHANGESET=2c4981784101
+_HOTSPOT_CHANGESET=c67fd7874b1a # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -41,8 +40,8 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget')
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
-_zurl=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3}
+#_zurl=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
         ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
         ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
@@ -50,7 +49,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz					# jaxws.tar.gz
         ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
         ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
-        ${_zurl}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
+        ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
         fontconfig-paths.diff
         01_fix_openjdk_cmds_path.diff
         02_fix_corba_cmds_path.diff
@@ -59,14 +58,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da'
-            '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc'
-            '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934'
-            '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6'
-            'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc'
-            '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e'
-            '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12'
-            '977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b'
+sha256sums=('be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a'
+            '4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579'
+            '0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c'
+            '25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd'
+            '4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456'
+            '13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352'
+            '80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3'
+            '34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9'
             'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3'