diff options
author | Timo Teräs <timo.teras@iki.fi> | 2016-02-22 13:51:45 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2016-02-22 13:53:26 +0000 |
commit | 151f353fdabf94ccb3adc90cdffc184873076198 (patch) | |
tree | c3158cbfb4df11e4930199c78f68f4d26d56bd71 | |
parent | e81049956f7cd1251ef6ec8e90c487c7c2bda99b (diff) | |
download | alpine_aports-151f353fdabf94ccb3adc90cdffc184873076198.tar.bz2 alpine_aports-151f353fdabf94ccb3adc90cdffc184873076198.tar.xz alpine_aports-151f353fdabf94ccb3adc90cdffc184873076198.zip |
main/openjdk8: fix jre-base packaging
move plugins out that depend on xorg stuff, and add java-cacerts
dependency. fixes #5132.
-rw-r--r-- | community/openjdk8/APKBUILD | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD index 70723472c1..4a02d71099 100644 --- a/community/openjdk8/APKBUILD +++ b/community/openjdk8/APKBUILD | |||
@@ -5,7 +5,7 @@ _java_ver=8 | |||
5 | _jdk_update=72 | 5 | _jdk_update=72 |
6 | _jdk_build=15 | 6 | _jdk_build=15 |
7 | pkgver=$_java_ver.$_jdk_update.$_jdk_build | 7 | pkgver=$_java_ver.$_jdk_update.$_jdk_build |
8 | pkgrel=1 | 8 | pkgrel=2 |
9 | pkgdesc="Sun OpenJDK 8" | 9 | pkgdesc="Sun OpenJDK 8" |
10 | url="http://openjdk.java.net" | 10 | url="http://openjdk.java.net" |
11 | arch="x86_64 x86" | 11 | arch="x86_64 x86" |
@@ -168,7 +168,7 @@ jrelib() { | |||
168 | 168 | ||
169 | jrebase() { | 169 | jrebase() { |
170 | pkgdesc="OpenJDK 8 Java Runtime (no GUI support)" | 170 | pkgdesc="OpenJDK 8 Java Runtime (no GUI support)" |
171 | depends="$pkgname-jre-lib java-common" | 171 | depends="$pkgname-jre-lib java-common java-cacerts" |
172 | 172 | ||
173 | mkdir -p "$subpkgdir"/$INSTALL_BASE/bin | 173 | mkdir -p "$subpkgdir"/$INSTALL_BASE/bin |
174 | 174 | ||
@@ -191,6 +191,8 @@ jre() { | |||
191 | bin/appletviewer \ | 191 | bin/appletviewer \ |
192 | bin/policytool \ | 192 | bin/policytool \ |
193 | jre/lib/$_jarch/libawt_xawt.so \ | 193 | jre/lib/$_jarch/libawt_xawt.so \ |
194 | jre/lib/$_jarch/libfontmanager.so \ | ||
195 | jre/lib/$_jarch/libjawt.so \ | ||
194 | jre/lib/$_jarch/libsplashscreen.so ; do | 196 | jre/lib/$_jarch/libsplashscreen.so ; do |
195 | dirname=${A%/*} | 197 | dirname=${A%/*} |
196 | mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname | 198 | mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname |