Thu Feb 16 23:15:21 UTC 2012

2 files changed, 54 insertions, 33 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index e5fcec80a..e19cf6b53 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148792 2012-02-05 11:50:44Z ibiru $
+# $Id: PKGBUILD 150234 2012-02-15 16:00:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Guillaume ALAUX <guillaume@archlinux.org>
@@ -9,33 +9,33 @@ pkgbase=java7-openjdk
 _java_ver=7
 _openjdk_build=b147
 _openjdk_date=27_jun_2011
-_icedtea_ver=2.0
+_icedtea_ver=2.1
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=4d9e4fb8af09
-_HOTSPOT_CHANGESET=b28ae681bae0
-_JAXP_CHANGESET=948e734135ea
-_JAXWS_CHANGESET=a2ebfdc9db7e
-_JDK_CHANGESET=2054526dd141
-_LANGTOOLS_CHANGESET=9b85f1265346
-_OPENJDK_CHANGESET=0a76e5390e68
+_CORBA_CHANGESET=5617f6c5cc94
+_HOTSPOT_CHANGESET=0e651e004747
+_JAXP_CHANGESET=1cf75c0e2c96
+_JAXWS_CHANGESET=7edfbfe974f2
+_JDK_CHANGESET=50f6f276a06c
+_LANGTOOLS_CHANGESET=b534c4c6cd9b
+_OPENJDK_CHANGESET=22cc03983e20
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=6
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
 makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
+             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
+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
         ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
@@ -50,25 +50,24 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
-        jre7-openjdk.profile.csh
-        glibc2_15.diff)
-md5sums=('752721a037a625001fad7a5fc2013f60'
-         '4c34ddf70124ea90c79201c1afede3e3'
-         '8f8d222d0a6d363d06b40576da5f1ea2'
-         '4abf34372e34cccd74ad337e487ed790'
-         'f2f40590a83889b8aa1d4631b705092d'
-         'd3beed0118bbd93d4651af762eb748c7'
-         'c8617700b4bd6cd5de1257bc36509bed'
-         'f10b711b0c784df8707808d9d0f52abd'
-         'ee1afda124d5927345014ab382ef581e'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'c195c4865b84d9e2e0fd71ac6d88eadb'
-         '203640d6e79e41b0065e016818c17ccd'
-         'b7b8996448c7b4fa7dd2d744488ed3bd'
-         'cdabafad0ec413d9a983888bf445a443'
-         '612b0fec7e0943c37a6de77c43622007'
-         '62443459da0cb28181feb260dc0e5ce7'
-         'a4293acadff03bdccbc9b412ad288549')
+        jre7-openjdk.profile.csh)
+sha256sums=('8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6'
+            '8d127e8397a0af3ffd8d1d96102a053d065d5507946f5c7118c0427668ac4227'
+            'ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7'
+            '963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3'
+            '8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e'
+            '823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa'
+            '5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d'
+            'c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c'
+            'd68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1'
+            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
+            '6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5'
+            '9b3aa677773356d8b67300f99ad21118426e83f092392096726fcf123173008c'
+            '14cf334b7e79e0086b446ba1b172b7cc4ad09668f52c9b12077020a3ded3c3e7'
+            '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
+            '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
+            'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
+            '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9')
 
 #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
 
@@ -100,7 +99,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/glibc2_15.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"
diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
index c68bd4441..ee434246a 100644
--- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
@@ -22,3 +22,25 @@
  TRUE           = $(UTILS_COMMAND_PATH)true
  UNAME          = $(UTILS_COMMAND_PATH)uname
  UNIQ           = $(UTILS_USR_BIN_PATH)uniq
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-02-15 14:16:25.000000000 +0100
++++ openjdk/jdk/make/common/shared//Defs-utils.gmk.new	2012-02-15 15:06:26.400107173 +0100
+@@ -107,7 +107,7 @@
+ FIND           = $(UTILS_USR_BIN_PATH)find
+ FMT            = $(UTILS_COMMAND_PATH)fmt
+ GDB            = $(UTILS_USR_BIN_PATH)gdb
+-GREP           = $(UTILS_COMMAND_PATH)grep
++GREP           = $(UTILS_USR_BIN_PATH)grep
+ GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
+ # GZIP is used for solaris. Linux and windows use tar czf
+ GZIP           = $(UTILS_COMMAND_PATH)gzip
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-02-15 15:11:27.000000000 +0100
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk.new	2012-02-15 15:14:09.504446263 +0100
+@@ -101,7 +101,7 @@
+ DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
+ DUMP           = $(UTILS_CCS_BIN_PATH)dump
+ ECHO           = $(UTILS_COMMAND_PATH)echo
+-EGREP          = $(UTILS_COMMAND_PATH)egrep
++EGREP          = $(UTILS_USR_BIN_PATH)egrep
+ EXPR           = $(UTILS_USR_BIN_PATH)expr
+ FILE           = $(UTILS_USR_BIN_PATH)file
+ FIND           = $(UTILS_USR_BIN_PATH)find