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

[andyrtr at archlinux.org]

    Date: Friday, March 6, 2009 @ 15:55:45
  Author: andyrtr
Revision: 29222

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

........
  r29214 | andyrtr | 2009-03-06 20:23:10 +0000 (Fr, 06 M?\195?\164r 2009) | 2 lines
  
  upgpkg: openjdk6 1.5-0.1
      move forward to a recent mercurial checkout (browser plugin was broken with 1.4.1 release; fixes #13626; probably also #13667
........

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

----------+
 PKGBUILD |   36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)


Property changes on: openjdk6/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-27822
   + /openjdk6/trunk:1-29221

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-06 20:54:06 UTC (rev 29221)
+++ extra-i686/PKGBUILD	2009-03-06 20:55:45 UTC (rev 29222)
@@ -3,24 +3,26 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=openjdk6
-pkgver=1.4.1
-_icedteaver=1.4.1
-pkgrel=1
+pkgver=1.5
+_icedteaver=1.5pre
+pkgrel=0.1
+_date=20090305
 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=b14
 _openjdk_date=25_nov_2008
-_hotspotver=f9d938ede196 # what it downlopads itself / remove from configure to get it
+_hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it
 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')
+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' 'mercurial')
 conflicts=('java-environment' 'java-runtime')
 provides=('java-environment=6' 'java-runtime=6')
 options=(!emptydirs)
 install=openjdk6.install
 source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+	#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+	ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
 	http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
@@ -30,8 +32,8 @@
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
 md5sums=('9f9773a822156dd3d576d83d794364ce'
-         '5632f278539a2aa71e1581040744843a'
-         'c8f78d48ac83987bc2adebeebcd354e9'
+         'd57bf545dc50d41588b43112393dac26'
+         '1c3510387dccdb4907d0fd2f1c58e372'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ed2e808df2d2fc2ea7dae5139d475192'
@@ -44,7 +46,7 @@
 #  mkdir ${srcdir}/icedtea6-${_date}
 #  cd ${srcdir}/icedtea6-${_date}
 #  hg clone http://icedtea.classpath.org/hg/icedtea6 || return 1
-#  tar -cvjf ../icedtea6-${_date}.tar.bz2 *
+#  tar -cvjf ../../icedtea6-${_date}.tar.bz2 *
 #  return 1
 
   unset JAVA_HOME
@@ -57,20 +59,20 @@
   _javaver=1.6.0
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-  #cd ${srcdir}/icedtea6
-  cd ${srcdir}/icedtea6-${_icedteaver}
+  cd ${srcdir}/icedtea6
+#  cd ${srcdir}/icedtea6-${_icedteaver}
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
   ln -s ${srcdir}/${_hotspotver}.tar.gz .
 
   # fix xulrunner linking
   patch -Np0 -i ${srcdir}/gcjwebplugin_xulrunner.diff || return 1
 
-  #cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
+#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
   export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
 
-#  ./autogen.sh
-#  autoreconf # needed due to mercurial build
+  ./autogen.sh
+  autoreconf # needed due to mercurial build
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -98,8 +100,8 @@
   
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
-  #pushd ${srcdir}/icedtea6/openjdk/control/build/linux-${_arch}/j2sdk-image
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/control/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6/openjdk/control/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/control/build/linux-${_arch}/j2sdk-image
    # Install main files.
   cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1