Package: libgnumail-java / 1.1.2-9

04_remove_jaf_dependency.patch Patch series | download
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
Description: Remove the explicit dependency on the Java Activation Framework
 since it's now part of the JRE.
Author: Emmanuel Bourg
Forwarded: no
--- a/build.xml
+++ b/build.xml
@@ -36,7 +36,6 @@
   <property name='providers.jar' location='gnumail-providers.jar'/>
     
   <!-- Override these for your own locations -->
-  <property name='activation.jar' location='/usr/share/java/activation.jar'/>
   <property name='inetlib.jar' location='/usr/share/java/inetlib.jar'/>
     
   <property name='META-INF' location='${dst}/META-INF'/>
@@ -52,7 +51,6 @@
 
   <path id='mail.classpath'>
     <pathelement path='${src}'/>
-    <pathelement path='${activation.jar}'/>
     <pathelement path='${inetlib.jar}'/>
   </path>
   
@@ -63,19 +61,14 @@
 
   <!-- Targets -->
   <target name='preinit'>
-    <available file='${activation.jar}' property='activation.available'/>
     <available file='${inetlib.jar}' property='inetlib.available'/>
   </target>
 
-  <target name='activation.jar.unavailable' depends='preinit' unless='activation.available'>
-    <fail message='Can&apos;t find ${activation.jar} - see INSTALL'/>
-  </target>
-
   <target name='inetlib.jar.unavailable' depends='preinit' unless='inetlib.available'>
     <fail message='Can&apos;t find ${inetlib.jar} - see INSTALL'/>
   </target>
 
-  <target name='init' depends='preinit,activation.jar.unavailable,inetlib.jar.unavailable'>
+  <target name='init' depends='preinit,inetlib.jar.unavailable'>
     <echo>WARNING: compilation using Ant is not supported, see the file INSTALL for details</echo>
     <tstamp/>
     <mkdir dir='${dst}'/>
@@ -196,7 +189,6 @@
 
   <!-- Installation -->
   <target name='install' depends='dist' description='Install the JAR files in ${install-dir}'>
-    <copy file='${activation.jar}' todir='${install-dir}'/>
     <copy file='${gnumail.jar}' todir='${install-dir}'/>
     <copy file='${providers.jar}' todir='${install-dir}'/>
   </target>