From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 25 Nov 2007 13:49:03 +0000 (+0000)
Subject: - updated
X-Git-Tag: Azureus-2_5_0_0-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2FAzureus.git;a=commitdiff_plain;h=60cdbe98cad46664e9cedfb101f7bc732e1abd0c

- updated

Changed files:
    Azureus-buildfile.patch -> 1.2
    Azureus-nomacosx.patch -> 1.2
---

diff --git a/Azureus-buildfile.patch b/Azureus-buildfile.patch
index c0d7a00..e66477d 100644
--- a/Azureus-buildfile.patch
+++ b/Azureus-buildfile.patch
@@ -1,125 +1,38 @@
---- build.xml	2005-10-25 07:21:00.000000000 +0200
-+++ build.xml.new	2005-11-23 19:57:23.000000000 +0100
-@@ -1,61 +1,61 @@
--<?xml version="1.0"?>
--
--<project default="jar" name="Azureus" basedir=".">
--
--   <property name="root.dir" value="." />  <!-- REMINDER: this needs to be "." for public source -->
--   <property name="libs.dir" value="build/libs" />
--   <property name="dist.dir" value="dist" />
--   
--   <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc **/.classpath **/.project **/aereg.lib **/aereg.dll" />
--   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
--   <!-- <property name="dist.source.excludes" value="${generic.excludes} **/*.class" /> -->
--   
--   
--   <target name="init" >
--      <echo message="Building Azureus2.jar..." />
--
--      <tstamp/>
--
--      <!-- <condition property="libs.dir" value="build/libs">
--         <not>  <isset property="libs.dir" />  </not>
--      </condition> -->
--       
--      <mkdir dir="${root.dir}/${dist.dir}" />
--   </target>
--
--   
--   <target name="compile" depends="init" >
--      <path id="libs.classpath">
--         <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
--      </path>
--   
--   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
--         <classpath refid="libs.classpath" />
--      </javac>
--   </target>
--
--
--   <target name="jar" depends="compile" >
--      <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
--         <manifest>
--            <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
--            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
--         </manifest>
--      </jar>
--      
--      <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="." excludes="${dist.source.excludes}" /> -->
--
--   </target>
--
--
--   <target name="clean" >
--      <delete quiet="true" >
--         <fileset dir="${root.dir}/com" includes="**/*.class"/>
--         <fileset dir="${root.dir}/org" includes="**/*.class"/>
--      </delete>
--      
--      <delete dir="${root.dir}/${dist.dir}" />
--   </target>
--
--</project>
--
-+<?xml version="1.0"?>
-+
-+<project default="jar" name="Azureus" basedir=".">
-+
-+   <property name="root.dir" value="." />  <!-- REMINDER: this needs to be "." for public source -->
-+   <property name="dist.dir" value="dist" />
-+   
-+   <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc **/.classpath **/.project **/aereg.lib **/aereg.dll" />
-+   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
-+   <!-- <property name="dist.source.excludes" value="${generic.excludes} **/*.class" /> -->
-+   
-+   
-+   <target name="init" >
-+      <echo message="Building Azureus2.jar..." />
-+
-+      <tstamp/>
-+
-+      <!-- <condition property="libs.dir" value="build/libs">
-+         <not>  <isset property="libs.dir" />  </not>
-+      </condition> -->
-+       
-+      <mkdir dir="${root.dir}/${dist.dir}" />
-+   </target>
-+
-+   
-+   <target name="compile" depends="init" >
-+   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
+--- Azureus-2.5.0.0/build.xml	2007-11-25 15:39:47.995219783 +0200
++++ Azureus-2.5.0.0-new/build.xml	2007-11-25 15:34:51.796673927 +0200
+@@ -3,7 +3,6 @@
+ <project default="jar" name="Azureus" basedir=".">
+ 
+    <property name="root.dir" value="." />  <!-- REMINDER: this needs to be "." for public source -->
+-   <property name="libs.dir" value="build/libs" />
+    <property name="dist.dir" value="dist" />
+    
+    <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc **/.classpath **/.project **/aereg.lib **/aereg.dll" />
+@@ -25,12 +24,13 @@
+ 
+    
+    <target name="compile" depends="init" >
+-      <path id="libs.classpath">
+-         <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
+-      </path>
+-   
+    	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
+-         <classpath refid="libs.classpath" />
 +         <classpath>
 +	    <pathelement location="/usr/share/java/swt.jar"/>
 +	    <pathelement location="/usr/share/java/commons-cli.jar"/>
 +	    <pathelement location="/usr/share/java/log4j.jar"/>
 +	    <pathelement location="/usr/share/java/junit.jar"/>
 +	 </classpath>
