diff options
Diffstat (limited to 'extra/openjdk6')
| -rw-r--r-- | extra/openjdk6/PKGBUILD | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index e5a02aea5..e83ffae50 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,50 +1,48 @@ -# $Id: PKGBUILD 146547 2012-01-12 21:46:06Z andyrtr $ +# $Id: PKGBUILD 148870 2012-02-05 11:53:35Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.10.5 -_openjdk_version=b22 -_openjdk_date=28_feb_2011 +_icedteaver=1.11 +_openjdk_version=b24 +_openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} pkgrel=1 url='http://icedtea.classpath.org' arch=('i686' 'x86_64' 'mips64el') 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' + 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' '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 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 - http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip + http://icedtea.classpath.org/download/drops/jaxp144_03.zip + http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.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 - glibc2_15.diff) + openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - jaxp144_01.zip - jdk6-jaxws-b20.zip + jaxp144_03.zip + jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a' - '2d2bbbb0f9b81f1fec41ec730da8a933' - 'ef7a8b3624ea904bf584bc46d79b5e75' - '91adfd41e6f001add4f92ae31216b1e3' +md5sums=('10c1cea1d24c064572abfe9687567948' + '0eabdd360169144336e50081b8d01001' + '9eea471ad474040265c688858fcf09aa' + '8fd91b09b643a19a912b8a75e7a7a9d5' 'bc95c133620bd68c161cac9891592901' '5da3e39fa60985576c4f37d1491efbe2' 'f7e7a212e50abb56a6ef1a2b1bd27405' 'ee1afda124d5927345014ab382ef581e' '9b4d368f5ee08de248eaf029303a446c' '74c4a7adc782edd087802bf92ae3d6d0' - 'fdf295e2f186dfa4d308691a3d7ac8c5' - '0c8f0a398c88f85e0db44b4417562cf3') + 'fdf295e2f186dfa4d308691a3d7ac8c5') build() { @@ -64,18 +62,17 @@ 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 patches/glibc2_15.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" unset MAKEFLAGS ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ --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-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \ + --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ --disable-bootstrap LD_PRELOAD="" make @@ -84,7 +81,7 @@ build() { package_openjdk6() { pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' backup=(etc/profile.d/openjdk6.sh) - depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng') + depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7') optdepends=('icedtea-web: web browser plugin + Java Web Start' 'alsa-lib: for sound' 'giflib: for gif format support') |