summaryrefslogtreecommitdiff
path: root/nonprism/jitsi
diff options
context:
space:
mode:
authorFreemor <freemor@freemor.ca>2020-02-11 12:47:46 -0400
committerFreemor <freemor@freemor.ca>2020-02-11 12:47:46 -0400
commit2abda179cd33be80b3a242e1a8567fc2ff10052a (patch)
tree8b388f26cc899634fb0f9e8aed551799a7ee6f98 /nonprism/jitsi
parent0bdebf6f4b3a04f9ca312c7fb9af0f5e1ad71f68 (diff)
downloadabslibre-2abda179cd33be80b3a242e1a8567fc2ff10052a.tar.gz
abslibre-2abda179cd33be80b3a242e1a8567fc2ff10052a.tar.bz2
abslibre-2abda179cd33be80b3a242e1a8567fc2ff10052a.zip
Rebuild [pcr/jitsi] and [nonprism/jitsi] so that they work in the current java environment (aka for jdk/jre8 for them)
Diffstat (limited to 'nonprism/jitsi')
-rw-r--r--nonprism/jitsi/PKGBUILD12
-rw-r--r--nonprism/jitsi/jitsi.sh2
2 files changed, 7 insertions, 7 deletions
diff --git a/nonprism/jitsi/PKGBUILD b/nonprism/jitsi/PKGBUILD
index e8e082dde..6e9bb9c1a 100644
--- a/nonprism/jitsi/PKGBUILD
+++ b/nonprism/jitsi/PKGBUILD
@@ -10,13 +10,14 @@
pkgname=jitsi
pkgver=2.10.5550
-pkgrel=4.nonprism1
+pkgrel=7
+pkgrel+=.nonprism1
pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator), without support for unsafe and dangerous for privacy protocols"
-arch=('i686' 'x86_64')
+arch=('any')
url="http://jitsi.org"
license=('Apache')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment-common')
+depends=('java-runtime=8')
+makedepends=('ant' 'java-environment=8')
options=(!strip !emptydirs zipman !libtool docs)
source=("https://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
jitsi.desktop
@@ -24,7 +25,7 @@ source=("https://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
nonprism.patch)
sha256sums=('cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287'
'61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
- 'c47bfa98fe36378f2e7b947cd248582f5a90c1b169d53d158badb00439fdc6c7'
+ 'b22ae316fece079ce7f56060f79722d74867562ec12b9a5279d144eb359587c9'
'437c550c93688efb7f5bec5564093193a663257f9f455fcd5551106db23b2ed3')
prepare() {
@@ -73,7 +74,6 @@ build() {
cd "${srcdir}/${pkgname}"
# append the build revision to the jitsi version
sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
- . /etc/profile.d/apache-ant.sh
ant rebuild
}
diff --git a/nonprism/jitsi/jitsi.sh b/nonprism/jitsi/jitsi.sh
index ae544f39f..e6f879bef 100644
--- a/nonprism/jitsi/jitsi.sh
+++ b/nonprism/jitsi/jitsi.sh
@@ -6,7 +6,7 @@ uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
if [[ -n ${JAVA_HOME} ]]; then
JAVABIN="${JAVA_HOME}/bin/java"
else
- JAVABIN="java"
+ JAVABIN="/usr/lib/jvm/java-8-openjdk/bin/java"
fi
SCDIR=/usr/lib/jitsi