diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-05 20:20:25 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-05 20:20:25 -0500 |
| commit | 33c22f43a52aae722ce4d9cbe47f8d2fff31f395 (patch) | |
| tree | 71f9661d9a843cca28225852f8784e48a2b96cb2 /extra/openjdk6 | |
| parent | c87732e5659b56943ef4f120d7c71dcaabc3f849 (diff) | |
| parent | 3695b5d62c2aef6e82abc95d775a2ebd89bce081 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glew/PKGBUILD
testing/iproute2/PKGBUILD
Diffstat (limited to 'extra/openjdk6')
| -rw-r--r-- | extra/openjdk6/PKGBUILD | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index f9597b6e7..2efd6ec0e 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 117753 2011-04-04 17:40:52Z andyrtr $ +# $Id: PKGBUILD 126340 2011-06-04 23:48:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -11,7 +11,7 @@ _openjdk_version=b22 _openjdk_date=28_feb_2011 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=1 +pkgrel=2 url='http://icedtea.classpath.org' arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -27,7 +27,6 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip fix_jdk_cmds_path.diff fix_corba_cmds_path.diff - aatext_by_default.diff fontconfig-paths.diff nonreparenting-wm.diff openjdk6.profile @@ -40,7 +39,6 @@ md5sums=('f3b31b9f591afc752372addacb1eb335' 'bc95c133620bd68c161cac9891592901' '5da3e39fa60985576c4f37d1491efbe2' 'f7e7a212e50abb56a6ef1a2b1bd27405' - 'ef60d567c0d9bad111212851220deafd' 'ee1afda124d5927345014ab382ef581e' '409812b5675f9678b1c9e1a12a945a9a' '74c4a7adc782edd087802bf92ae3d6d0' @@ -76,7 +74,7 @@ build() { autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/aatext_by_default.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" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" |