diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-02 13:57:27 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-02 13:57:27 +0000 |
commit | 91bf4aafe0b502a6024eaa2c41409770f6c98046 (patch) | |
tree | 7c6597ed54aab27f3f740e509d0f5b28422c56f7 /community | |
parent | 0d82112ff10ab6e045b1f11f48fa35e8dafc569b (diff) | |
download | aports-91bf4aafe0b502a6024eaa2c41409770f6c98046.tar.bz2 aports-91bf4aafe0b502a6024eaa2c41409770f6c98046.tar.xz |
community/icedtea-web: rebuild against openjdk8
Diffstat (limited to 'community')
-rw-r--r-- | community/icedtea-web/APKBUILD | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/community/icedtea-web/APKBUILD b/community/icedtea-web/APKBUILD index e9104f33a8..b209fb126f 100644 --- a/community/icedtea-web/APKBUILD +++ b/community/icedtea-web/APKBUILD @@ -2,18 +2,19 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=icedtea-web pkgver=1.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="web integration packages for icedtea" url="http://icedtea.classpath.org/wiki/IcedTea-Web" arch="x86 x86_64" license="GPL" -depends="openjdk7-jre bash" -depends_dev="openjdk7 gtk+2.0-dev nspr-dev" +depends="openjdk8-jre bash" +depends_dev="openjdk8 gtk+2.0-dev nspr-dev" makedepends="tar zip bash $depends_dev npapi-sdk" install="" subpackages="$pkgname-mozilla $pkgname-doc" source="http://icedtea.wildebeest.org/download/source/icedtea-web-$pkgver.tar.gz " +_jdkver="1.8" _builddir="$srcdir"/icedtea-web-$pkgver prepare() { @@ -31,14 +32,15 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr/lib/jvm/java-1.7-openjdk \ + --prefix=/usr/lib/jvm/java-$_jdkver-openjdk \ --datarootdir=/usr/share \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --with-jdk-home=/usr/lib/jvm/java-1.7-openjdk \ + --with-jdk-home=/usr/lib/jvm/java-$_jdkver-openjdk \ --with-pkgversion=Alpine \ + --disable-docs \ || return 1 make || return 1 } @@ -52,10 +54,10 @@ mozilla() { pkgdesc="web integration packages for icedtea - mozilla plugin" install_if="$pkgname=$pkgver-r$pkgrel firefox" mkdir -p "$subpkgdir"/usr/lib/mozilla/plugins - mkdir -p "$subpkgdir"/usr/lib/jvm/java-1.7-openjdk/lib - mv "$pkgdir"/usr/lib/jvm/java-1.7-openjdk/lib/IcedTeaPlugin.so \ - "$subpkgdir"/usr/lib/jvm/java-1.7-openjdk/lib - ln -sf /usr/lib/jvm/java-1.7-openjdk/lib/IcedTeaPlugin.so \ + mkdir -p "$subpkgdir"/usr/lib/jvm/java-$_jdkver-openjdk/lib + mv "$pkgdir"/usr/lib/jvm/java-$_jdkver-openjdk/lib/IcedTeaPlugin.so \ + "$subpkgdir"/usr/lib/jvm/java-$_jdkver-openjdk/lib + ln -sf /usr/lib/jvm/java-$_jdkver-openjdk/lib/IcedTeaPlugin.so \ "$subpkgdir"/usr/lib/mozilla/plugins/libjavaplugin.so return 0 } |