rpms/azureus/devel azureus-ConfigSectionPlugins-swt-3.1.patch, NONE, 1.1 azureus-Messages-swt-3.1.patch, NONE, 1.1 azureus-TableView-swt-3.1.patch, NONE, 1.1 azureus-no-install-remove-plugins.patch, NONE, 1.1 azureus-rh-bugzilla-180418.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 azureus-base64.patch, 1.1, 1.2 azureus-cache-size.patch, 1.1, 1.2 azureus-no-bouncycastle.patch, 1.1, 1.2 azureus-no-shared-plugins.patch, 1.1, 1.2 azureus-remove-manifest-classpath.patch, 1.1, 1.2 azureus-remove-win32-PlatformManagerUpdateChecker.patch, 1.1, 1.2 azureus-remove-win32-osx-platforms.patch, 1.1, 1.2 azureus-themed.patch, 1.1, 1.2 azureus.script, 1.5, 1.6 azureus.spec, 1.12, 1.13 sources, 1.2, 1.3
Anthony Green (green)
fedora-extras-commits at redhat.com
Thu Feb 9 08:45:08 UTC 2006
Author: green
Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16514
Modified Files:
.cvsignore azureus-base64.patch azureus-cache-size.patch
azureus-no-bouncycastle.patch azureus-no-shared-plugins.patch
azureus-remove-manifest-classpath.patch
azureus-remove-win32-PlatformManagerUpdateChecker.patch
azureus-remove-win32-osx-platforms.patch azureus-themed.patch
azureus.script azureus.spec sources
Added Files:
azureus-ConfigSectionPlugins-swt-3.1.patch
azureus-Messages-swt-3.1.patch azureus-TableView-swt-3.1.patch
azureus-no-install-remove-plugins.patch
azureus-rh-bugzilla-180418.patch
Log Message:
Upgrade to cvs snapshot of 2.3.0.7 (or will it be 2.4.0.0?). Many changes.
azureus-ConfigSectionPlugins-swt-3.1.patch:
--- NEW FILE azureus-ConfigSectionPlugins-swt-3.1.patch ---
--- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.~1.7.~ 2005-12-21 07:34:08.000000000 -0800
+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java 2006-01-25 14:40:42.000000000 -0800
@@ -373,12 +373,6 @@
tc.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
boolean ascending = comparator.setField(table.indexOf(tc));
- try {
- table.setSortColumn(tc);
- table.setSortDirection(ascending ? SWT.UP : SWT.DOWN);
- } catch (NoSuchMethodError ignore) {
- // Ignore Pre 3.0
- }
Collections.sort(pluginIFs, comparator);
table.clearAll();
}
azureus-Messages-swt-3.1.patch:
--- NEW FILE azureus-Messages-swt-3.1.patch ---
--- org/gudy/azureus2/ui/swt/Messages.java.orig 2006-01-31 10:12:35.000000000 -0500
+++ org/gudy/azureus2/ui/swt/Messages.java 2006-02-07 16:14:10.000000000 -0500
@@ -203,23 +203,6 @@
((ToolItem)widget).setToolTipText(toolTip);
}
}
- } else if (widget instanceof TableColumn) {
- String key = (String) widget.getData();
- if (key != null) {
- if (!key.endsWith(".info"))
- key += ".info";
- String toolTip = MessageText.getString(key, (String) null);
- if (toolTip == null)
- toolTip = MessageText.getString(key.substring(0, key.length() - 5),
- (String) null);
- if (toolTip != null) {
- try {
- ((TableColumn) widget).setToolTipText(toolTip);
- } catch (NoSuchMethodError e) {
- // Pre SWT 3.2
- }
- }
- }
}
}
azureus-TableView-swt-3.1.patch:
--- NEW FILE azureus-TableView-swt-3.1.patch ---
--- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/TableView.java.~1.81.~ 2006-01-23 07:42:54.000000000 -0800
+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/TableView.java 2006-01-25 14:49:25.000000000 -0800
@@ -2672,27 +2672,7 @@
}
private void changeColumnIndicator() {
- if (table == null || table.isDisposed())
- return;
-
- try {
- // can't use TableColumnCore.getPosition, because user may have moved
- // columns around, messing up the SWT column indexes.
- // We can either use search columnsOrdered, or search table.getColumns()
- TableColumn[] tcs = table.getColumns();
- for (int i = 0; i < tcs.length; i++) {
- String sName = (String)tcs[i].getData("Name");
- if (sName != null && sName.equals(rowSorter.sColumnName)) {
- table.setSortDirection(rowSorter.bAscending ? SWT.UP : SWT.DOWN);
- table.setSortColumn(tcs[i]);
- return;
- }
- }
-
- table.setSortColumn(null);
- } catch (NoSuchMethodError e) {
- // sWT < 3.2 doesn't have column indicaters
- }
+ return;
}
private void visibleRowsChanged() {
azureus-no-install-remove-plugins.patch:
--- NEW FILE azureus-no-install-remove-plugins.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.~1.58.~ 2006-01-31 14:43:47.000000000 -0500
+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-02-09 00:05:11.000000000 -0500
@@ -347,26 +347,6 @@
menu_plugin.setMenu(pluginMenu);
if(notMainWindow) {performOneTimeDisable(menu_plugin, true);}
- new MenuItem(pluginMenu, SWT.SEPARATOR);
-
- MenuItem plugins_install_wizard = new MenuItem(pluginMenu, SWT.NULL);
- KeyBindings.setAccelerator(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins");
- Messages.setLanguageText(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins"); //$NON-NLS-1$
- plugins_install_wizard.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- new InstallPluginWizard(mainWindow.getAzureusCore(), display);
- }
- });
-
- MenuItem plugins_uninstall_wizard = new MenuItem(pluginMenu, SWT.NULL);
- KeyBindings.setAccelerator(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins");
- Messages.setLanguageText(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins"); //$NON-NLS-1$
- plugins_uninstall_wizard.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- new UnInstallPluginWizard(mainWindow.getAzureusCore(), display);
- }
- });
-
// standard items
if(Constants.isOSX) {
// Window menu
@@ -452,18 +432,6 @@
new MenuItem(helpMenu,SWT.SEPARATOR);
- if ( !SystemProperties.isJavaWebStartInstance()){
- MenuItem help_checkupdate = new MenuItem(helpMenu, SWT.NULL);
- KeyBindings.setAccelerator(help_checkupdate, "MainWindow.menu.help.checkupdate");
- Messages.setLanguageText(help_checkupdate, "MainWindow.menu.help.checkupdate"); //$NON-NLS-1$
- help_checkupdate.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- mainWindow.getShell().setFocus();
- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck();
- }
- });
- }
-
MenuItem help_donate = new MenuItem(helpMenu, SWT.NULL);
Messages.setLanguageText(help_donate, "MainWindow.menu.help.donate"); //$NON-NLS-1$
help_donate.addListener(SWT.Selection, new Listener() {
azureus-rh-bugzilla-180418.patch:
--- NEW FILE azureus-rh-bugzilla-180418.patch ---
--- build.xml~ 2006-02-08 08:05:29.000000000 -0500
+++ build.xml 2006-02-08 08:04:50.000000000 -0500
@@ -29,7 +29,7 @@
<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" >
+ <javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.3" target="1.3" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
<classpath refid="libs.classpath" />
</javac>
</target>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jan 2006 23:08:02 -0000 1.2
+++ .cvsignore 9 Feb 2006 08:45:07 -0000 1.3
@@ -1 +1 @@
-Azureus_2.3.0.6_source_nocrypto.zip
+azureus2-cvs-20060207.tar.gz
azureus-base64.patch:
Index: azureus-base64.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-base64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-base64.patch 19 Jan 2006 23:08:02 -0000 1.1
+++ azureus-base64.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,14 +1,3 @@
---- com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java~ 2005-11-22 12:07:30.000000000 -0800
-+++ com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java 2006-01-17 21:56:00.000000000 -0800
-@@ -43,7 +43,7 @@
- import com.aelitis.net.udp.PRUDPPacketRequest;
- import com.aelitis.net.udp.PRUDPRequestHandler;
-
--import org.bouncycastle.util.encoders.Base64;
-+import gnu.crypto.util.Base64;
-
- public class
- PRUDPPacketHandlerImpl
--- org/gudy/azureus2/ui/console/util/StringEncrypter.java~ 2005-10-14 04:43:14.000000000 -0700
+++ org/gudy/azureus2/ui/console/util/StringEncrypter.java 2006-01-17 21:56:24.000000000 -0800
@@ -12,7 +12,7 @@
azureus-cache-size.patch:
Index: azureus-cache-size.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-cache-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-cache-size.patch 19 Jan 2006 23:08:02 -0000 1.1
+++ azureus-cache-size.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,11 +1,11 @@
---- org/gudy/azureus2/core3/config/COConfigurationManager.java~ 2005-10-05 11:27:44.000000000 -0700
-+++ org/gudy/azureus2/core3/config/COConfigurationManager.java 2006-01-18 19:49:48.000000000 -0800
+--- org/gudy/azureus2/core3/config/COConfigurationManager.java.~1.34.~ 2006-01-19 21:27:18.000000000 -0500
++++ org/gudy/azureus2/core3/config/COConfigurationManager.java 2006-02-09 00:01:46.000000000 -0500
@@ -39,7 +39,7 @@
- public static final int CONFIG_CACHE_SIZE_MAX_MB;
-
- static{
-- long max_mem_bytes = Runtime.getRuntime().maxMemory();
-+ long max_mem_bytes = Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
- long mb_1 = 1*1024*1024;
- long mb_32 = 32*mb_1;
- CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);
+ public static final int CONFIG_CACHE_SIZE_MAX_MB;
+
+ static{
+- long max_mem_bytes = Runtime.getRuntime().maxMemory();
++ long max_mem_bytes = Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
+ long mb_1 = 1*1024*1024;
+ long mb_32 = 32*mb_1;
+ CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);
azureus-no-bouncycastle.patch:
Index: azureus-no-bouncycastle.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-bouncycastle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-bouncycastle.patch 19 Jan 2006 23:08:02 -0000 1.1
+++ azureus-no-bouncycastle.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,21 +1,11 @@
---- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~ 2006-01-17 21:58:55.000000000 -0800
-+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java 2006-01-17 22:20:05.000000000 -0800
-@@ -94,7 +94,7 @@
- }
-
- try{
-- SESecurityManagerBC.initialise();
-+ // SESecurityManagerBC.initialise();
-
- }catch( Throwable e ){
-
-@@ -505,7 +505,8 @@
-
- throws Exception
- {
-- return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
-+ // return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
-+ return null;
- }
-
- public boolean
+--- org/gudy/azureus2/core3/config/COConfigurationManager.java.orig 2006-01-19 18:27:18.000000000 -0800
++++ org/gudy/azureus2/core3/config/COConfigurationManager.java 2006-01-25 12:14:49.000000000 -0800
+@@ -39,7 +39,7 @@
+ public static final int CONFIG_CACHE_SIZE_MAX_MB;
+
+ static{
+- long max_mem_bytes = Runtime.getRuntime().maxMemory();
++ long max_mem_bytes = Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
+ long mb_1 = 1*1024*1024;
+ long mb_32 = 32*mb_1;
+ CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);
azureus-no-shared-plugins.patch:
Index: azureus-no-shared-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-shared-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-shared-plugins.patch 28 Jan 2006 21:35:57 -0000 1.1
+++ azureus-no-shared-plugins.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,36 +1,30 @@
---- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java~ 2005-11-22 14:28:02.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java 2006-01-27 23:12:16.000000000 -0500
-@@ -237,21 +237,15 @@
- }
-
- public boolean
-- isNextEnabled()
-+ isFinishEnabled()
- {
- return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
- }
-
-- public boolean
-- isFinishEnabled()
-- {
-- return false ;
-+ public IWizardPanel getFinishPanel() {
-+ return new IPWFinishPanel(wizard,this);
- }
-
-- public IWizardPanel getNextPanel() {
-- return new IPWInstallModePanel(wizard,this);
-- }
--
- public void updateList() {
- ArrayList list = new ArrayList();
- TableItem[] items = pluginList.getItems();
-@@ -261,7 +255,7 @@
- }
- }
- ((InstallPluginWizard)wizard).setPluginList(list);
-- ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
-+ ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
-
- }
- }
+--- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java 2006-02-08 17:17:47.000000000 -0500
++++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java.orig 2005-12-13 02:37:15.000000000 -0500
+@@ -237,14 +237,14 @@
+ }
+
+ public boolean
+- isNextEnabled()
++ isFinishEnabled()
+ {
+ return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
+ }
+
+- public IWizardPanel getNextPanel() {
+- return new IPWInstallModePanel(wizard,this);
+- }
++ public IWizardPanel getFinishPanel() {
++ return new IPWFinishPanel(wizard,this);
++ }
+
+ public void updateList() {
+ ArrayList list = new ArrayList();
+@@ -255,7 +255,7 @@
+ }
+ }
+ ((InstallPluginWizard)wizard).setPluginList(list);
++ ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
+- ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
+
+ }
+ }
azureus-remove-manifest-classpath.patch:
Index: azureus-remove-manifest-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-manifest-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-remove-manifest-classpath.patch 19 Jan 2006 23:08:02 -0000 1.1
+++ azureus-remove-manifest-classpath.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,10 +1,10 @@
---- build.xml~ 2005-10-25 07:21:24.000000000 -0700
-+++ build.xml 2006-01-19 06:39:07.000000000 -0800
+--- build.xml.orig 2005-10-25 05:22:46.000000000 -0700
++++ build.xml 2006-01-25 12:16:32.000000000 -0800
@@ -39,7 +39,6 @@
- <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>
-
+ <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>
+
azureus-remove-win32-PlatformManagerUpdateChecker.patch:
Index: azureus-remove-win32-PlatformManagerUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-win32-PlatformManagerUpdateChecker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-remove-win32-PlatformManagerUpdateChecker.patch 19 Jan 2006 23:08:02 -0000 1.1
+++ azureus-remove-win32-PlatformManagerUpdateChecker.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,14 +1,14 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java~ 2005-10-18 17:40:06.000000000 -0700
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2005-12-17 19:19:51.000000000 -0800
-@@ -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",
+--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig 2006-01-11 09:05:48.000000000 -0800
++++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2006-01-25 11:51:54.000000000 -0800
+@@ -133,11 +133,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",
azureus-remove-win32-osx-platforms.patch:
Index: azureus-remove-win32-osx-platforms.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-win32-osx-platforms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-remove-win32-osx-platforms.patch 19 Jan 2006 23:08:02 -0000 1.1
+++ azureus-remove-win32-osx-platforms.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,31 +1,36 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java~ 2005-09-12 14:00:06.000000000 -0700
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2005-12-17 12:35:09.000000000 -0800
-@@ -44,28 +44,6 @@
- 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();
- }
+--- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig 2005-09-12 12:00:07.000000000 -0700
++++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2006-01-25 11:25:11.000000000 -0800
+@@ -43,32 +43,7 @@
+ 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 );
+
azureus-themed.patch:
Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-themed.patch 26 Jan 2006 07:34:09 -0000 1.1
+++ azureus-themed.patch 9 Feb 2006 08:45:07 -0000 1.2
@@ -1,111 +1,111 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java~ 2006-01-25 23:03:14.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-01-25 23:08:05.000000000 -0800
-@@ -18,6 +18,8 @@
- import java.io.ByteArrayOutputStream;
- import java.io.File;
- import java.io.InputStream;
-+import java.io.FileInputStream;
-+import java.io.FileNotFoundException;
- import java.util.*;
-
- /**
-@@ -45,6 +47,25 @@
- loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
- }
-
-+ private static org.gnu.gtk.IconTheme iconTheme;
-+
-+ public static String getThemedIcon (String name, String def)
-+ {
-+ try
-+ {
-+ if (iconTheme == null)
-+ iconTheme = org.gnu.gtk.IconTheme.getDefault();
-+
-+ return iconTheme.lookupIcon (name, 24,
-+ org.gnu.gtk.IconLookupFlags.NO_SVG)
-+ .getFilename();
-+ }
-+ catch (Exception ex)
-+ {
-+ return def;
-+ }
-+ }
-+
- public static void loadImages(Display display) {
- loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
- loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
-@@ -88,20 +109,44 @@
- //ToolBar Icons
-
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
-+ loadImage(display,
-+ getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"),
-+ "cb_open_no_default");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
-+ loadImage(display,
-+ getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"),
-+ "cb_new");
-+ loadImage(display,
-+ getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"),
-+ "cb_up");
-+ loadImage(display,
-+ getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
-+ "cb_down");
-+ loadImage(display,
-+ getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"),
-+ "cb_top");
-+ loadImage(display,
-+ getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"),
-+ "cb_bottom");
-+ loadImage(display,
-+ getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"),
-+ "cb_run");
-+ loadImage(display,
-+ getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"),
-+ "cb_start");
-+ loadImage(display,
-+ getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"),
-+ "cb_stop");
-+ loadImage(display,
-+ getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"),
-+ "cb_remove");
-+ loadImage(display,
-+ getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"),
-+ "cb_host");
-+ loadImage(display,
-+ getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"),
-+ "cb_publish");
-
- //Status icons
- loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
-@@ -138,6 +183,16 @@
- Image im = getImage(name,false);
- if(null == im) {
- InputStream is = loader.getResourceAsStream(res);
-+ if (is == null)
-+ {
-+ try
-+ {
-+ is = new FileInputStream (res);
-+ }
-+ catch (FileNotFoundException fnf)
-+ {
-+ }
-+ }
- if(null != is) {
- if(alpha == 255) {
- im = new Image(display, is);
+--- org/gudy/azureus2/ui/swt/ImageRepository.java~ 2006-01-25 20:28:17.000000000 -0800
++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-01-25 20:28:27.000000000 -0800
+@@ -16,6 +16,8 @@
+ import java.io.ByteArrayOutputStream;
+ import java.io.File;
+ import java.io.InputStream;
++import java.io.FileInputStream;
++import java.io.FileNotFoundException;
+ import java.util.*;
+
+ /**
+@@ -43,6 +45,25 @@
+ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
+ }
+
++ private static org.gnu.gtk.IconTheme iconTheme;
++
++ public static String getThemedIcon (String name, String def)
++ {
++ try
++ {
++ if (iconTheme == null)
++ iconTheme = org.gnu.gtk.IconTheme.getDefault();
++
++ return iconTheme.lookupIcon (name, 24,
++ org.gnu.gtk.IconLookupFlags.NO_SVG)
++ .getFilename();
++ }
++ catch (Exception ex)
++ {
++ return def;
++ }
++ }
++
+ public static void loadImages(Display display) {
+ loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
+ loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
+@@ -87,20 +108,44 @@
+ //ToolBar Icons
+
+ loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
++ loadImage(display,
++ getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"),
++ "cb_open_no_default");
+ loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
+ loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
+- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
++ loadImage(display,
++ getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"),
++ "cb_new");
++ loadImage(display,
++ getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"),
++ "cb_up");
++ loadImage(display,
++ getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
++ "cb_down");
++ loadImage(display,
++ getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"),
++ "cb_top");
++ loadImage(display,
++ getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"),
++ "cb_bottom");
++ loadImage(display,
++ getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"),
++ "cb_run");
++ loadImage(display,
++ getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"),
++ "cb_start");
++ loadImage(display,
++ getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"),
++ "cb_stop");
++ loadImage(display,
++ getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"),
++ "cb_remove");
++ loadImage(display,
++ getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"),
++ "cb_host");
++ loadImage(display,
++ getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"),
++ "cb_publish");
+
+ //Status icons
+ loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
+@@ -139,6 +184,16 @@
+ Image im = getImage(name,false);
+ if(null == im) {
+ InputStream is = loader.getResourceAsStream(res);
++ if (is == null)
++ {
++ try
++ {
++ is = new FileInputStream (res);
++ }
++ catch (FileNotFoundException fnf)
++ {
++ }
++ }
+ if(null != is) {
+ try {
+ if(alpha == 255) {
Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azureus.script 4 Feb 2006 13:19:26 -0000 1.5
+++ azureus.script 9 Feb 2006 08:45:07 -0000 1.6
@@ -1,3 +1,8 @@
#!/bin/sh
-CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.2 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+APPDIR=`(cd ~; pwd)`/.azureus/app
+if ! test -d $APPDIR; then
+ mkdir -p $APPDIR;
+fi
+
+CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- azureus.spec 4 Feb 2006 13:32:53 -0000 1.12
+++ azureus.spec 9 Feb 2006 08:45:07 -0000 1.13
@@ -1,15 +1,15 @@
Name: azureus
-Version: 2.3.0.6
-Release: 23%{?dist}
+Version: 2.3.0.7
+Release: 0%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPL
URL: http://azureus.sourceforge.net
-# This is just the upstream Azureus_2.3.0.6_source.zip file with
-# the crypto code removed (org/bouncycastle).
-Source0: Azureus_2.3.0.6_source_nocrypto.zip
+# A cvs snapshot with the build and bouncycastle directories
+# removed.
+Source0: azureus2-cvs-20060207.tar.gz
Source1: azureus.script
Source2: Azureus.desktop
@@ -17,26 +17,23 @@
Source4: azureus-License.txt
Source5: azureus-ChangeLog.txt
-Patch0: azureus-sun.misc.Cleaner.patch
-Patch1: azureus-sun.misc.Signal.patch
-Patch2: azureus-java.beans.XMLEncoder.patch
-Patch3: azureus-remove-win32-osx-platforms.patch
-Patch4: azureus-remove-win32-PlatformManagerUpdateChecker.patch
-Patch5: azureus-jessie.patch
-Patch6: azureus-GKR.patch
-Patch7: azureus-ConfigurationManager-improvement.patch
-Patch8: azureus-base64.patch
-Patch9: azureus-no-bouncycastle.patch
-Patch10: azureus-cache-size.patch
-Patch11: azureus-remove-manifest-classpath.patch
-Patch12: azureus-themed.patch
-Patch13: azureus-no-shared-plugins.patch
-Patch14: azureus-no-shared-plugins2.patch
+Patch0: azureus-remove-win32-osx-platforms.patch
+Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch
+Patch2: azureus-cache-size.patch
+Patch3: azureus-remove-manifest-classpath.patch
+Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch
+Patch5: azureus-Messages-swt-3.1.patch
+Patch6: azureus-TableView-swt-3.1.patch
+Patch7: azureus-themed.patch
+Patch8: azureus-rh-bugzilla-180418.patch
+Patch9: azureus-no-shared-plugins.patch
+Patch10: azureus-no-install-remove-plugins.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires: jakarta-commons-cli, libswt3-gtk2 >= 3.1.2, log4j, gnu-crypto, libgtk-java, glib-java
-Requires: jakarta-commons-cli, libswt3-gtk2 >= 3.1.2, log4j, gnu-crypto, libgtk-java, glib-java
+BuildRequires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+Requires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
Requires: libgcj >= 4.1.0-0.15
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
@@ -51,7 +48,7 @@
advanced users.
%prep
-%setup -q -c %{name}-%{version}
+%setup -q -n %{name}2
%patch0 -p0
%patch1 -p0
%patch2 -p0
@@ -63,23 +60,17 @@
%patch8 -p0
%patch9 -p0
%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
cp %{SOURCE4} License.txt
cp %{SOURCE5} ChangeLog.txt
%build
mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.2 log4j gnu-crypto gtk2.8 glib0.2
+build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
+ln -s /usr/share/java/gcj-endorsed/bcprov-131.jar build/libs
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
find ./ -name [Ww]in32\* | xargs rm -r
-# Remove the BouncyCastle security manager.
-rm org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
# Remove test code
-rm org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
ant jar
@@ -150,6 +141,11 @@
%{_libdir}/gcj/*
%changelog
+* Thu Feb 9 2006 Anthony Green <green at redhat.com> - 2.3.0.7-0
+- Move to 2.3.0.7 snapshot (or will it be 2.4.0.0?).
+- Many related changes.
+- Remove ability to install plugins.
+
* Sat Feb 4 2006 Anthony Green <green at redhat.com> - 2.3.0.6-23
- Fix thinko in last revision.
@@ -173,6 +169,10 @@
- Use "$@" instead of $* in azureus.script (thanks ivazquez).
- Improve .desktop file.
+* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-17
+- Use "$@" instead of $* in azureus.script (thanks ivazquez).
+- Improve .desktop file.
+
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
- Remove PrintTransferTypes, which is unused and not 64-bit clean.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2006 23:08:02 -0000 1.2
+++ sources 9 Feb 2006 08:45:07 -0000 1.3
@@ -1 +1 @@
-e53e5b114750c552dc0773106160275b Azureus_2.3.0.6_source_nocrypto.zip
+e37850f30f7ff46d03b65bdf228c0025 azureus2-cvs-20060207.tar.gz
More information about the scm-commits
mailing list