summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprofessorkaos642016-12-26 11:17:10 -0500
committerprofessorkaos642016-12-26 11:17:10 -0500
commite564c98426e73c3663edbb3015726713ac840a07 (patch)
tree9fc46ac0ad46cf4e86e648451cbb16228aa3a072
parent1ba2f1e1ceab737f257cc8d1b1c25f113c6da7e2 (diff)
downloadaur-e564c98426e73c3663edbb3015726713ac840a07.tar.gz
use java env in deps
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rwxr-xr-xPlayOnLinux.sh2
3 files changed, 15 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec12c030c45..8e695491b90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = playonlinux5-git
pkgdesc = GUI for managing Windows programs under linux (development version based on Java)
- pkgver = r1317.9d399ad3
+ pkgver = r1319.66f20455
pkgrel = 1
epoch = 2
url = http://www.playonlinux.com/
@@ -10,15 +10,15 @@ pkgbase = playonlinux5-git
makedepends = gradle
makedepends = maven
makedepends = java-openjfx
- makedepends = jdk8-openjdk
+ makedepends = java-environment>=8
depends = wine
options = !strip
source = playonlinux5::git://github.com/PlayOnLinux/POL-POM-5.git
source = PlayOnLinux5.desktop
source = PlayOnLinux.sh
- md5sums = SKIP
- md5sums = 7fe925810fc7ec6d8745817b1c541e7b
- md5sums = 12e1e2682bdfef291db457961b5844d5
+ sha256sums = SKIP
+ sha256sums = 4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de
+ sha256sums = 7558a8d24f344228ec55fc9fd156dfe75d7625378c6230fa2a625fa8fe17ee12
pkgname = playonlinux5-git
diff --git a/PKGBUILD b/PKGBUILD
index 0d3f04c7717..e6feb07bb2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,14 @@
_pkgname=playonlinux5
pkgname=$_pkgname-git
-pkgver=r1317.9d399ad3
+pkgver=r1319.66f20455
pkgrel=1
epoch=2
pkgdesc="GUI for managing Windows programs under linux (development version based on Java)"
arch=('any')
url="http://www.playonlinux.com/"
license=('GPL')
-makedepends=('git' 'gradle' 'maven' 'java-openjfx' 'jdk8-openjdk')
+makedepends=('git' 'gradle' 'maven' 'java-openjfx' 'java-environment>=8')
depends=('wine')
options=(!strip)
source=(
@@ -25,10 +25,10 @@ source=(
'PlayOnLinux5.desktop'
'PlayOnLinux.sh'
)
-md5sums=(
+sha256sums=(
'SKIP'
- '7fe925810fc7ec6d8745817b1c541e7b'
- '12e1e2682bdfef291db457961b5844d5'
+ '4703fc813fb18d3e414cc1483f03cb3c0c306e5725b7681b3dbc43fb7f6630de'
+ '7558a8d24f344228ec55fc9fd156dfe75d7625378c6230fa2a625fa8fe17ee12'
)
pkgver() {
@@ -51,9 +51,11 @@ build() {
# Build
mvn package
+
}
package() {
+
# Extract
install -d "$pkgdir/opt/"
bsdtar -xf "$_pkgname/phoenicis-dist/target/phoenicis-dist.zip"
@@ -66,4 +68,5 @@ package() {
install -Dm644 "$srcdir/$_pkgname/phoenicis-javafx/target/classes/com/playonlinux/javafx/views/common/playonlinux.png" \
"$pkgdir/usr/share/pixmaps/$_pkgname.png"
install -Dm644 PlayOnLinux5.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
+
}
diff --git a/PlayOnLinux.sh b/PlayOnLinux.sh
index f2e680dcafa..0ae1b310c9d 100755
--- a/PlayOnLinux.sh
+++ b/PlayOnLinux.sh
@@ -11,3 +11,5 @@ export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
java -classpath "$CLASSPATH" com.playonlinux.app.PlayOnLinuxApp "$@"
# Unset vars?
+# Note: Java version can be sourced with this one liner:
+# IFS=\" read -r _ version _ < <(java -version 2>&1); printf %s\\n "$version