[arch-commits] Commit in openjdk6/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Thursday, February 5, 2009 @ 14:40:57
  Author: andyrtr
Revision: 26308

Merged revisions 26306 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openjdk6/trunk

........
  r26306 | andyrtr | 2009-02-05 19:40:15 +0000 (Do, 05 Feb 2009) | 2 lines
  
  upgpkg: openjdk6 1.4-1
      new version 1.4; prepare new hotspot build in future versions
........

Modified:
  openjdk6/repos/extra-x86_64/	(properties)
  openjdk6/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)


Property changes on: openjdk6/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-18432
   + /openjdk6/trunk:1-26307

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-05 19:40:16 UTC (rev 26307)
+++ extra-x86_64/PKGBUILD	2009-02-05 19:40:57 UTC (rev 26308)
@@ -2,16 +2,16 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=openjdk6
-pkgver=1.3.1
-#_date=20080915
-_icedteaver=1.3.1
-pkgrel=2
+pkgver=1.4
+_icedteaver=1.4
+pkgrel=1
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
-_openjdk_version=b12
-_openjdk_date=28_aug_2008
+_openjdk_version=b14
+_openjdk_date=25_nov_2008
+_hotspotver=
 depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme')
 makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino')
 conflicts=('jdk' 'j2sdk' 'java-environment' 'j2re' 'java-runtime' 'jre')
@@ -19,8 +19,8 @@
 options=(!emptydirs)
 install=openjdk6.install
 source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
 	http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+	http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/hotspot.tar.gz
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
 	gcjwebplugin_xulrunner.diff
@@ -28,8 +28,9 @@
 	fontconfig-paths.diff
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('b53e1ef643909ce82721ee4c970d958b'
-         '6865c25cbc087e4142031a846b71ae56'
+md5sums=('9f9773a822156dd3d576d83d794364ce'
+         '6428ca1b0c38111cca230f5b69460b03'
+         '17bf7324fe660e71c22d0ea2652579ec'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ed2e808df2d2fc2ea7dae5139d475192'
@@ -92,7 +93,7 @@
   # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
-	$JCONF #	--without-rhino \ice
+	--with-hotspot-build=original $JCONF # 	--with-hotspot-src-zip=hotspot.tar.gz 
   LD_PRELOAD="" make || return 1
   
   install -m755 -d ${pkgdir}/${_jvmdir}/jre