diff options
Diffstat (limited to 'nonprism/jitsi-nonprism/nonprism.patch')
-rw-r--r-- | nonprism/jitsi-nonprism/nonprism.patch | 294 |
1 files changed, 0 insertions, 294 deletions
diff --git a/nonprism/jitsi-nonprism/nonprism.patch b/nonprism/jitsi-nonprism/nonprism.patch deleted file mode 100644 index 5effbbd7d..000000000 --- a/nonprism/jitsi-nonprism/nonprism.patch +++ /dev/null @@ -1,294 +0,0 @@ -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 -@@ -536,7 +536,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 -- and usernames, ICQ uin-s and passwords, AIM screennames and etc. -+ and usernames, etc. - 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 @@ - failonerror="true" - classpathref="project.class.path"> - -- <!-- Sets the charset for the messages --> -- <!--sysproperty key="icq.custom.message.charset" value="windows-1252"/--> -- - <!-- Tell felix to run Jitsi --> - <sysproperty key="felix.config.properties" - value="file:${lib}/felix.client.run.properties"/> -@@ -871,9 +868,6 @@ - failonerror="true" - classpathref="project.class.path"> - -- <!-- Sets the charset for the messages --> -- <!--sysproperty key="icq.custom.message.charset" value="windows-1252"/--> -- - <!-- Tell felix to run Jitsi --> - <sysproperty key="felix.config.properties" - value="file:${lib}/felix.client.run.properties"/> -@@ -1032,18 +1026,15 @@ - bundle-netaddr,bundle-netaddr-slick,bundle-slickless, - bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess, - bundle-fileaccess-slick,bundle-neomedia,bundle-ldap, -- bundle-googlecontacts-service,bundle-googlecontacts, - bundle-hid-service,bundle-hid, - bundle-resource-manager,bundle-resources-defaultpack, -- bundle-protocol,bundle-protocol-media,bundle-icq, -- bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib, -+ 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-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-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 @@ - bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig, - bundle-jfontchooserlib,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-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, -@@ -1339,31 +1330,6 @@ - </jar> - </target> - -- <!--BUNDLE-GOOGLECONTACTS--> -- <target name="bundle-googlecontacts"> -- <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" -- 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=""/> -- <zipfileset src="${lib.noinst}/gdata-client-1.0.jar" prefix=""/> -- <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" -- manifest="${src}/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf"> -- <zipfileset dir="${dest}/net/java/sip/communicator/service/googlecontacts" -- prefix="net/java/sip/communicator/service/googlecontacts"/> -- </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"/> - <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> -@@ -1519,36 +1480,6 @@ - </jar> - </target> - -- <!-- BUNDLE-ICQ --> -- <target name="bundle-icq"> -- <!-- Creates a bundle containing the icq impl of the protocol provider.--> -- <jar compress="false" destfile="${bundles.dest}/protocol-icq.jar" -- manifest="${src}/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf"> -- <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/icq" -- prefix="net/java/sip/communicator/impl/protocol/icq"/> -- <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/> -- <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/> -- <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/> -- <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/> -- </jar> -- </target> -- -- <!-- BUNDLE-ICQ-SLICK --> -- <target name="bundle-icq-slick"> -- <!-- Creates a bundle containing the slick for the ICQ protocol provider.--> -- <jar compress="false" destfile="${bundles.dest}/protocol-icq-slick.jar" -- manifest="${testsrc}/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf"> -- <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/icq" -- prefix="net/java/sip/communicator/slick/protocol/icq"/> -- <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic" -- prefix="net/java/sip/communicator/slick/protocol/generic"/> -- <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/> -- <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/> -- <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/> -- <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/> -- </jar> -- </target> -- - <!--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 @@ - </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.--> -@@ -1627,30 +1534,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.--> -@@ -1728,26 +1611,6 @@ - </jar> - </target> - -- <!-- BUNDLE-PLUGIN-ICQACCREGWIZZ --> -- <target name="bundle-plugin-icqaccregwizz"> -- <!-- Creates a bundle for the plugin Icq Account Registration Wizard.--> -- <jar compress="false" destfile="${bundles.dest}/icqaccregwizz.jar" -- manifest="${src}/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf"> -- <zipfileset dir="${dest}/net/java/sip/communicator/plugin/icqaccregwizz" -- prefix="net/java/sip/communicator/plugin/icqaccregwizz"/> -- </jar> -- </target> -- -- <!-- BUNDLE-PLUGIN-AIMACCREGWIZZ --> -- <target name="bundle-plugin-aimaccregwizz"> -- <!-- Creates a bundle for the plugin Aim Account Registration Wizard.--> -- <jar compress="false" destfile="${bundles.dest}/aimaccregwizz.jar" -- manifest="${src}/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf"> -- <zipfileset dir="${dest}/net/java/sip/communicator/plugin/aimaccregwizz" -- prefix="net/java/sip/communicator/plugin/aimaccregwizz"/> -- </jar> -- </target> -- - <!-- BUNDLE-PLUGIN-JABBERACCREGWIZZ --> - <target name="bundle-plugin-jabberaccregwizz"> - <!-- Creates a bundle for the plugin Jabber Account Registration Wizard.--> -@@ -1758,36 +1621,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.--> -@@ -1839,17 +1672,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.--> |