-+      </javac>
-+   </target>
-+
-+
-+   <target name="jar" depends="compile" >
-+      <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
-+         <manifest>
-+            <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
+       </javac>
+    </target>
+ 
+@@ -39,7 +39,7 @@
+       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
+          <manifest>
+             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
+-            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
 +            <attribute name="Class-Path" value="Azureus2.jar commons-cli.jar log4j.jar swt.jar" />
-+         </manifest>
-+      </jar>
-+      
-+      <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="." excludes="${dist.source.excludes}" /> -->
-+
-+   </target>
-+
-+
-+   <target name="clean" >
-+      <delete quiet="true" >
-+         <fileset dir="${root.dir}/com" includes="**/*.class"/>
-+         <fileset dir="${root.dir}/org" includes="**/*.class"/>
-+      </delete>
-+      
-+      <delete dir="${root.dir}/${dist.dir}" />
-+   </target>
-+
-+</project>
-+
+          </manifest>
+       </jar>
+       
diff --git a/Azureus-nomacosx.patch b/Azureus-nomacosx.patch
index 496b168..2e46e0a 100644
--- a/Azureus-nomacosx.patch
+++ b/Azureus-nomacosx.patch
@@ -1,10 +1,52 @@
---- Azureus.old/org/gudy/azureus2/platform/PlatformManagerFactory.java	2006-03-08 17:34:20.000000000 +0100
-+++ Azureus/org/gudy/azureus2/platform/PlatformManagerFactory.java	2006-03-08 19:15:36.000000000 +0100
-@@ -52,7 +52,6 @@
- 						
- 					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
- 						
--	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
- 	                    
- 					}
- 				}catch( PlatformManagerException e ){
+--- Azureus-2.5.0.0/org/gudy/azureus2/platform/PlatformManagerFactory.java	2007-11-25 15:39:42.205443677 +0200
++++ Azureus-2.5.0.0-new/org/gudy/azureus2/platform/PlatformManagerFactory.java	2007-11-25 15:38:20.288611441 +0200
+@@ -43,33 +43,8 @@
+ 		try{
+ 			class_mon.enter();
+ 		
+-			if ( platform_manager == null ){
+-										  
+-				try{
+-					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
+-						
+-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
+-						
+-					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
+-						
+-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
+-	                    
+-					}
+-				}catch( PlatformManagerException e ){
+-					
+-						// exception will already have been logged
+-					
+-				}catch( Throwable e ){
+-					
+-					Debug.printStackTrace(e);
+-				}
+-			}
+-			
+-			if ( platform_manager == null ){
+-				
+-				platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
+-			}
+-			
++			platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
++
+ 			return( platform_manager );
+ 			
+ 		}finally{
+--- Azureus-2.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2007-11-25 15:39:46.665271213 +0200
++++ Azureus-2.5.0.0-new/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2007-11-25 15:34:51.806673540 +0200
+@@ -131,11 +131,6 @@
+    					"azbpcorepatcher", 
+    					"CorePatcher",
+ 					"true" },
+-	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
+-   					"org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker", 
+-   					"azplatform2", 
+-   					"azplatform2",
+-					"true" },
+ 	   		//{	 PluginManagerDefaults.PID_JPC, 
+ 				//	"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
+ 				//	"azjpc",