From 955510fdd4f8cfbea9601f97e4bcb8dbb4c00d5e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 22 Jun 2014 12:24:51 +0200 Subject: [PATCH] oracle-jdk: fix mozilla plugin --- srcpkgs/oracle-jdk/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template index 059c734cedc..16ac94e4d80 100644 --- a/srcpkgs/oracle-jdk/template +++ b/srcpkgs/oracle-jdk/template @@ -2,7 +2,7 @@ pkgname=oracle-jdk version=8u5 _longVersion=1.8.0_05 -revision=3 +revision=4 short_desc="Java Development Kit (JDK)" maintainer="Enno Boland " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" @@ -18,14 +18,17 @@ replaces="java-runtime>=0 oracle-jre>=0" case "${XBPS_TARGET_MACHINE}" in x86_64) + _arch=amd64 _filename=jdk-${version}-linux-x64.tar.gz checksum="44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc" ;; i686) + _arch=i386 _filename=jdk-${version}-linux-i586.tar.gz checksum="779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9" ;; armv*) + _arch=arm _filename=jdk-${version}-linux-arm-vfp-hflt.tar.gz checksum="54e04ccf8383fb631b0c4a355e9136a05e53690b5caca52ef7581ae67e686179" ;; @@ -74,6 +77,11 @@ do_install() { vinstall $FILESDIR/oracle-jdk-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png done + vmkdir "usr/lib/mozilla/plugins" + ln -srf ${DESTDIR}/usr/share/java/oracle-jre/lib/${_arch}/libnpjp2.so \ + ${DESTDIR}/usr/lib/mozilla/plugins + + vmkdir "etc/profile.d" vinstall oracle-jdk.sh 644 "etc/profile.d" }