From 2d4aa7f882dac8abb34e973655326c93f584f31f Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Jan 2012 23:15:11 +0000 Subject: Sat Jan 14 23:15:11 UTC 2012 --- extra/openjdk6/PKGBUILD | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) (limited to 'extra/openjdk6/PKGBUILD') diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index df1688ad1..79d5bba98 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,15 +1,13 @@ -# $Id: PKGBUILD 140782 2011-10-19 08:19:12Z andyrtr $ +# $Id: PKGBUILD 146547 2012-01-12 21:46:06Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Jan de Groot pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" -#_date=20100715 _javaver=6 -_icedteaver=1.10.4 +_icedteaver=1.10.5 _openjdk_version=b22 _openjdk_date=28_feb_2011 -#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} pkgrel=1 url='http://icedtea.classpath.org' @@ -17,25 +15,25 @@ arch=('i686' 'x86_64') license=('custom') makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'libxt' 'nss' - 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio') + 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6') options=('!emptydirs') # 'force') # force needed for hg shots source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz - #ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz http://icedtea.classpath.org/download/drops/jaxp144_01.zip - https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip - https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip + http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip + http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip fix_jdk_cmds_path.diff fix_corba_cmds_path.diff fontconfig-paths.diff nonreparenting-wm.diff openjdk6.profile - openjdk6.profile.csh) + openjdk6.profile.csh + glibc2_15.diff) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_01.zip jdk6-jaxws-b20.zip jdk6-jaf-b20.zip) -md5sums=('c381d987f8d2facece8c54e98fd547f8' +md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a' '2d2bbbb0f9b81f1fec41ec730da8a933' 'ef7a8b3624ea904bf584bc46d79b5e75' '91adfd41e6f001add4f92ae31216b1e3' @@ -45,19 +43,8 @@ md5sums=('c381d987f8d2facece8c54e98fd547f8' 'ee1afda124d5927345014ab382ef581e' '9b4d368f5ee08de248eaf029303a446c' '74c4a7adc782edd087802bf92ae3d6d0' - 'fdf295e2f186dfa4d308691a3d7ac8c5') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/icedtea6-${_date} - pushd /tmp/icedtea6-${_date} - #hg -v clone http://icedtea.classpath.org/hg/icedtea6 - # use specific release branch - hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/ - rm -rf icedtea6/.hg* - tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz * - popd -} + 'fdf295e2f186dfa4d308691a3d7ac8c5' + '0c8f0a398c88f85e0db44b4417562cf3') build() { @@ -77,7 +64,7 @@ build() { autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/glibc2_15.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -88,7 +75,7 @@ build() { --with-ant-home=/usr/share/java/apache-ant \ --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ --with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \ - --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \ + --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ --disable-bootstrap LD_PRELOAD="" make -- cgit v1.2.3-54-g00ecf