From 2abda179cd33be80b3a242e1a8567fc2ff10052a Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Tue, 11 Feb 2020 12:47:46 -0400
Subject: Rebuild [pcr/jitsi] and [nonprism/jitsi] so that they work in the
 current java environment (aka for jdk/jre8 for them)

---
 nonprism/jitsi/PKGBUILD | 12 ++++++------
 nonprism/jitsi/jitsi.sh |  2 +-
 pcr/jitsi/PKGBUILD      | 10 +++++-----
 pcr/jitsi/jitsi.sh      |  2 +-
 4 files changed, 13 insertions(+), 13 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
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index 473be0fc9..78366ebc1 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -10,20 +10,20 @@
 
 pkgname=jitsi
 pkgver=2.10.5550
-pkgrel=6
+pkgrel=7
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
-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
 		jitsi.sh)
 sha256sums=('cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287'
             '40a411ec494280490a0e1a137735ef5efca434d8d10f18b0124df9e93302f959'
-            'c47bfa98fe36378f2e7b947cd248582f5a90c1b169d53d158badb00439fdc6c7')
+            'b22ae316fece079ce7f56060f79722d74867562ec12b9a5279d144eb359587c9')
 
 build()
 {
diff --git a/pcr/jitsi/jitsi.sh b/pcr/jitsi/jitsi.sh
index ae544f39f..e6f879bef 100644
--- a/pcr/jitsi/jitsi.sh
+++ b/pcr/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
-- 
cgit v1.2.2