nonprism/jitsi: updated to 2.10.5550

1 files changed, 25 insertions, 147 deletions

diff --git a/nonprism/jitsi/nonprism.patch b/nonprism/jitsi/nonprism.patch
index 09b446ad2..34f0781ae 100644
--- a/nonprism/jitsi/nonprism.patch
+++ b/nonprism/jitsi/nonprism.patch
@@ -1,7 +1,7 @@
 diff -Nur jitsi.orig/build.xml jitsi/build.xml
 --- 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 @@
+@@ -503,7 +503,7 @@
          <!--internal-target- setup testing accounts properties -->
          <!-- The following local file should contain a list of protocol
               account initialization properties, such as SIP server addresses
@@ -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"
-@@ -780,9 +780,6 @@
+@@ -732,9 +732,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"/>
-@@ -887,9 +884,6 @@
+@@ -833,9 +830,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"/>
-@@ -1047,19 +1041,16 @@
+@@ -922,18 +916,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,36 +42,31 @@ 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-phonenumbers,
-         bundle-irc-api,bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
--        bundle-yahoo,bundle-yahoo-slick,
+         bundle-phonenumbers,
+         bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
          bundle-contactlist,meta-contactlist,meta-contactlist-slick,
 -        bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
 +        bundle-plugin-jabberaccregwizz,
          bundle-plugin-sipaccregwizz,
--        bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz,
-         bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck,
+-        bundle-plugin-aimaccregwizz,
+         bundle-httputil,bundle-plugin-spellcheck,
          bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown,
          bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
-@@ -1074,10 +1065,10 @@
+@@ -949,7 +941,7 @@
          bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig,
-         bundle-jfontchooserlib,bundle-update,bundle-plugin-update,
+         bundle-update,bundle-plugin-update,
          bundle-plugin-simpleaccreg,bundle-plugin-generalconfig,
 -        bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service,
 +        bundle-argdelegation-service,
-         bundle-argdelegation,bundle-zrtp4j,bundle-sdes4j,bundle-json,
+         bundle-argdelegation,bundle-json,
          bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
--        bundle-plugin-facebookaccregwizz,bundle-plugin-ippiaccregwizz,
-+        bundle-plugin-ippiaccregwizz,
-         bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
-         bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig,
-         bundle-plugin-advancedconfig,
-@@ -1368,31 +1359,6 @@
-         </jar>
+         bundle-plugin-ippiaccregwizz,
+@@ -1294,35 +1268,6 @@
+                  token="&#34;google.api.client.secret&#34;" value="null"/>
      </target>
  
 -    <!--BUNDLE-GOOGLECONTACTS-->
--    <target name="bundle-googlecontacts">
+-    <target name="bundle-googlecontacts" depends="bundle-httputil,bundle-browserlauncher">
 -        <jar compress="false" destfile="${bundles.dest}/googlecontacts.jar"
 -            manifest="${src}/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf">
 -            <zipfileset dir="${dest}/net/java/sip/communicator/service/googlecontacts"
@@ -83,6 +78,10 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
 -            <zipfileset src="${lib.noinst}/gdata-contacts-meta-3.0.jar" prefix=""/>
 -            <zipfileset src="${lib.noinst}/gdata-client-1.0.jar" prefix=""/>
 -            <zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/google-oauth-client-1.20.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/google-http-client-1.20.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/google-http-client-jackson2-1.20.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/jackson-core-2.5.3.jar" prefix=""/>
 -        </jar>
 -    </target>
 -
@@ -95,23 +94,19 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
 -        </jar>
 -    </target>
 -
-     <target name="bundle-guava">
-         <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
-     </target>
-@@ -1506,12 +1472,7 @@
+     <!--BUNDLE-SERVICEBINDER -->
+     <target name="bundle-servicebinder">
+         <jar compress="true" destfile="lib/bundle/servicebinder.jar"
+@@ -1423,8 +1386,6 @@
              </zipfileset>
              <zipfileset dir="${resources}/images"
                  prefix="resources/images">
 -                <include name="protocol/icq/**/*"/>
 -                <include name="protocol/googletalk/**/*"/>
--                <include name="protocol/facebook/**/*"/>
                  <include name="protocol/jabber/**/*"/>
--                <include name="protocol/msn/**/*"/>
--                <include name="protocol/yahoo/**/*"/>
                  <!-- the media package lives in the protocol-media bundle -->
                  <exclude name="protocol/media/**/*"/>
-             </zipfileset>
-@@ -1570,36 +1531,6 @@
+@@ -1473,36 +1434,6 @@
          </jar>
      </target>
  
