From 3c60dc441742cf6f9290b8c3a7194894857e3588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 25 May 2015 11:02:44 -0300 Subject: jitsi-2.8.5426-1.nonprism1: updating version --- nonprism/jitsi/PKGBUILD | 14 ++++++------- 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 -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Contributor (Arch): Xavier Devlamynck +# Contributor (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne # Maintainer: André Silva # Contributor: Márcio Silva 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 @@ @@ -20,7 +20,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -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 -@@ -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 @@ @@ -78,7 +78,6 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - prefix="net/java/sip/communicator/service/googlecontacts"/> - -- - - - @@ -86,6 +85,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - - - +- - - - - - - - - + + + +@@ -1506,12 +1472,7 @@ + - @@ -111,7 +111,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -1519,36 +1480,6 @@ +@@ -1570,36 +1531,6 @@ @@ -148,7 +148,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -1582,30 +1513,6 @@ +@@ -1633,30 +1564,6 @@ @@ -179,7 +179,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -1627,30 +1534,6 @@ +@@ -1678,30 +1585,6 @@ @@ -210,7 +210,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -1728,26 +1611,6 @@ +@@ -1779,26 +1662,6 @@ @@ -237,7 +237,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -1758,36 +1621,6 @@ +@@ -1809,36 +1672,6 @@ @@ -274,7 +274,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml -@@ -1839,17 +1672,6 @@ +@@ -1890,17 +1723,6 @@ -- cgit v1.1-4-g5e80