summaryrefslogtreecommitdiff
path: root/pcr/openjdk6
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-31 14:13:36 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-31 14:13:36 +0200
commit5e76c95e0fd01b276497d60d5fbd94658f6d7a68 (patch)
tree04ea3e79e74878cab0205c4135081f234eacfb27 /pcr/openjdk6
parent52b7ebd047f863492ef945cfd57f0c9f066e244e (diff)
openjdk6-old changes for future builds.
Diffstat (limited to 'pcr/openjdk6')
-rw-r--r--pcr/openjdk6/PKGBUILD6
1 files changed, 2 insertions, 4 deletions
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD
index 8c70bb72a..7b6505b86 100644
--- a/pcr/openjdk6/PKGBUILD
+++ b/pcr/openjdk6/PKGBUILD
@@ -81,7 +81,6 @@ build() {
--with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
- --enable-bootstrap \
--with-abs-install-dir=${_jvmdir} \
--with-jdk-home="$JAVA_HOME"
@@ -95,10 +94,9 @@ package_openjdk6-old() {
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>=1.5.7')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
- 'alsa-lib: for sound'
+ optdepends=('alsa-lib: for sound'
'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime')
+ conflicts=('java-environment' 'java-runtime' 'jre7-openjdk-headless')
provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
install=openjdk6.install