@@ -148,69 +143,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 -->
-@@ -1633,30 +1564,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-MSN -->
--    <target name="bundle-msn">
--        <!-- Creates a bundle containing the msn impl of the protocol provider.-->
--        <jar compress="false" destfile="${bundles.dest}/protocol-msn.jar"
--            manifest="${src}/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/msn"
--                prefix="net/java/sip/communicator/impl/protocol/msn"/>
--            <zipfileset src="${lib.noinst}/jml-1.0b5.jar" prefix=""/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-MSN-SLICK -->
--    <!-- Creates a bundle containing the slick for the Msn protocol provider.-->
--    <target name="bundle-msn-slick">
--        <jar compress="false" destfile="${bundles.dest}/protocol-msn-slick.jar"
--            manifest="${testsrc}/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/msn"
--                prefix="net/java/sip/communicator/slick/protocol/msn"/>
--            <zipfileset src="${lib.noinst}/jml-1.0b5.jar" prefix=""/>
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic"
--                prefix="net/java/sip/communicator/slick/protocol/generic"/>
--        </jar>
--    </target>
--
-     <!-- BUNDLE-SSH -->
-     <target name="bundle-ssh">
-         <!-- Creates a bundle containing the SSH impl of the protocol provider.-->
-@@ -1678,30 +1585,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-YAHOO -->
--    <target name="bundle-yahoo">
--        <!-- Creates a bundle containing the yahoo impl of the protocol provider.-->
--        <jar compress="false" destfile="${bundles.dest}/protocol-yahoo.jar"
--            manifest="${src}/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/yahoo"
--                prefix="net/java/sip/communicator/impl/protocol/yahoo"/>
--            <zipfileset src="${lib.noinst}/ymsg_network_v0_67.jar" prefix=""/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-YAHOO-SLICK -->
--    <!-- Creates a bundle containing the slick for the Yahoo protocol provider.-->
--    <target name="bundle-yahoo-slick">
--        <jar compress="false" destfile="${bundles.dest}/protocol-yahoo-slick.jar"
--            manifest="${testsrc}/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/yahoo"
--                prefix="net/java/sip/communicator/slick/protocol/yahoo"/>
--            <zipfileset src="${lib.noinst}/ymsg_network_v0_67.jar" prefix=""/>
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic"
--                prefix="net/java/sip/communicator/slick/protocol/generic"/>
--        </jar>
--    </target>
--
-     <!-- BUNDLE-GIBBERISH -->
-     <target name="bundle-gibberish">
-         <!-- Creates a bundle containing the Gibberish impl of the protocol provider.-->
-@@ -1779,26 +1662,6 @@
+@@ -1612,26 +1543,6 @@
          </jar>
      </target>
  
@@ -237,58 +170,3 @@ 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.-->
-@@ -1809,36 +1672,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-PLUGIN-GOOGLETALKACCREGWIZZ -->
--    <target name="bundle-plugin-googletalkaccregwizz">
--        <!-- Creates a bundle for the plugin Google Talk Account Registration Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/googletalkaccregwizz.jar"
--            manifest="${src}/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/googletalkaccregwizz"
--                prefix="net/java/sip/communicator/plugin/googletalkaccregwizz"/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-PLUGIN-MSNACCREGWIZZ -->
--    <target name="bundle-plugin-msnaccregwizz">
--        <!-- Creates a bundle for the plugin Msn Account Registration Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/msnaccregwizz.jar"
--            manifest="${src}/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/msnaccregwizz"
--                prefix="net/java/sip/communicator/plugin/msnaccregwizz"/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-PLUGIN-YAHOOACCREGWIZZ -->
--    <target name="bundle-plugin-yahooaccregwizz">
--        <!-- Creates a bundle for the plugin Yahoo Account Registration Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/yahooaccregwizz.jar"
--            manifest="${src}/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/yahooaccregwizz"
--                prefix="net/java/sip/communicator/plugin/yahooaccregwizz"/>
--        </jar>
--    </target>
--
-     <!-- BUNDLE-PLUGIN-SIPACCREGWIZZ -->
-     <target name="bundle-plugin-sipaccregwizz">
-         <!-- Creates a bundle for the plugin SIP Account Registration Wizard.-->
-@@ -1890,17 +1723,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-PLUGIN-FACEBOOKACCREGWIZZ -->
--    <target name="bundle-plugin-facebookaccregwizz">
--        <!-- Creates a bundle for the plugin Facebook Account Registration
--             Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/facebookaccregwizz.jar"
--                manifest="${src}/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/facebookaccregwizz"
--                    prefix="net/java/sip/communicator/plugin/facebookaccregwizz" />
--        </jar>
--    </target>
--
-     <!-- BUNDLE-SERVICEIMPL-VERSION -->
-     <target name="bundle-version-impl">
-         <!-- Creates a bundle for the version service impl.-->