summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprofessorkaos642017-01-14 15:43:20 -0500
committerprofessorkaos642017-01-14 15:43:20 -0500
commit18b58348428696d4a5d7deec395b2ecb2ab22fcf (patch)
tree23d26a4550ca171d794a8f8e94be352baafe55b8
parent6afd02ad86f1fd0f754db6f88b9010c71c15cecd (diff)
downloadaur-18b58348428696d4a5d7deec395b2ecb2ab22fcf.tar.gz
add back java home for users still on java 7, remove gradle makedep, not needed
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index febd711376c..42db2fa6b9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
pkgbase = playonlinux5-git
pkgdesc = GUI for managing Windows programs under linux (development version based on Java)
pkgver = r1486.178b8e1a
- pkgrel = 2
+ pkgrel = 3
epoch = 2
url = http://www.playonlinux.com/
arch = any
license = GPL
makedepends = git
- makedepends = gradle
makedepends = maven
makedepends = java-openjfx
makedepends = java-environment>=8
diff --git a/PKGBUILD b/PKGBUILD
index 13f0d4fcf84..2c50154b7a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,13 +11,13 @@
_pkgname=playonlinux5
pkgname=$_pkgname-git
pkgver=r1486.178b8e1a
-pkgrel=2
+pkgrel=3
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' 'java-environment>=8')
+makedepends=('git' 'maven' 'java-openjfx' 'java-environment>=8')
depends=('wine' 'java-runtime>=8')
options=(!strip)
source=(
@@ -42,6 +42,13 @@ pkgver() {
build() {
cd "$_pkgname"
+ # Set environment
+ # Use path to Java 8 for users not defaulted to Java 8 yet
+ if (( $(archlinux-java get | cut -d "-" -f2) >= 8 )); then
+ JAVA_VER=$(archlinux-java get)
+ export JAVA_HOME="/usr/lib/jvm/${JAVA_VER}"
+ fi
+
# Build
mvn package