diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rwxr-xr-x | faf-ice-adapter | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -1,19 +1,19 @@ pkgbase = faf-ice-adapter-java pkgdesc = A P2P connection proxy for Supreme Commander: Forged Alliance using ICE - pkgver = 1.1.1 + pkgver = 2.3.0 pkgrel = 1 epoch = 0 url = http://www.faforever.com/ arch = any license = GPL3 - makedepends = jdk8-openjdk + makedepends = java-openjfx makedepends = gradle depends = jre8-openjdk provides = faf-ice-adapter source = git+https://github.com/FAForever/java-ice-adapter.git source = faf-ice-adapter sha256sums = SKIP - sha256sums = 6b5e2809751a7bb230a2f338398178c53acbf8df884efc57717d9c4e1e842175 + sha256sums = 2753364cb2fe87ce39c46d8ef2ba265189465164afd24a2329b81feb9bd2c6f7 pkgname = faf-ice-adapter-java @@ -1,6 +1,6 @@ # Maintainer: Martin Müllenhaupt <mm+aur.archlinux.org@netlair.de> pkgname=faf-ice-adapter-java -pkgver=1.1.1 +pkgver=2.3.0 pkgrel=1 epoch=0 pkgdesc="A P2P connection proxy for Supreme Commander: Forged Alliance using ICE" @@ -9,7 +9,7 @@ arch=('any') license=('GPL3') groups=() depends=('jre8-openjdk') -makedepends=('jdk8-openjdk' 'gradle') +makedepends=('java-openjfx' 'gradle') checkdepends=() optdepends=() provides=('faf-ice-adapter') @@ -20,7 +20,7 @@ options=() install= changelog= source=("git+https://github.com/FAForever/java-ice-adapter.git" 'faf-ice-adapter') -sha256sums=('SKIP' '6b5e2809751a7bb230a2f338398178c53acbf8df884efc57717d9c4e1e842175') +sha256sums=('SKIP' '2753364cb2fe87ce39c46d8ef2ba265189465164afd24a2329b81feb9bd2c6f7') noextract=() validpgpkeys=() @@ -30,10 +30,10 @@ pkgver() { } build() { - gradle -b java-ice-adapter/ice-adapter/build.gradle shadowJar + gradle -Dorg.gradle.java.home=/usr/lib/jvm/java-8-openjdk -b java-ice-adapter/ice-adapter/build.gradle shadowJar } package() { - install -D "java-ice-adapter/ice-adapter/build/libs/ice-adapter-SNAPSHOT-all.jar" "$pkgdir/usr/share/java/faf-ice-adapter/faf-ice-adapter.jar" + install -D "java-ice-adapter/ice-adapter/build/libs/ice-adapter-SNAPSHOT.jar" "$pkgdir/usr/share/java/faf-ice-adapter/faf-ice-adapter.jar" install -D "$srcdir/faf-ice-adapter" "$pkgdir/usr/bin/faf-ice-adapter" } diff --git a/faf-ice-adapter b/faf-ice-adapter index 1fc8f779e3e3..cd809d5be584 100755 --- a/faf-ice-adapter +++ b/faf-ice-adapter @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/bin/java -jar '/usr/share/java/faf-ice-adapter/faf-ice-adapter.jar' "$@" +exec /usr/lib/jvm/java-8-openjdk/bin/java -jar '/usr/share/java/faf-ice-adapter/faf-ice-adapter.jar' "$@" |