diff options
Diffstat (limited to 'nonprism/jitsi')
| -rw-r--r-- | nonprism/jitsi/PKGBUILD | 14 | ||||
| -rw-r--r-- | nonprism/jitsi/nonprism.patch | 48 |
2 files changed, 31 insertions, 31 deletions
diff --git a/nonprism/jitsi/PKGBUILD b/nonprism/jitsi/PKGBUILD index d3bc07db2..8533d7ed8 100644 --- a/nonprism/jitsi/PKGBUILD +++ b/nonprism/jitsi/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# 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@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=jitsi -pkgver=2.4.4997 +pkgver=2.8.5426 pkgrel=1.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' 'mips64el') @@ -12,19 +12,19 @@ url="http://jitsi.org" license=('LGPL') replaces=(${pkgname}-nonprism) conflicts=(${pkgname}-nonprism) -depends=('jre7-openjdk') -makedepends=('apache-ant' 'jdk7-openjdk') +depends=('java-runtime') +makedepends=('apache-ant' 'java-environment') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop jitsi.sh drop-open-term-on-index-jn-html.patch nonprism.patch) -sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825' +sha256sums=('e649867e186cf195c4b1bb159d7ffe0a38c4dc60659e5c55f9a74461a309f36c' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631' - 'b66440b35108713e2ada0d8d892c870f72363a238c6c9fa9dba24e02256d5017') + 'bb3a3473fb70b6392ec3c8b400f81c18e1895b9186817401d9fca69e251223aa') prepare() { cd $srcdir/$pkgname diff --git a/nonprism/jitsi/nonprism.patch b/nonprism/jitsi/nonprism.patch index 5effbbd7d..09b446ad2 100644 --- a/nonprism/jitsi/nonprism.patch +++ b/nonprism/jitsi/nonprism.patch @@ -1,6 +1,6 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml ---- jitsi.orig/build.xml 2013-12-08 18:17:08.000000000 -0200 -+++ jitsi/build.xml 2014-04-20 01:08:28.365493685 -0300 +--- jitsi.orig/build.xml 2015-02-10 15:12:09.000000000 -0200 ++++ jitsi/build.xml 2015-05-24 11:04:12.075127164 -0300 @@ -536,7 +536,7 @@ <!--internal-target- setup testing accounts properties --> <!-- The following local file should contain a list of protocol @@ -10,7 +10,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml You should create the file based on lib/account.properties.template and set all the empty fields as indicated. --> <available property="accounts.properties.present" -@@ -774,9 +774,6 @@ +@@ -780,9 +780,6 @@ failonerror="true" classpathref="project.class.path"> @@ -20,7 +20,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- Tell felix to run Jitsi --> <sysproperty key="felix.config.properties" value="file:${lib}/felix.client.run.properties"/> -@@ -871,9 +868,6 @@ +@@ -887,9 +884,6 @@ failonerror="true" classpathref="project.class.path"> @@ -30,7 +30,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- Tell felix to run Jitsi --> <sysproperty key="felix.config.properties" value="file:${lib}/felix.client.run.properties"/> -@@ -1032,18 +1026,15 @@ +@@ -1047,19 +1041,16 @@ bundle-netaddr,bundle-netaddr-slick,bundle-slickless, bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess, bundle-fileaccess-slick,bundle-neomedia,bundle-ldap, @@ -42,18 +42,18 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml + bundle-protocol,bundle-protocol-media, + bundle-mock,bundle-smacklib,bundle-jmdnslib, bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service, - bundle-jnalib, -- bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick, + bundle-jnalib,bundle-phonenumbers, + bundle-irc-api,bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz, +- bundle-yahoo,bundle-yahoo-slick, bundle-contactlist,meta-contactlist,meta-contactlist-slick, - bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, -- bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, -- bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, + bundle-plugin-jabberaccregwizz, -+ bundle-plugin-sipaccregwizz, + bundle-plugin-sipaccregwizz, +- bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck, bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown, bundle-growlnotification,bundle-swingnotification,bundle-galagonotification, -@@ -1058,10 +1049,10 @@ +@@ -1074,10 +1065,10 @@ bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig, bundle-jfontchooserlib,bundle-update,bundle-plugin-update, bundle-plugin-simpleaccreg,bundle-plugin-generalconfig, @@ -66,7 +66,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz, bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig, bundle-plugin-advancedconfig, -@@ -1339,31 +1330,6 @@ +@@ -1368,31 +1359,6 @@ </jar> </target> @@ -78,7 +78,6 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - prefix="net/java/sip/communicator/service/googlecontacts"/> - <zipfileset dir="${dest}/net/java/sip/communicator/impl/googlecontacts" - prefix="net/java/sip/communicator/impl/googlecontacts" /> -- <zipfileset src="${lib.noinst}/google-collect-1.0-rc1.jar" prefix=""/> - <zipfileset src="${lib.noinst}/gdata-core-1.0.jar" prefix=""/> - <zipfileset src="${lib.noinst}/gdata-contacts-3.0.jar" prefix=""/> - <zipfileset src="${lib.noinst}/gdata-contacts-meta-3.0.jar" prefix=""/> @@ -86,6 +85,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - <zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/> - </jar> - </target> +- - <!--BUNDLE-GOOGLECONTACTS-SERVICE--> - <target name="bundle-googlecontacts-service"> - <jar compress="false" destfile="${bundles.dest}/googlecontacts-service.jar" @@ -95,11 +95,11 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - </jar> - </target> - - <!--BUNDLE-SERVICEBINDER --> - <target name="bundle-servicebinder"> - <jar compress="true" destfile="lib/bundle/servicebinder.jar" -@@ -1466,12 +1432,7 @@ - prefix="net/java/sip/communicator/service/protocol"/> + <target name="bundle-guava"> + <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/> + </target> +@@ -1506,12 +1472,7 @@ + </zipfileset> <zipfileset dir="${resources}/images" prefix="resources/images"> - <include name="protocol/icq/**/*"/> @@ -111,7 +111,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- the media package lives in the protocol-media bundle --> <exclude name="protocol/media/**/*"/> </zipfileset> -@@ -1519,36 +1480,6 @@ +@@ -1570,36 +1531,6 @@ </jar> </target> @@ -148,7 +148,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!--BUNDLE-MOCK-PROVIDER--> <target name="bundle-mock"> <!--internal-target- Creates a bundle containing the mock implementation of the protocol provider package --> -@@ -1582,30 +1513,6 @@ +@@ -1633,30 +1564,6 @@ </jar> </target> @@ -179,7 +179,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-SSH --> <target name="bundle-ssh"> <!-- Creates a bundle containing the SSH impl of the protocol provider.--> -@@ -1627,30 +1534,6 @@ +@@ -1678,30 +1585,6 @@ </jar> </target> @@ -210,7 +210,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-GIBBERISH --> <target name="bundle-gibberish"> <!-- Creates a bundle containing the Gibberish impl of the protocol provider.--> -@@ -1728,26 +1611,6 @@ +@@ -1779,26 +1662,6 @@ </jar> </target> @@ -237,7 +237,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-PLUGIN-JABBERACCREGWIZZ --> <target name="bundle-plugin-jabberaccregwizz"> <!-- Creates a bundle for the plugin Jabber Account Registration Wizard.--> -@@ -1758,36 +1621,6 @@ +@@ -1809,36 +1672,6 @@ </jar> </target> @@ -274,7 +274,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-PLUGIN-SIPACCREGWIZZ --> <target name="bundle-plugin-sipaccregwizz"> <!-- Creates a bundle for the plugin SIP Account Registration Wizard.--> -@@ -1839,17 +1672,6 @@ +@@ -1890,17 +1723,6 @@ </jar> </target> |