Tue Sep 4 00:04:04 UTC 2012

1 files changed, 24 insertions, 26 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 9148b09f6..4ec38ec74 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $
+# $Id: PKGBUILD 165850 2012-09-01 14:16:05Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') 
  # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u5
-_openjdk_build=b21
+_updatever=u7
+_openjdk_build=b147
 _openjdk_date=27_jun_2011
-_icedtea_ver=2.2.1
+_icedtea_ver=2.3.2
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=38deb372c569
-_HOTSPOT_CHANGESET=889dffcf4a54
-_JAXP_CHANGESET=335fb0b059b7
-_JAXWS_CHANGESET=5471e01ef43b
-_JDK_CHANGESET=6c3b742b735d
-_LANGTOOLS_CHANGESET=beea46c7086b
-_OPENJDK_CHANGESET=0b776ef59474
+_CORBA_CHANGESET=7fae6a3a68c7
+_HOTSPOT_CHANGESET=ea39d76b3bde
+_JAXP_CHANGESET=ee4bd94136ec
+_JAXWS_CHANGESET=c89c6ac953e7
+_JDK_CHANGESET=f78eb7e08ee1
+_LANGTOOLS_CHANGESET=867d5041bee6
+_OPENJDK_CHANGESET=acba2d30209d
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -30,14 +30,14 @@ arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'wget'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
 #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig}
         ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
         ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
@@ -50,25 +50,23 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         fix_corba_cmds_path.diff
         openjdk7_fix_jdk_cmds_path.diff
         openjdk7_nonreparenting-wm.diff
-        disable_Werror.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6'
-            '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215'
-            '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe'
-            'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93'
-            'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd'
-            '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d'
-            '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e'
-            '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb'
-            'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41'
+sha256sums=('d7e87de527934fcbb06c162e0e119d9b118069f3f52a1420d303fe19c5d74ef2'
+            '5d3abf9bd3f628571ca148b55226b2af3c0cce835d51d7215bbe459d0a871513'
+            'ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528'
+            '8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f'
+            '26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5'
+            'a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8'
+            '74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224'
+            'ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707'
+            '25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
-            'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
             '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
             'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
@@ -103,7 +101,7 @@ build() {
   . /etc/profile.d/apache-ant.sh
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff"
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"