summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorD. Can Celasun2020-10-08 07:48:22 +0100
committerD. Can Celasun2020-10-08 07:48:22 +0100
commitd03e3c1b82d47af013d77dc2091e7bbbddbdd8a2 (patch)
tree10e9803956ece8fd10fba53a1265fa82b9f5fcf0
parentde0b6b4eb1dd01535c10236ee3f094d5c77e97f9 (diff)
downloadaur-d03e3c1b82d47af013d77dc2091e7bbbddbdd8a2.tar.gz
[downlords-faf-client] Depend on Oracle JDK
Arch's OpenJDK doesn't work with FAF, see linked issue.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rwxr-xr-xdownlords-faf-client2
3 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55fc3221f98b..ecae7767a0d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = downlords-faf-client
pkgdesc = Forged Alliance Forever - Lobby Client. Community-driven client system for Supreme Commander: Forged Alliance. Downlord's Java client reimplementation.
pkgver = 1.2.1
- pkgrel = 1
+ pkgrel = 2
epoch = 0
url = http://www.faforever.com/
arch = any
license = MIT
makedepends = jq
- depends = jre-openjdk>=14
+ depends = jre14
source = https://github.com/FAForever/downlords-faf-client/releases/download/v1.2.1/dfc_unix_1_2_1.tar.gz
source = https://github.com/FAForever/downlords-faf-client/raw/develop/src/media/appicon/128.png
source = DownlordsFafClient.desktop
@@ -15,7 +15,7 @@ pkgbase = downlords-faf-client
sha256sums = 322521547c6e774b5bf9c82fc165b0120e44f153730faa8fdfdff4b8ba069bb6
sha256sums = 2a5803ca2dd463aa4b53d79cff7f30e3aa7beb0d874b39c8ef59e679fbde9d3d
sha256sums = 3fd2b21da9de9f9c02dd89ee07f49c559dbb2de15f4e86a9b31f6353f608ffa6
- sha256sums = ffc4cf07815cccc8127ff92ba41ba18834b9b219e2089c690716bce6f4929856
+ sha256sums = 3df2ae7c886d03a899427e493583be2b1db8d5e557b3b83d4362ff7d5b1b32a7
pkgname = downlords-faf-client
diff --git a/PKGBUILD b/PKGBUILD
index b3e623398eb7..240dee179870 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _pkgver_tag=$(echo $pkgver | cut -d . -f 3)
#_filename="dfc_unix_${_pkgver_major}_${_pkgver_minor}_${_pkgver_tag}-${_pkgver_suffix}.tar.gz"
_pkgver="${_pkgver_major}.${_pkgver_minor}.${_pkgver_tag}"
_filename="dfc_unix_${_pkgver_major}_${_pkgver_minor}_${_pkgver_tag}.tar.gz"
-pkgrel=1
+pkgrel=2
epoch=0
pkgdesc="Forged Alliance Forever - Lobby Client. Community-driven client system for Supreme Commander: Forged Alliance. Downlord's Java client reimplementation."
url="http://www.faforever.com/"
@@ -18,7 +18,9 @@ license=('MIT')
groups=()
checkdepends=()
optdepends=()
-depends=('jre-openjdk>=14')
+# Faf is broken with Arch's OpenJDK 14
+# https://github.com/FAForever/downlords-faf-client/issues/1957
+depends=('jre14')
makedepends=('jq')
replaces=()
backup=()
@@ -29,7 +31,7 @@ source=("https://github.com/FAForever/downlords-faf-client/releases/download/v$_
sha256sums=('322521547c6e774b5bf9c82fc165b0120e44f153730faa8fdfdff4b8ba069bb6'
'2a5803ca2dd463aa4b53d79cff7f30e3aa7beb0d874b39c8ef59e679fbde9d3d'
'3fd2b21da9de9f9c02dd89ee07f49c559dbb2de15f4e86a9b31f6353f608ffa6'
- 'ffc4cf07815cccc8127ff92ba41ba18834b9b219e2089c690716bce6f4929856')
+ '3df2ae7c886d03a899427e493583be2b1db8d5e557b3b83d4362ff7d5b1b32a7')
noextract=()
validpgpkeys=()
diff --git a/downlords-faf-client b/downlords-faf-client
index 86b1cc843810..cb5936ee960c 100755
--- a/downlords-faf-client
+++ b/downlords-faf-client
@@ -1,5 +1,5 @@
#!/bin/sh
-export INSTALL4J_JAVA_HOME=/usr/lib/jvm/java-14-openjdk
+export INSTALL4J_JAVA_HOME=/usr/lib/jvm/java-14-jdk
pushd /usr/share/java/downlords-faf-client
exec ./downlords-faf-client "$@"
popd