summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin MacMartin2020-05-31 15:00:11 -0400
committerKevin MacMartin2020-05-31 15:00:11 -0400
commita548a1b358e6691bfbcb5bae5040d1ed9d7cc7d0 (patch)
tree9877ba24d41ba5ac942c213ffd95f4727953fbf0
parentfcf87a6395232dda9bdc44949ffea751da676bec (diff)
downloadaur-a548a1b358e6691bfbcb5bae5040d1ed9d7cc7d0.tar.gz
Update to the new repo for 0.8.0b and make a bunch of adjustments to get the build working correctly again
-rw-r--r--.SRCINFO11
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD22
3 files changed, 16 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fbb9ac79e4c..77c5eb7ec4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
pkgbase = shattered-pixel-dungeon-git
pkgdesc = Shattered fork of the popular rogue-like game
- pkgver = 283v0.7.5f
- pkgrel = 2
+ pkgver = 3753v0.8.0b
+ pkgrel = 1
url = http://shatteredpixel.tumblr.com
arch = any
license = GPL3
makedepends = git
- makedepends = gradle
- makedepends = jdk8-openjdk
- depends = jre8-openjdk
+ makedepends = java-environment
+ depends = java-runtime
depends = bash
- source = shattered-pixel-dungeon::git+https://github.com/00-Evan/shattered-pixel-dungeon-gdx.git
+ source = shattered-pixel-dungeon::git+https://github.com/00-Evan/shattered-pixel-dungeon.git
source = shattered-pixel-dungeon.sh
source = shattered-pixel-dungeon.desktop
sha512sums = SKIP
diff --git a/.gitignore b/.gitignore
index c901746a001..f0491fc6c9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.pkg.tar.xz
+*.pkg.tar*
pkg
src
shattered-pixel-dungeon
diff --git a/PKGBUILD b/PKGBUILD
index 25c41aef917..7aaf922d600 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@
_pkgname=shattered-pixel-dungeon
pkgname=$_pkgname-git
-pkgver=283v0.7.5f
-pkgrel=2
+pkgver=3753v0.8.0b
+pkgrel=1
pkgdesc='Shattered fork of the popular rogue-like game'
url='http://shatteredpixel.tumblr.com'
license=('GPL3')
-depends=('jre8-openjdk' 'bash')
-makedepends=('git' 'gradle' 'jdk8-openjdk')
+depends=('java-runtime' 'bash')
+makedepends=('git' 'java-environment')
arch=('any')
source=(
- "$_pkgname::git+https://github.com/00-Evan/$_pkgname-gdx.git"
+ "$_pkgname::git+https://github.com/00-Evan/shattered-pixel-dungeon.git"
"$_pkgname.sh"
"$_pkgname.desktop"
)
@@ -26,25 +26,23 @@ sha512sums=(
pkgver() {
cd $_pkgname
- printf '%s' "$(git rev-list --count HEAD)$(git log | grep -e '^v[0-9]' desktop/VersionInfo.txt | head -n 1)"
+ printf '%s' "$(git rev-list --count HEAD)v$(grep 'appVersionName =' build.gradle | sed "s|^[^']*'||;s|'.*||")"
}
prepare() {
- # Hack to use system gradle (thanks to the shattered-pixel-dungeon package and by proxy @jonathon on AUR)
- sed -i '164c/usr/bin/gradle "$@"' "$_pkgname/gradlew"
+ # Make the gradlew script executable
+ chmod 755 "$_pkgname/gradlew"
}
build() {
cd $_pkgname
unset _JAVA_OPTIONS
- # Force the system to build the package using JDK8 (thanks to the shattered-pixel-dungeon package)
- export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
- GRADLE_USER_HOME="$srcdir" ./gradlew desktop:dist
+ GRADLE_USER_HOME="$srcdir" ./gradlew desktop:release
}
package() {
install -Dm755 $_pkgname.sh "$pkgdir/usr/bin/$_pkgname"
install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
- install -Dm644 $_pkgname/android/res/drawable-xxxhdpi/ic_launcher.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+ install -Dm644 $_pkgname/desktop/src/main/assets/icon_256.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
install -Dm644 $_pkgname/desktop/build/libs/desktop-*.jar "$pkgdir/usr/share/$_pkgname/$_pkgname.jar"
}