summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Cai2018-05-12 19:32:06 +0800
committerPeter Cai2018-05-12 19:32:06 +0800
commitb8127a7d52739204997a4fc7e2bcef7fac6c6ba1 (patch)
tree9549f5be500233516dc057440a839d3729f15b07
parent15531f7a2942ced1635c407547362be293bb6a90 (diff)
downloadaur-b8127a7d52739204997a4fc7e2bcef7fac6c6ba1.tar.gz
force build with openjdk8 to avoid compatibility issues
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a286ea15cfa5..3f9d611c853c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = shattered-pixel-dungeon
pkgdesc = Shattered fork of the popular rogue-like game
pkgver = 0.6.3a
- pkgrel = 1
+ pkgrel = 2
url = http://shatteredpixel.tumblr.com
arch = any
license = GPL3
makedepends = git
makedepends = java-environment
+ makedepends = jdk8-openjdk
depends = java-runtime
depends = bash
depends = xorg-xrandr
+ conflicts = shattered-pixel-dungeon-git
source = https://github.com/00-Evan/shattered-pixel-dungeon-gdx/archive/v0.6.3a.tar.gz
source = shattered-pixel-dungeon.sh
source = shattered-pixel-dungeon.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 762b50d64ccd..2b54a3445dc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,13 @@ pkgname=shattered-pixel-dungeon
_pkgname=$pkgname-gdx
pkgver=0.6.3a
_srcdir=$_pkgname-$pkgver
-pkgrel=1
+pkgrel=2
pkgdesc='Shattered fork of the popular rogue-like game'
url='http://shatteredpixel.tumblr.com'
license=('GPL3')
depends=('java-runtime' 'bash' 'xorg-xrandr')
-makedepends=('git' 'java-environment')
+makedepends=('git' 'java-environment' 'jdk8-openjdk')
+conflicts=('shattered-pixel-dungeon-git')
arch=('any')
source=(
"https://github.com/00-Evan/shattered-pixel-dungeon-gdx/archive/v$pkgver.tar.gz"
@@ -24,6 +25,8 @@ sha512sums=('fb4be8c9a5bfa96eea580c78a198140385caf9f6ad0f2914470c5a24dee29f4c3b5
build() {
cd $_srcdir
unset _JAVA_OPTIONS
+ # Force the system to build the package using JDK8
+ export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
GRADLE_USER_HOME="$srcdir" ./gradlew desktop:dist
}