summaryrefslogtreecommitdiff
path: root/nonprism/jitsi/nonprism.patch
blob: 34f0781ae83b79ac977e7d137ce611633183d1e0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
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
@@ -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
-             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"
@@ -732,9 +732,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"/>
@@ -833,9 +830,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"/>
@@ -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,
-        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-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-aimaccregwizz,
         bundle-httputil,bundle-plugin-spellcheck,
         bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown,
         bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
@@ -949,7 +941,7 @@
         bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig,
         bundle-update,bundle-plugin-update,
         bundle-plugin-simpleaccreg,bundle-plugin-generalconfig,
-        bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service,
+        bundle-argdelegation-service,
         bundle-argdelegation,bundle-json,
         bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
         bundle-plugin-ippiaccregwizz,
@@ -1294,35 +1268,6 @@
                  token="&#34;google.api.client.secret&#34;" value="null"/>
     </target>
 
-    <!--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"
-                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}/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=""/>
-            <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>
-
-    <!--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"
@@ -1423,8 +1386,6 @@
             </zipfileset>
             <zipfileset dir="${resources}/images"
                 prefix="resources/images">
-                <include name="protocol/icq/**/*"/>
-                <include name="protocol/googletalk/**/*"/>
                 <include name="protocol/jabber/**/*"/>
                 <!-- the media package lives in the protocol-media bundle -->
                 <exclude name="protocol/media/**/*"/>
@@ -1473,36 +1434,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 -->
@@ -1612,26 +1543,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.-->