pcr/jitsi: updated to 2.10.5550

3 files changed, 31 insertions, 70 deletions

diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index 715ece24e..92b93e871 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -1,72 +1,33 @@
-# Contributor (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>
-# Contributor (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (AUR): Xavier Devlamynck <magicrhesus@ouranos.be>
+# Contributors (AUR): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
+# Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 
+# parabola changes and rationale:
+#  - corrected used license
+
 pkgname=jitsi
-pkgver=2.8.5426
-pkgrel=1
+pkgver=2.10.5550
+pkgrel=4
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
 arch=('i686' 'x86_64')
 url="http://jitsi.org"
-license=('LGPL')
+license=('Apache')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
+makedepends=('apache-ant' 'java-environment-common')
 options=(!strip !emptydirs zipman !libtool docs)
-source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
+source=("https://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
 		jitsi.desktop
-		jitsi.sh
-		drop-open-term-on-index-jn-html.patch)
-sha256sums=('e649867e186cf195c4b1bb159d7ffe0a38c4dc60659e5c55f9a74461a309f36c'
+		jitsi.sh)
+sha256sums=('cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287'
             '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
-            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5'
-            'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631')
-
-prepare() {
-  cd $srcdir/$pkgname
+            'c47bfa98fe36378f2e7b947cd248582f5a90c1b169d53d158badb00439fdc6c7')
 
+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
-
-  # remove Open Source term
-  patch -Np0 -i ../drop-open-term-on-index-jn-html.patch
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-         ' $(grep -ril 'open source')
-  sed -i 's|OpenSource / ||;
-          s|opensource / ||;
-          s|OpenSource|FreeSoftware|;
-          s|opensource|freesoftware|;
-         ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i '/, Linux/ s|Linux|GNU/Linux|;
-          /And Linux/ s|Linux|GNU/Linux|;
-          /and Linux/ s|Linux|GNU/Linux|;
-          /For Linux/ s|Linux|GNU/Linux|;
-          /for Linux/ s|Linux|GNU/Linux|;
-          /Linux,/ s|Linux|GNU/Linux|;
-          /Linux and/ s|Linux|GNU/Linux|;
-          /Linux distribution/ s|Linux|GNU/Linux|;
-          /Linux machine/ s|Linux|GNU/Linux|;
-          /Linux operating/ s|Linux|GNU/Linux|;
-          /Linux OS/ s|Linux|GNU/Linux|;
-          /Linux specific/ s|Linux|GNU/Linux|;
-          /Linux system/ s|Linux|GNU/Linux|;
-          /Under Linux/ s|Linux|GNU/Linux|;
-          /under Linux/ s|Linux|GNU/Linux|;
-          /On Linux/ s|Linux|GNU/Linux|;
-          /on Linux/ s|Linux|GNU/Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-         ' $(grep -rl Linux)
-}
-
-build() {
-  cd $srcdir/$pkgname
   . /etc/profile.d/apache-ant.sh
   ant rebuild
 }
diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch
deleted file mode 100644
index 8d4012a05..000000000
--- a/pcr/jitsi/drop-open-term-on-index-jn-html.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- www/index-jn.html	2011-01-29 08:36:48.000000000 -0200
-+++ www/index-jn.html-new	2013-05-29 01:05:48.942716248 -0300
-@@ -1,2 +1,2 @@
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
--<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Open Source  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> /     <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
-+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Free Software  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
diff --git a/pcr/jitsi/jitsi.sh b/pcr/jitsi/jitsi.sh
index 6e53cdbf5..ae544f39f 100644
--- a/pcr/jitsi/jitsi.sh
+++ b/pcr/jitsi/jitsi.sh
@@ -3,15 +3,21 @@
 CLIENTARGS=""
 uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
 
+if [[ -n ${JAVA_HOME} ]]; then
+  JAVABIN="${JAVA_HOME}/bin/java"
+else
+  JAVABIN="java"
+fi
+
 SCDIR=/usr/lib/jitsi
-LIBPATH="$SCDIR/lib"
-CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar"
-FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
-LOG_CONFIG="$LIBPATH/logging.properties"
-COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
+LIBPATH="${SCDIR}/lib"
+CLASSPATH="${LIBPATH}/felix.jar:${SCDIR}/sc-bundles/sc-launcher.jar:${SCDIR}/sc-bundles/util.jar:${SCDIR}/sc-bundles/dnsjava.jar:${LIBPATH}"
+FELIX_CONFIG="${LIBPATH}/felix.client.run.properties"
+LOG_CONFIG="${LIBPATH}/logging.properties"
+COMMAND="${JAVABIN} ${CLIENTARGS} -classpath ${CLASSPATH} -Djna.library.path=${LIBPATH}/native -Dfelix.config.properties=file:${FELIX_CONFIG} -Djava.util.logging.config.file=${LOG_CONFIG} net.java.sip.communicator.launcher.SIPCommunicator"
 
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LIBPATH}/native"
 
-cd "$SCDIR"
+cd "${SCDIR}"
 
-exec "${COMMAND[@]}" "$@"
+exec ${COMMAND} $*