summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Borsboom2019-05-13 10:16:03 +0200
committerArthur Borsboom2019-05-13 10:16:03 +0200
commit967400639dcb88eb334c7f7f3040977dbedb24b1 (patch)
treed447ca0158cdee9d281c32d422b0afbd02d3a93b
parent116acac60fa20e0498c053e89811bfeba20ac5ac (diff)
downloadaur-967400639dcb88eb334c7f7f3040977dbedb24b1.tar.gz
Make sure Java 8 is used for compiling the package, even when another Java version is set as the system default (for example Java 11).
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index afdc9a04aaa9..5246d193d916 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = jitsi-nightly
pkgdesc = An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)
- pkgver = 2.11.20190402
+ pkgver = 2.11.20190513
pkgrel = 1
url = http://jitsi.org
install = jitsi-nightly.install
diff --git a/PKGBUILD b/PKGBUILD
index b4fdf087b952..f05cf622da5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=jitsi
# pkgvermajor needs manual increment
_pkgvermajor=2.11
# pkgver is determined automatically
-pkgver=2.11.20190402
+pkgver=2.11.20190513
pkgrel=1
pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
arch=('i686' 'x86_64')
@@ -43,8 +43,9 @@ build() {
# append the build revision to the jitsi version
sed -i "s/BUILD_ID="\"".*"\""/BUILD_ID="\"$(date +%Y%m%d)\""/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
- # Force to compile with Java 8, since Java 10 does return compile errors as of 09-08-2018
+ # Override the default Java version and force to compile with Java 8, since Java 10+ results in compile errors.
export PATH=/usr/lib/jvm/java-8-openjdk/bin/:$PATH
+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
ant rebuild
}