[arch-commits] Commit in openjdk6/repos (3 files)

[andyrtr at archlinux.org]

    Date: Sunday, October 19, 2008 @ 18:49:18
  Author: andyrtr
Revision: 16000

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

........
  r15998 | andyrtr | 2008-10-19 22:09:44 +0000 (So, 19 Okt 2008) | 2 lines
  
  upgpkg: openjdk6 1.3-1
      1.3 update + fix #11606
........

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

------------------+
 PKGBUILD         |   30 ++++++++++++++++++------------
 openjdk6.profile |    2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)


Property changes on: openjdk6/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /openjdk6/trunk:1-12571
   + /openjdk6/trunk:1-15999

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-19 22:10:37 UTC (rev 15999)
+++ extra-i686/PKGBUILD	2008-10-19 22:49:18 UTC (rev 16000)
@@ -2,9 +2,10 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=openjdk6
-pkgver=1.2
-_date=20080915
-pkgrel=5
+pkgver=1.3
+#_date=20080915
+_icedteaver=1.3
+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')
@@ -12,13 +13,14 @@
 _openjdk_version=b12
 _openjdk_date=28_aug_2008
 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.1' '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')
 conflicts=('jdk' 'j2sdk' 'java-environment' 'j2re' 'java-runtime' 'jre')
 provides=('jdk=6' 'j2sdk' 'java-environment' 'jre=6' 'j2re' 'java-runtime')
 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
+	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
+	http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
 	gcjwebplugin_xulrunner.diff
@@ -27,14 +29,15 @@
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
 md5sums=('b53e1ef643909ce82721ee4c970d958b'
-         '2fb2602b9386c8f9b3780a5069fc6190'
+         '70f03710342ada84bb3f0a1543017721'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ed2e808df2d2fc2ea7dae5139d475192'
          'ef60d567c0d9bad111212851220deafd'
          '104380f0b900c840141e572a7fb70c27'
-         '23583f0bf1418aa59f241b1082a2999e')
+         'd0703088e10aa957c037644ab88d716d')
 
+
 build() {
   # for hg checkout install mercurial and
 #  mkdir ${srcdir}/icedtea6-${_date}
@@ -53,16 +56,18 @@
   _javaver=1.6.0
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-  cd ${srcdir}/icedtea6
+  #cd ${srcdir}/icedtea6
+  cd ${srcdir}/icedtea6-${_icedteaver}
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.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/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
+#  ./autogen.sh
   autoreconf # needed due to mercurial build
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
@@ -87,12 +92,13 @@
   # 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 \
+	$JCONF #	--without-rhino \ice
   LD_PRELOAD="" make || return 1
   
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
-  pushd ${srcdir}/icedtea6/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

Modified: extra-i686/openjdk6.profile
===================================================================
--- extra-i686/openjdk6.profile	2008-10-19 22:10:37 UTC (rev 15999)
+++ extra-i686/openjdk6.profile	2008-10-19 22:49:18 UTC (rev 16000)
@@ -1,4 +1,4 @@
 export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
 export J2REDIR=$J2SDKDIR/jre
 export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
-export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib"
+#export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib"