rpms/azureus/devel azureus-4.2.0.4-java5.patch, NONE, 1.1 build.xml, NONE, 1.1 .cvsignore, 1.15, 1.16 azureus-4.0.0.4-boo-osx.diff, 1.1, 1.2 azureus-4.0.0.4-boo-updating-w32.diff, 1.1, 1.2 azureus-4.0.0.4-boo-windows.diff, 1.1, 1.2 azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff, 1.1, 1.2 azureus-SecureMessageServiceClientHelper-bcprov.patch, 1.1, 1.2 azureus-remove-manifest-classpath.patch, 1.3, 1.4 azureus.script, 1.22, 1.23 azureus.spec, 1.76, 1.77 sources, 1.15, 1.16
David Juran
djuran at fedoraproject.org
Mon Aug 3 19:05:59 UTC 2009
- Previous message (by thread): rpms/wordpress/devel .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 wordpress.spec, 1.32, 1.33
- Next message (by thread): rpms/ruby-gnome2/F-10 ruby-gnome2-0.19.1-vte-depend.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 ruby-gnome2.spec, 1.46, 1.47 sources, 1.7, 1.8 ruby-gnome2-0.19.0-gtk-missingheader.patch, 1.1, NONE ruby-gnome2-0.19.0-gtkmozembed.patch, 1.1, NONE ruby-gnome2-0.19.0-panel-applet.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: djuran
Update of /cvs/pkgs/rpms/azureus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv720
Modified Files:
.cvsignore azureus-4.0.0.4-boo-osx.diff
azureus-4.0.0.4-boo-updating-w32.diff
azureus-4.0.0.4-boo-windows.diff
azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
azureus-SecureMessageServiceClientHelper-bcprov.patch
azureus-remove-manifest-classpath.patch azureus.script
azureus.spec sources
Added Files:
azureus-4.2.0.4-java5.patch build.xml
Log Message:
- Upgrade to 4.2.0.4
- Fix SWT dir on x86_64 (Bz 515228)
- fix rpmlint warnings
azureus-4.2.0.4-java5.patch:
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE azureus-4.2.0.4-java5.patch ---
diff -up azureus-4.2.0.4/build.xml.java5 azureus-4.2.0.4/build.xml
--- azureus-4.2.0.4/build.xml.java5 2009-07-31 21:46:45.000000000 +0300
+++ azureus-4.2.0.4/build.xml 2009-07-31 21:47:11.000000000 +0300
@@ -36,7 +36,7 @@ NOTE: You may need to set the ANT_OPTS
<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" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
<classpath refid="libs.classpath" />
</javac>
</target>
--- NEW FILE build.xml ---
<?xml version="1.0"?>
<!--
NOTE: You may need to set the ANT_OPTS="-Xmx512m" env prop in order to compile this project successfully.
-->
<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>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore 26 Feb 2009 20:20:32 -0000 1.15
+++ .cvsignore 3 Aug 2009 19:05:58 -0000 1.16
@@ -1 +1 @@
-Vuze_4.0.0.4_source.zip
+Vuze_4.2.0.4_source.zip
azureus-4.0.0.4-boo-osx.diff:
org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java | 19 --
org/gudy/azureus2/ui/swt/osx/Start.java | 74 ----------
org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java | 135 --------------------
3 files changed, 228 deletions(-)
Index: azureus-4.0.0.4-boo-osx.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-osx.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-boo-osx.diff 26 Feb 2009 20:20:32 -0000 1.1
+++ azureus-4.0.0.4-boo-osx.diff 3 Aug 2009 19:05:58 -0000 1.2
@@ -1,710 +1,3 @@
-diff -urN org/gudy/azureus2/ui/swt.orig/mainwindow/SWTThread.java org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
---- org/gudy/azureus2/ui/swt.orig/mainwindow/SWTThread.java 2008-09-26 10:53:14.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java 2008-12-19 23:51:10.000000000 -0800
-@@ -150,24 +150,6 @@
- }
- });
-
-- if ( Constants.isOSX ){
--
-- // use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
-- try{
--
-- Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
-- Constructor constructor = ehancerClass.getConstructor(new Class[]{});
--
-- constructor.newInstance(new Object[] {});
--
-- } catch (Exception e) {
--
-- Debug.printStackTrace(e);
-- }
-- }
--
- if (app != null) {
- runner = new Thread(new AERunnable() {
- public void runSupport() {
-diff -urN org/gudy/azureus2/ui/swt.orig/osx/CarbonUIEnhancer.java org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
---- org/gudy/azureus2/ui/swt.orig/osx/CarbonUIEnhancer.java 2008-07-24 13:38:16.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,674 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2003 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/cpl-v10.html
-- * * Contributors:
-- * IBM Corporation - initial API and implementation
-- * Aelitis - Adaptation for Azureus
-- *******************************************************************************/
--package org.gudy.azureus2.ui.swt.osx;
--
--import java.io.IOException;
--import java.lang.reflect.Method;
--
--import org.eclipse.swt.SWT;
--import org.eclipse.swt.internal.Callback;
--import org.eclipse.swt.internal.carbon.AEDesc;
--import org.eclipse.swt.internal.carbon.CFRange;
--import org.eclipse.swt.internal.carbon.EventRecord;
--import org.eclipse.swt.internal.carbon.HICommand;
--import org.eclipse.swt.internal.carbon.OS;
--import org.eclipse.swt.widgets.Display;
--import org.eclipse.swt.widgets.Event;
--import org.eclipse.swt.widgets.Shell;
--import org.eclipse.swt.widgets.Widget;
--import org.gudy.azureus2.core3.config.COConfigurationManager;
--import org.gudy.azureus2.core3.internat.MessageText;
--import org.gudy.azureus2.core3.util.AERunnable;
--import org.gudy.azureus2.core3.util.Debug;
--import org.gudy.azureus2.platform.macosx.access.jnilib.OSXAccess;
--import org.gudy.azureus2.ui.swt.UIExitUtilsSWT;
--import org.gudy.azureus2.ui.swt.Utils;
--import org.gudy.azureus2.ui.swt.config.wizard.ConfigureWizard;
--import org.gudy.azureus2.ui.swt.help.AboutWindow;
--import org.gudy.azureus2.ui.swt.mainwindow.TorrentOpener;
--import org.gudy.azureus2.ui.swt.nat.NatTestWindow;
--import org.gudy.azureus2.ui.swt.speedtest.SpeedTestWizard;
--
--import com.aelitis.azureus.core.AzureusCoreFactory;
--import com.aelitis.azureus.ui.UIFunctions;
--import com.aelitis.azureus.ui.UIFunctionsManager;
--import com.apple.cocoa.application.NSApplication;
--
--//import com.apple.eawt.*; //Application and ApplicationAdapter
--
--public class CarbonUIEnhancer
--{
-- private static final int kHICommandPreferences = ('p' << 24) + ('r' << 16)
-- + ('e' << 8) + 'f';
--
-- private static final int kHICommandAbout = ('a' << 24) + ('b' << 16)
-- + ('o' << 8) + 'u';
--
-- private static final int kHICommandServices = ('s' << 24) + ('e' << 16)
-- + ('r' << 8) + 'v';
--
-- private static final int kHICommandWizard = ('a' << 24) + ('z' << 16)
-- + ('c' << 8) + 'n';
--
-- private static final int kHICommandNatTest = ('a' << 24) + ('z' << 16)
-- + ('n' << 8) + 't';
--
-- private static final int kHICommandSpeedTest = ('a' << 24) + ('z' << 16)
-- + ('s' << 8) + 't';
--
-- private static final int kHICommandRestart = ('a' << 24) + ('z' << 16)
-- + ('r' << 8) + 's';
--
-- private static final int typeAEList = ('l' << 24) + ('i' << 16) + ('s' << 8)
-- + 't';
--
-- private static final int kCoreEventClass = ('a' << 24) + ('e' << 16)
-- + ('v' << 8) + 't';
--
-- private static final int kAEOpenDocuments = ('o' << 24) + ('d' << 16)
-- + ('o' << 8) + 'c';
--
-- private static final int kAEReopenApplication = ('r' << 24) + ('a' << 16)
-- + ('p' << 8) + 'p';
--
-- private static final int kAEOpenContents = ('o' << 24) + ('c' << 16)
-- + ('o' << 8) + 'n';
--
-- private static final int kURLEventClass = ('G' << 24) + ('U' << 16)
-- + ('R' << 8) + 'L';
--
-- private static final int typeText = ('T' << 24) + ('E' << 16) + ('X' << 8)
-- + 'T';
--
-- private static final String RESOURCE_BUNDLE = "org.eclipse.ui.carbon.Messages"; //$NON-NLS-1$
--
-- private static String fgAboutActionName;
--
-- private static String fgWizardActionName;
--
-- private static String fgNatTestActionName;
--
-- private static String fgRestartActionName;
--
-- private static String fgSpeedTestActionName;
--
-- private static int memmove_type = 0;
--
-- /**
-- * KN: Some of the menu items have been removed for the Vuze and Vuze Advanced UI's;
-- * the classic UI still retains all its menu items as before. Follow this flag in the code
-- * to see which menu items are effected.
-- */
-- private boolean isAZ3 = "az3".equalsIgnoreCase(COConfigurationManager.getStringParameter("ui"));
--
-- public static final int BOUNCE_SINGLE = NSApplication.UserAttentionRequestInformational;
--
-- public static final int BOUNCE_CONTINUOUS = NSApplication.UserAttentionRequestCritical;
--
-- public CarbonUIEnhancer() {
-- if (fgAboutActionName == null) {
-- fgAboutActionName = MessageText.getString("MainWindow.menu.help.about").replaceAll(
-- "&", "");
-- }
--
-- if (false == isAZ3) {
-- if (fgWizardActionName == null) {
-- fgWizardActionName = MessageText.getString(
-- "MainWindow.menu.file.configure").replaceAll("&", "");
-- }
-- if (fgNatTestActionName == null) {
-- fgNatTestActionName = MessageText.getString(
-- "MainWindow.menu.tools.nattest").replaceAll("&", "");
-- }
--
-- if (fgSpeedTestActionName == null) {
-- fgSpeedTestActionName = MessageText.getString(
-- "MainWindow.menu.tools.speedtest").replaceAll("&", "");
-- }
-- }
--
-- if (fgRestartActionName == null) {
-- fgRestartActionName = MessageText.getString(
-- "MainWindow.menu.file.restart").replaceAll("&", "");
-- }
-- earlyStartup();
-- registerTorrentFile();
-- }
--
-- public static void registerToolbarToggle(Shell shell) {
-- final Callback toolbarToggleCB = new Callback(target, "toolbarToggle", 3);
-- int toolbarToggle = toolbarToggleCB.getAddress();
-- if (toolbarToggle == 0) {
-- Debug.out("OSX: Could not find callback 'toolbarToggle'");
-- toolbarToggleCB.dispose();
-- return;
-- }
--
-- shell.getDisplay().disposeExec(new Runnable() {
-- public void run() {
-- toolbarToggleCB.dispose();
-- }
-- });
--
-- // add the button to the window trim
-- int windowHandle = OS.GetControlOwner(shell.handle);
-- OS.ChangeWindowAttributes(windowHandle, OS.kWindowToolbarButtonAttribute, 0);
--
-- int[] mask = new int[] {
-- OS.kEventClassWindow,
-- OS.kEventWindowToolbarSwitchMode
-- };
-- // register the handler with the OS
-- OS.InstallEventHandler(OS.GetApplicationEventTarget(), toolbarToggle,
-- mask.length / 2, mask, 0, null);
-- }
--
-- private void registerTorrentFile() {
-- int result;
--
-- Callback clickDockIconCallback = new Callback(target, "clickDockIcon", 3);
-- int clickDocIcon = clickDockIconCallback.getAddress();
-- if (clickDocIcon == 0) {
-- clickDockIconCallback.dispose();
-- } else {
-- result = OS.AEInstallEventHandler(kCoreEventClass, kAEReopenApplication,
-- clickDocIcon, 0, false);
--
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could Install ReopenApplication Event Handler. Error: "
-- + result);
-- }
-- }
--
-- Callback openContentsCallback = new Callback(target, "openContents", 3);
-- int openContents = openContentsCallback.getAddress();
-- if (openContents == 0) {
-- openContentsCallback.dispose();
-- } else {
-- result = OS.AEInstallEventHandler(kCoreEventClass, kAEOpenContents,
-- openContents, 0, false);
--
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could Install OpenContents Event Handler. Error: "
-- + result);
-- }
-- }
--
-- Callback openDocCallback = new Callback(target, "openDocProc", 3);
-- int openDocProc = openDocCallback.getAddress();
-- if (openDocProc == 0) {
-- Debug.out("OSX: Could not find Callback 'openDocProc'");
-- openDocCallback.dispose();
-- return;
-- }
--
-- result = OS.AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
-- openDocProc, 0, false);
--
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could not Install OpenDocs Event Handler. Error: "
-- + result);
-- return;
-- }
--
-- result = OS.AEInstallEventHandler(kURLEventClass, kURLEventClass,
-- openDocProc, 0, false);
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could not Install URLEventClass Event Handler. Error: "
-- + result);
-- return;
-- }
--
-- ///
--
-- Callback quitAppCallback = new Callback(target, "quitAppProc", 3);
-- int quitAppProc = quitAppCallback.getAddress();
-- if (quitAppProc == 0) {
-- Debug.out("OSX: Could not find Callback 'quitApp'");
-- quitAppCallback.dispose();
-- } else {
-- result = OS.AEInstallEventHandler(kCoreEventClass, OS.kAEQuitApplication,
-- quitAppProc, 0, false);
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could not install QuitApplication Event Handler. Error: "
-- + result);
-- }
-- }
--
-- ///
--
-- int appTarget = OS.GetApplicationEventTarget();
-- Callback appleEventCallback = new Callback(this, "appleEventProc", 3);
-- int appleEventProc = appleEventCallback.getAddress();
-- int[] mask3 = new int[] {
-- OS.kEventClassAppleEvent,
-- OS.kEventAppleEvent,
-- kURLEventClass,
-- kAEReopenApplication,
-- kAEOpenContents,
-- };
-- result = OS.InstallEventHandler(appTarget, appleEventProc,
-- mask3.length / 2, mask3, 0, null);
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could Install Event Handler. Error: " + result);
-- return;
-- }
-- }
--
-- /* (non-Javadoc)
-- * @see org.eclipse.ui.IStartup#earlyStartup()
-- */
-- public void earlyStartup() {
-- final Display display = Display.getDefault();
-- display.syncExec(new AERunnable() {
-- public void runSupport() {
-- hookApplicationMenu(display);
-- }
-- });
-- }
--
-- /**
-- * See Apple Technical Q&A 1079 (http://developer.apple.com/qa/qa2001/qa1079.html)<br />
-- * Also http://developer.apple.com/documentation/Carbon/Reference/Menu_Manager/menu_mgr_ref/function_group_10.html
-- */
-- public void hookApplicationMenu(final Display display) {
-- // Callback target
-- Object target = new Object() {
-- int commandProc(int nextHandler, int theEvent, int userData) {
-- if (OS.GetEventKind(theEvent) == OS.kEventProcessCommand) {
-- HICommand command = new HICommand();
-- OS.GetEventParameter(theEvent, OS.kEventParamDirectObject,
-- OS.typeHICommand, null, HICommand.sizeof, null, command);
-- switch (command.commandID) {
-- case kHICommandPreferences: {
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- uiFunctions.openView(UIFunctions.VIEW_CONFIG, null);
-- }
-- return OS.noErr;
-- }
-- case kHICommandAbout:
-- AboutWindow.show(display);
-- return OS.noErr;
-- case kHICommandRestart: {
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- uiFunctions.dispose(true, false);
-- }
-- return OS.noErr;
-- }
-- case kHICommandWizard:
-- new ConfigureWizard(AzureusCoreFactory.getSingleton(), false);
-- return OS.noErr;
-- case kHICommandNatTest:
-- new NatTestWindow();
-- return OS.noErr;
-- case kHICommandSpeedTest:
-- new SpeedTestWizard(AzureusCoreFactory.getSingleton(), display);
-- return OS.noErr;
--
-- case OS.kAEQuitApplication:
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- uiFunctions.dispose(false, false);
-- return OS.noErr;
-- } else {
-- UIExitUtilsSWT.setSkipCloseCheck(true);
-- }
-- default:
-- break;
-- }
-- }
-- return OS.eventNotHandledErr;
-- }
-- };
-- final Callback commandCallback = new Callback(target, "commandProc", 3); //$NON-NLS-1$
-- int commandProc = commandCallback.getAddress();
-- if (commandProc == 0) {
-- commandCallback.dispose();
-- return; // give up
-- }
--
-- // Install event handler for commands
-- int[] mask = new int[] {
-- OS.kEventClassCommand,
-- OS.kEventProcessCommand
-- };
-- OS.InstallEventHandler(OS.GetApplicationEventTarget(), commandProc,
-- mask.length / 2, mask, 0, null);
--
-- // create About menu command
-- int[] outMenu = new int[1];
-- short[] outIndex = new short[1];
-- if (OS.GetIndMenuItemWithCommandID(0, kHICommandPreferences, 1, outMenu,
-- outIndex) == OS.noErr
-- && outMenu[0] != 0) {
-- int menu = outMenu[0];
--
-- int l = fgAboutActionName.length();
-- char buffer[] = new char[l];
-- fgAboutActionName.getChars(0, l, buffer, 0);
-- int str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer,
-- l);
-- OS.InsertMenuItemTextWithCFString(menu, str, (short) 0, 0,
-- kHICommandAbout);
-- OS.CFRelease(str);
-- // add separator between About & Preferences
-- OS.InsertMenuItemTextWithCFString(menu, 0, (short) 1,
-- OS.kMenuItemAttrSeparator, 0);
--
-- // enable pref menu
-- OS.EnableMenuCommand(menu, kHICommandPreferences);
-- // disable services menu
-- OS.DisableMenuCommand(menu, kHICommandServices);
--
-- if (false == isAZ3) {
-- // wizard menu
-- l = fgWizardActionName.length();
-- buffer = new char[l];
-- fgWizardActionName.getChars(0, l, buffer, 0);
-- str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
-- OS.InsertMenuItemTextWithCFString(menu, str, (short) 3, 0,
-- kHICommandWizard);
-- OS.CFRelease(str);
--
-- // NAT test menu
-- l = fgNatTestActionName.length();
-- buffer = new char[l];
-- fgNatTestActionName.getChars(0, l, buffer, 0);
-- str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
-- OS.InsertMenuItemTextWithCFString(menu, str, (short) 4, 0,
-- kHICommandNatTest);
-- OS.CFRelease(str);
--
-- //SpeedTest
-- l = fgSpeedTestActionName.length();
-- buffer = new char[l];
-- fgSpeedTestActionName.getChars(0, l, buffer, 0);
-- str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
-- OS.InsertMenuItemTextWithCFString(menu, str, (short) 5, 0,
-- kHICommandSpeedTest);
-- OS.CFRelease(str);
-- }
--
-- OS.InsertMenuItemTextWithCFString(menu, 0, (short) 6,
-- OS.kMenuItemAttrSeparator, 0);
--
-- // restart menu
-- l = fgRestartActionName.length();
-- buffer = new char[l];
-- fgRestartActionName.getChars(0, l, buffer, 0);
-- str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
-- OS.InsertMenuItemTextWithCFString(menu, str, (short) 7, 0,
-- kHICommandRestart);
-- OS.CFRelease(str);
--
-- OS.InsertMenuItemTextWithCFString(menu, 0, (short) 8,
-- OS.kMenuItemAttrSeparator, 0);
-- }
--
-- // schedule disposal of callback object
-- display.disposeExec(new AERunnable() {
-- public void runSupport() {
-- commandCallback.dispose();
-- // stopSidekick();
-- }
-- });
-- }
--
-- private static void stopSidekick() {
-- try {
-- Runtime.getRuntime().exec(new String[] {
-- "osascript",
-- "-e",
-- "tell application \"Azureus\" to quit"
-- });
-- } catch (IOException e) {
-- Debug.printStackTrace(e);
-- }
-- }
--
-- int appleEventProc(int nextHandler, int theEvent, int userData) {
-- int eventClass = OS.GetEventClass(theEvent);
-- //int eventKind = OS.GetEventKind(theEvent);
--
-- //System.out.println("appleEventProc " + OSXtoString(eventClass) + ";"
-- // + OS.GetEventKind(theEvent) + ";" + OSXtoString(theEvent) + ";"
-- // + OSXtoString(userData));
--
-- // Process teh odoc event
-- if (eventClass == OS.kEventClassAppleEvent) {
-- int[] aeEventID = new int[1];
-- if (OS.GetEventParameter(theEvent, OS.kEventParamAEEventID, OS.typeType,
-- null, 4, null, aeEventID) != OS.noErr) {
-- return OS.eventNotHandledErr;
-- }
-- //System.out.println("EventID = " + OSXtoString(aeEventID[0]));
-- if (aeEventID[0] != kAEOpenDocuments && aeEventID[0] != kURLEventClass
-- && aeEventID[0] != kAEReopenApplication
-- && aeEventID[0] != kAEOpenContents
-- && aeEventID[0] != OS.kAEQuitApplication) {
-- return OS.eventNotHandledErr;
-- }
--
-- // Handle Event
-- EventRecord eventRecord = new EventRecord();
-- OS.ConvertEventRefToEventRecord(theEvent, eventRecord);
-- OS.AEProcessAppleEvent(eventRecord);
--
-- // Tell Mac we are handling this event
-- return OS.noErr;
-- }
--
-- return OS.eventNotHandledErr;
-- }
--
-- private static String OSXtoString(int i) {
-- char[] c = new char[4];
-- c[0] = (char) ((i >> 24) & 0xff);
-- c[1] = (char) ((i >> 16) & 0xff);
-- c[2] = (char) ((i >> 8) & 0xff);
-- c[3] = (char) (i & 0xff);
-- return new String(c);
-- }
--
-- private static void memmove(byte[] dest, int src, int size) {
-- switch (memmove_type) {
-- case 0:
-- try {
-- OSXAccess.memmove(dest, src, size);
-- memmove_type = 0;
-- return;
-- } catch (Throwable e) {
-- }
-- // FALL THROUGH
--
-- case 1:
-- try {
-- Class cMemMove = Class.forName("org.eclipse.swt.internal.carbon.OS");
--
-- Method method = cMemMove.getMethod("memmove", new Class[] {
-- byte[].class,
-- Integer.TYPE,
-- Integer.TYPE
-- });
--
-- method.invoke(null, new Object[] {
-- dest,
-- new Integer(src),
-- new Integer(size)
-- });
-- memmove_type = 1;
-- return;
-- } catch (Throwable e) {
-- }
--
-- // FALL THROUGH
-- case 2:
-- try {
-- Class cMemMove = Class.forName("org.eclipse.swt.internal.carbon.OS");
--
-- Method method = cMemMove.getMethod("memcpy", new Class[] {
-- byte[].class,
-- Integer.TYPE,
-- Integer.TYPE
-- });
--
-- method.invoke(null, new Object[] {
-- dest,
-- new Integer(src),
-- new Integer(size)
-- });
--
-- memmove_type = 2;
-- return;
-- } catch (Throwable e) {
-- }
--
-- // FALL THROUGH
--
-- default:
-- break;
-- }
--
-- memmove_type = 3;
-- }
--
-- final static Object target = new Object() {
-- int quitAppProc(int theAppleEvent, int reply, int handlerRefcon) {
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- uiFunctions.dispose(false, false);
-- } else {
-- UIExitUtilsSWT.setSkipCloseCheck(true);
-- Display.getDefault().dispose();
-- }
-- return OS.noErr;
-- }
--
-- int openDocProc(int theAppleEvent, int reply, int handlerRefcon) {
-- AEDesc aeDesc = new AEDesc();
-- EventRecord eventRecord = new EventRecord();
-- OS.ConvertEventRefToEventRecord(theAppleEvent, eventRecord);
-- try {
-- int result = OSXAccess.AEGetParamDesc(theAppleEvent,
-- OS.kEventParamDirectObject, typeAEList, aeDesc);
-- if (result != OS.noErr) {
-- Debug.out("OSX: Could call AEGetParamDesc. Error: " + result);
-- return OS.noErr;
-- }
-- } catch (java.lang.UnsatisfiedLinkError e) {
-- Debug.out("OSX: AEGetParamDesc not available. Can't open sent file");
-- return OS.noErr;
-- }
--
-- int[] count = new int[1];
-- OS.AECountItems(aeDesc, count);
-- //System.out.println("COUNT: " + count[0]);
-- if (count[0] > 0) {
-- String[] fileNames = new String[count[0]];
-- int maximumSize = 80; // size of FSRef
-- int dataPtr = OS.NewPtr(maximumSize);
-- int[] aeKeyword = new int[1];
-- int[] typeCode = new int[1];
-- int[] actualSize = new int[1];
-- for (int i = 0; i < count[0]; i++) {
-- if (OS.AEGetNthPtr(aeDesc, i + 1, OS.typeFSRef, aeKeyword, typeCode,
-- dataPtr, maximumSize, actualSize) == OS.noErr) {
-- byte[] fsRef = new byte[actualSize[0]];
-- memmove(fsRef, dataPtr, actualSize[0]);
-- int dirUrl = OS.CFURLCreateFromFSRef(OS.kCFAllocatorDefault, fsRef);
-- int dirString = OS.CFURLCopyFileSystemPath(dirUrl,
-- OS.kCFURLPOSIXPathStyle);
-- OS.CFRelease(dirUrl);
-- int length = OS.CFStringGetLength(dirString);
-- char[] buffer = new char[length];
-- CFRange range = new CFRange();
-- range.length = length;
-- OS.CFStringGetCharacters(dirString, range, buffer);
-- OS.CFRelease(dirString);
-- fileNames[i] = new String(buffer);
-- }
--
-- if (OS.AEGetNthPtr(aeDesc, i + 1, typeText, aeKeyword, typeCode,
-- dataPtr, maximumSize, actualSize) == OS.noErr) {
-- byte[] urlRef = new byte[actualSize[0]];
-- memmove(urlRef, dataPtr, actualSize[0]);
-- fileNames[i] = new String(urlRef);
-- }
--
-- //System.out.println(fileNames[i]);
-- }
--
-- TorrentOpener.openTorrents(fileNames);
-- }
--
-- return OS.noErr;
-- }
--
-- int clickDockIcon(int nextHandler, int theEvent, int userData) {
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- uiFunctions.bringToFront();
-- return OS.noErr;
-- }
-- return OS.eventNotHandledErr;
-- }
--
-- int openContents(int nextHandler, int theEvent, int userData) {
-- Debug.out("openDocContents");
-- return OS.noErr;
-- }
--
-- int toolbarToggle(int nextHandler, int theEvent, int userData) {
-- int eventKind = OS.GetEventKind(theEvent);
-- if (eventKind != OS.kEventWindowToolbarSwitchMode) {
-- return OS.eventNotHandledErr;
-- }
--
-- int[] theWindow = new int[1];
-- OS.GetEventParameter(theEvent, OS.kEventParamDirectObject,
-- OS.typeWindowRef, null, 4, null, theWindow);
--
-- int[] theRoot = new int[1];
-- OS.GetRootControl(theWindow[0], theRoot);
-- final Widget widget = Display.getCurrent().findWidget(theRoot[0]);
--
-- if (!(widget instanceof Shell)) {
-- return OS.eventNotHandledErr;
-- }
-- final Shell shellAffected = (Shell) widget;
--
-- Utils.execSWTThread(new AERunnable() {
-- public void runSupport() {
-- int type;
-- Long l = (Long) shellAffected.getData("OSX.ToolBarToggle");
-- if (l == null || l.longValue() == 0) {
-- type = SWT.Collapse;
-- } else {
-- type = SWT.Expand;
-- }
--
-- Event event = new Event();
-- event.type = type;
-- event.display = widget.getDisplay();
-- event.widget = widget;
-- shellAffected.notifyListeners(type, event);
--
-- shellAffected.setData("OSX.ToolBarToggle", new Long(
-- type == SWT.Collapse ? 1 : 0));
-- }
-- });
--
-- return OS.noErr;
-- }
-- };
--
--}
-\ No newline at end of file
diff -urN org/gudy/azureus2/ui/swt.orig/osx/Start.java org/gudy/azureus2/ui/swt/osx/Start.java
--- org/gudy/azureus2/ui/swt.orig/osx/Start.java 2006-02-09 19:43:24.000000000 -0800
+++ org/gudy/azureus2/ui/swt/osx/Start.java 1969-12-31 16:00:00.000000000 -0800
@@ -923,3 +216,34 @@ diff -urN org/gudy/azureus2/ui/swt.orig/
- return result;
- }
-}
+diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+--- org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx 2009-04-16 20:46:42.000000000 +0300
++++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java 2009-07-31 19:35:41.000000000 +0300
+@@ -153,25 +153,6 @@ public class SWTThread {
+ }
+ });
+
+- if ( Constants.isOSX && SWT.getPlatform().equals("carbon") ){
+-
+- // use reflection here so we decouple generic SWT from OSX specific stuff to an extent
+-
+- try{
+-
+- Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
+-
+- Constructor constructor = ehancerClass.getConstructor(new Class[]{});
+-
+- constructor.newInstance(new Object[] {});
+-
+- } catch (Exception e) {
+-
+- Debug.printStackTrace(e);
+- }
+- }
+-
+-
+ if (app != null) {
+ app.runInSWTThread();
+ runner = new Thread(new AERunnable() {
+diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java
+diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
azureus-4.0.0.4-boo-updating-w32.diff:
AzureusRestarterImpl.java | 190 ----------------------------------------------
1 file changed, 3 insertions(+), 187 deletions(-)
Index: azureus-4.0.0.4-boo-updating-w32.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-updating-w32.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-boo-updating-w32.diff 26 Feb 2009 20:20:32 -0000 1.1
+++ azureus-4.0.0.4-boo-updating-w32.diff 3 Aug 2009 19:05:58 -0000 1.2
@@ -1,7 +1,7 @@
-diff -urN com/aelitis/azureus/core/update.orig/impl/AzureusRestarterImpl.java com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
---- com/aelitis/azureus/core/update.orig/impl/AzureusRestarterImpl.java 2007-07-30 13:13:28.000000000 -0700
-+++ com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java 2008-12-20 00:09:42.000000000 -0800
-@@ -30,8 +30,8 @@
+diff -up azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
+--- azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 2009-07-08 19:00:28.000000000 +0300
++++ azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java 2009-07-31 20:20:12.000000000 +0300
+@@ -30,8 +30,8 @@ import org.gudy.azureus2.core3.util.*;
import org.gudy.azureus2.platform.PlatformManager;
import org.gudy.azureus2.platform.PlatformManagerFactory;
import org.gudy.azureus2.platform.unix.ScriptAfterShutdown;
@@ -9,10 +9,10 @@ diff -urN com/aelitis/azureus/core/updat
-import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
+//import org.gudy.azureus2.platform.win32.access.AEWin32Access;
+//import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
- import org.gudy.azureus2.update.UpdaterUtils;
-
- import com.aelitis.azureus.core.AzureusCore;
-@@ -219,20 +219,6 @@
+ import org.gudy.azureus2.plugins.PluginInterface;
+ import org.gudy.azureus2.plugins.platform.PlatformManagerException;
+ import org.gudy.azureus2.pluginsimpl.local.PluginInitializer;
+@@ -218,20 +218,6 @@ AzureusRestarterImpl
PrintWriter log,
String exec )
{
@@ -33,7 +33,7 @@ diff -urN com/aelitis/azureus/core/updat
}
-@@ -304,131 +290,6 @@
+@@ -294,131 +280,6 @@ AzureusRestarterImpl
String backupJavaRunString,
boolean update_only)
{
@@ -165,7 +165,7 @@ diff -urN com/aelitis/azureus/core/updat
return true;
}
-@@ -454,9 +315,6 @@
+@@ -444,9 +305,6 @@ AzureusRestarterImpl
restartAzureus_Unix(log,mainClass,properties,parameters);
@@ -175,7 +175,7 @@ diff -urN com/aelitis/azureus/core/updat
}
}
-@@ -468,35 +326,7 @@
+@@ -458,35 +316,7 @@ AzureusRestarterImpl
String[] parameters,
boolean update_only)
{
@@ -212,7 +212,7 @@ diff -urN com/aelitis/azureus/core/updat
private boolean
-@@ -529,20 +359,6 @@
+@@ -519,20 +349,6 @@ AzureusRestarterImpl
String[] properties,
String[] parameters)
{
azureus-4.0.0.4-boo-windows.diff:
platform/PlatformManagerFactory.java | 17
platform/PlatformManagerPluginDelegate.java | 7
platform/macosx/NativeInvocationBridge.java | 96
platform/macosx/PListEditor.java | 281 -
platform/macosx/access/jnilib/OSXAccess.c | 127
platform/macosx/access/jnilib/OSXAccess.java | 58
platform/macosx/access/jnilib/make.mak | 12
platform/win32/PlatformManagerUpdateChecker.java | 361 -
platform/win32/access/AEWin32Access.java | 229 -
platform/win32/access/AEWin32AccessException.java | 40
platform/win32/access/AEWin32AccessListener.java | 35
platform/win32/access/AEWin32Manager.java | 41
platform/win32/access/impl/AEWin32AccessCallback.java | 37
platform/win32/access/impl/AEWin32AccessExceptionImpl.java | 44
platform/win32/access/impl/AEWin32AccessImpl.java | 555 --
platform/win32/access/impl/AEWin32AccessInterface.java | 249 -
platform/win32/access/impl/Debug/aereg.dll |binary
platform/win32/access/impl/Debug/aereg.lib |binary
platform/win32/access/impl/Release/aereg.dll |binary
platform/win32/access/impl/Release/aereg.lib |binary
platform/win32/access/impl/StdAfx.cpp | 8
platform/win32/access/impl/StdAfx.h | 24
platform/win32/access/impl/Test.java | 150
platform/win32/access/impl/aenet.cpp | 781 ---
platform/win32/access/impl/aenet.h | 102
platform/win32/access/impl/aereg.cpp | 2115 ----------
platform/win32/access/impl/aereg.dsp | 136
platform/win32/access/impl/aereg.dsw | 29
platform/win32/access/impl/aereg.h | 41
platform/win32/access/impl/generate_ini.bat | 1
platform/win32/access/impl/org_gudy_azureus2_platform_win32_access_impl_AEWin32AccessInterface.h | 164
update/CoreUpdateChecker.java | 33
32 files changed, 24 insertions(+), 5749 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 azureus-4.0.0.4-boo-windows.diffIndex: azureus-4.0.0.4-boo-windows.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-windows.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-boo-windows.diff 26 Feb 2009 20:20:32 -0000 1.1
+++ azureus-4.0.0.4-boo-windows.diff 3 Aug 2009 19:05:58 -0000 1.2
@@ -1,355 +1,3 @@
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/cocoa/CocoaJavaBridge.java org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java
---- org/gudy/azureus2/platform.orig/macosx/access/cocoa/CocoaJavaBridge.java 2008-02-08 17:21:08.000000000 -0800
-+++ org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,347 +0,0 @@
--package org.gudy.azureus2.platform.macosx.access.cocoa;
--
--/*
-- * Created on 27-Mar-2005
-- * Created by James Yeh
-- * Copyright (C) 2004-2005 Aelitis, All Rights Reserved.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 46,603.30 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- *
-- */
--
--import com.apple.cocoa.foundation.NSAppleEventDescriptor;
--import com.apple.cocoa.foundation.NSAppleScript;
--import com.apple.cocoa.foundation.NSAutoreleasePool;
--import com.apple.cocoa.foundation.NSMutableDictionary;
--import org.gudy.azureus2.core3.logging.*;
--import org.gudy.azureus2.core3.util.AEMonitor;
--import org.gudy.azureus2.core3.util.AERunnable;
--import org.gudy.azureus2.core3.util.AEThread;
--import org.gudy.azureus2.core3.util.Debug;
--import org.gudy.azureus2.platform.macosx.NativeInvocationBridge;
--
--import java.io.File;
--import java.text.MessageFormat;
--
--/**
-- * <p>Performs PlatformManager tasks using Cocoa-Java (FoundationKit only)</p>
-- * <p>For now, operations are performed using NSAppleScript, rather than using NSWorkspace.
-- * This is still significantly faster than calling the cmd-line osascript.</p>
-- * @version 2.1 Apr 2, 2005
-- */
--public final class CocoaJavaBridge extends NativeInvocationBridge
--{
-- /**
-- * The path the Cocoa-Java class files are located at
-- */
-- protected static final String CLASS_PATH = "/system/library/java";
--
-- private static final String REVEAL_SCRIPT_FORMAT = "tell application \"System Events\"\ntell application \"{0}\"\nactivate\nreveal (posix file \"{1}\" as alias)\nend tell\nend tell";
--
-- private static final String DEL_SCRIPT_FORMAT = "tell application \"Finder\" to move (posix file \"{0}\" as alias) to the trash";
--
-- /**
-- * Main NSAutoreleasePool
-- */
-- private int mainPool;
--
-- protected AEMonitor classMon = new AEMonitor("CocoaJavaBridge:C");
-- private AEMonitor scriptMon = new AEMonitor("CocoaJavaBridge:S");
--
-- protected boolean isDisposed = false;
--
-- protected RunnableDispatcher scriptDispatcher;
--
-- public CocoaJavaBridge()
-- {
-- try
-- {
-- classMon.enter();
-- mainPool = NSAutoreleasePool.push();
--
-- scriptDispatcher = new RunnableDispatcher();
-- }
-- finally
-- {
-- classMon.exit();
-- }
-- }
--
-- // interface implementation
--
-- /**
-- * {@inheritDoc}
-- */
-- protected boolean performRecoverableFileDelete(File path)
-- {
-- if(!path.exists())
-- return false;
--
-- NSAppleEventDescriptor result = executeScriptWithAsync(DEL_SCRIPT_FORMAT, new Object[]{path.getAbsolutePath()});
-- return (result != null);
-- }
--
-- /**
-- * {@inheritDoc}
-- */
-- protected boolean showInFinder(File path, String fileBrowserApp) {
-- if (!path.exists())
-- return false;
--
-- NSAppleEventDescriptor result = null;
-- int pool = NSAutoreleasePool.push();
-- try {
-- result = executeScriptWithAsync(REVEAL_SCRIPT_FORMAT, new Object[] {
-- fileBrowserApp,
-- path.getAbsolutePath()
-- });
-- } finally {
-- NSAutoreleasePool.pop(pool);
-- }
-- return (result != null);
-- }
--
-- /**
-- * {@inheritDoc}
-- */
-- protected boolean isEnabled()
-- {
-- // simple check with classpath
-- return System.getProperty("java.class.path").toLowerCase().indexOf(CLASS_PATH) != -1;
-- }
--
-- // class utility methods
--
-- /**
-- * <p>Executes a new instance of NSAppleScript</p>
-- * <p>The method is wrapped in an autorelease pool and an AEMonitor. If there are
-- * no format parameters, MessageFormat is not used to parse the format string, and
-- * the format string will be treated as the source itself.</p>
-- * @see MessageFormat#format(String, Object...)
-- * @see NSAppleScript#execute(com.apple.cocoa.foundation.NSMutableDictionary)
-- */
-- protected final NSAppleEventDescriptor executeScript(String scriptFormat, Object[] params)
-- {
-- try
-- {
-- scriptMon.enter();
--
-- int pool = NSAutoreleasePool.push();
-- long start = System.currentTimeMillis();
--
-- String src;
-- if(params == null || params.length == 0)
-- {
-- src = scriptFormat;
-- }
-- else
-- {
-- src = MessageFormat.format(scriptFormat, params);
-- }
--
-- Debug.outNoStack("Executing: \n" + src);
--
-- NSAppleScript scp = new NSAppleScript(src);
-- NSAppleEventDescriptor result = scp.execute(new NSMutableDictionary());
--
-- Debug.outNoStack(MessageFormat.format("Elapsed time: {0}ms\n", new Object[]{new Long(System.currentTimeMillis() - start)}));
-- NSAutoreleasePool.pop(pool);
-- return result;
-- }
-- finally
-- {
-- scriptMon.exit();
-- }
-- }
--
-- /**
-- * <p>Executes a new instance of NSAppleScript in a forked AEThread</p>
-- * <p>This method always returns a "true" event descriptor. Callbacks are currently unsupported
-- * , so in the event of an error, the logger is autuomatically notified.</p>
-- * <p>The thread's runSupport method is wrapped in an autorelease pool. If there are
-- * no format parameters, MessageFormat is not used to parse the format string, and
-- * the format string will be treated as the source itself.</p>
-- * @see org.gudy.azureus2.core3.util.AEThread#runSupport()
-- * @see MessageFormat#format(String, Object...)
-- * @see NSAppleScript#execute(com.apple.cocoa.foundation.NSMutableDictionary)
-- * @return NSAppleEventDescriptor.descriptorWithBoolean(true)
-- */
-- protected final NSAppleEventDescriptor executeScriptWithNewThread(final String scriptFormat, final Object[] params)
-- {
-- Thread worker = new AEThread("ScriptObject", true)
-- {
-- public void runSupport()
-- {
[...3579 lines suppressed...]
--
-- public void
-- removeListener(
-- PlatformManagerListener listener )
-- {
-- listeners.remove( listener );
-- }
--
-- /**
-- * Gets an ID to identify this computer to azureus. Used when the computer
-- * has muliple user accounts and we need a way to not duplicate efforts
-- * (An example would be to skip downloading something another user on the
-- * computer has already downloaded)
-- * <p>
-- * The default for the ID is the AZID of the first user profile.
-- *
-- * @return ID
-- */
-- public String getAzComputerID() {
-- boolean needWrite = false;
-- String cid = null;
-- try {
-- cid = access.readStringValue(AEWin32Access.HKEY_LOCAL_MACHINE,
-- "SOFTWARE\\" + app_name, "CID");
-- } catch (Exception e) {
-- }
--
-- if (cid == null || cid.length() == 0) {
-- needWrite = true;
-- try {
-- File commonPath = new File(access.getCommonAppData(),app_name);
-- if (commonPath.isDirectory()) {
-- File fCID = new File(commonPath, "azCID.txt");
-- if (fCID.exists()) {
-- cid = FileUtil.readFileAsString(fCID, 255, "utf8");
-- }
-- }
-- } catch (Exception e) {
-- }
-- }
--
-- if (cid == null || cid.length() == 0) {
-- needWrite = true;
-- cid = COConfigurationManager.getStringParameter("ID");
-- }
--
-- if (cid == null || cid.length() == 0) {
-- needWrite = true;
-- cid = RandomUtils.generateRandomAlphanumerics(20);
-- }
--
-- if (needWrite) {
-- setAzComputerID(cid);
-- }
-- return cid;
-- }
--
-- /**
-- * @param cid
-- */
-- private void setAzComputerID(String cid) {
-- try {
-- access.writeStringValue(AEWin32Access.HKEY_LOCAL_MACHINE,
-- "SOFTWARE\\" + app_name, "CID", cid);
-- } catch (Exception e) {
-- Debug.out("Could not write CID: " + e.getMessage());
-- }
--
-- try {
-- String sCommonAppData = access.getCommonAppData();
-- if (sCommonAppData != null && sCommonAppData.length() > 0) {
-- File commonPath = new File(sCommonAppData);
-- if (commonPath.isDirectory()) {
-- commonPath = new File(commonPath, app_name);
-- FileUtil.mkdirs(commonPath);
--
-- File fCID = new File(commonPath, "azCID.txt");
-- FileUtil.writeBytesAsFile(fCID.getAbsolutePath(),
-- cid.getBytes("utf8"));
-- }
-- }
-- } catch (Exception e) {
-- e.printStackTrace();
-- }
-- }
--
-- public static void main(String[] args) {
-- try {
-- PlatformManagerImpl impl = new PlatformManagerImpl();
-- System.out.println(impl.getAzComputerID());
-- } catch (PlatformManagerException e) {
-- // TODO Auto-generated catch block
- e.printStackTrace();
- }
--
-- }
--
-- public void requestUserAttention(int type, Object data) throws PlatformManagerException {
-- throw new PlatformManagerException("Unsupported capability called on platform manager");
- }
-}
diff -urN org/gudy/azureus2/platform.orig/win32/PlatformManagerUpdateChecker.java org/gudy/azureus2/platform/win32/PlatformManagerUpdateChecker.java
@@ -8247,3 +5845,97 @@ diff -urN org/gudy/azureus2/platform.ori
- return( lines );
- }
-}
+diff -up azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.foo azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- org/gudy/azureus2/platform/PlatformManagerFactory.java.foo 2009-05-13 20:50:56.000000000 +0300
++++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2009-07-30 22:05:47.000000000 +0300
+@@ -48,19 +48,9 @@ PlatformManagerFactory
+ if ( platform_manager == null && !force_dummy ){
+
+ try{
+- if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
++
++ platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
+
+- platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
+-
+- }else if( getPlatformType() == PlatformManager.PT_MACOSX ){
+-
+- platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
+-
+- }else if( getPlatformType() == PlatformManager.PT_UNIX ){
+-
+- platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
+-
+- }
+ }catch( PlatformManagerException e ){
+
+ // exception will already have been logged
+@@ -72,8 +62,9 @@ PlatformManagerFactory
+ }
+
+ if ( platform_manager == null ){
+-
++ if( getPlatformType() == PlatformManager.PT_UNIX ){
+ platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
++ }
+ }
+
+ return( platform_manager );
+diff -up azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.original azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- org/gudy/azureus2/update/CoreUpdateChecker.java.original 2009-07-31 22:04:53.000000000 +0300
++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2009-07-31 22:13:46.000000000 +0300
+@@ -38,8 +38,8 @@ import org.gudy.azureus2.core3.logging.*
+ import org.gudy.azureus2.core3.config.*;
+ import org.gudy.azureus2.core3.html.*;
+
+-import org.gudy.azureus2.platform.win32.access.AEWin32Access;
+-import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
++//import org.gudy.azureus2.platform.win32.access.AEWin32Access;
++//import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
+ import org.gudy.azureus2.plugins.*;
+ import org.gudy.azureus2.plugins.logging.LoggerChannel;
+ import org.gudy.azureus2.plugins.update.*;
+@@ -949,27 +949,30 @@ CoreUpdateChecker
+ try{
+ // hack here to allow testing of osx on windows (parg) - should replace with
+ // Constants.isWindows etc
++
++ //Shouldn't happen on Fedora
+
+ if ( file.getName().endsWith( ".exe" )){
+
+- try{
+- AEWin32Access accessor = AEWin32Manager.getAccessor(true);
++
++ // try{
++// AEWin32Access accessor = AEWin32Manager.getAccessor(true);
+
+- // accessor.createProcess( , false );
++// // accessor.createProcess( , false );
+
+- accessor.shellExecute(
+- null,
+- file.getAbsolutePath(),
+- null,
+- SystemProperties.getApplicationPath(),
+- AEWin32Access.SW_NORMAL );
++// accessor.shellExecute(
++// null,
++// file.getAbsolutePath(),
++// null,
++// SystemProperties.getApplicationPath(),
++// AEWin32Access.SW_NORMAL );
+
+- }catch( Throwable e ){
++// }catch( Throwable e ){
+
+- Logger.log( new LogEvent( LogIDs.LOGGER, "AEWin32Access failed", e ));
++// Logger.log( new LogEvent( LogIDs.LOGGER, "AEWin32Access failed", e ));
+
+- Runtime.getRuntime().exec( file.getAbsolutePath() );
+- }
++// Runtime.getRuntime().exec( file.getAbsolutePath() );
++// }
+ }else{
+ // osx, need to unzip .app and launch
+
azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff:
PlatformManagerFactory.java | 4 ----
1 file changed, 4 deletions(-)
Index: azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff 26 Feb 2009 20:20:32 -0000 1.1
+++ azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff 3 Aug 2009 19:05:58 -0000 1.2
@@ -1,11 +1,10 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig 2008-12-20 00:48:53.000000000 -0800
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2008-12-20 00:49:18.000000000 -0800
-@@ -50,14 +50,10 @@
- if( getPlatformType() == PlatformManager.PT_UNIX ){
+diff -up azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.silly-java-tricks-are-for-kids azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.silly-java-tricks-are-for-kids 2009-07-31 21:40:31.000000000 +0300
++++ azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java 2009-07-31 21:43:37.000000000 +0300
+@@ -51,10 +51,6 @@ PlatformManagerFactory
+
+ platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
- platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
-
- }
- }catch( PlatformManagerException e ){
-
- // exception will already have been logged
@@ -13,5 +12,3 @@
}catch( Throwable e ){
Debug.printStackTrace(e);
- }
- }
azureus-SecureMessageServiceClientHelper-bcprov.patch:
SecureMessageServiceClientHelper.java | 19 -------------------
1 file changed, 19 deletions(-)
Index: azureus-SecureMessageServiceClientHelper-bcprov.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-SecureMessageServiceClientHelper-bcprov.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-SecureMessageServiceClientHelper-bcprov.patch 30 Jul 2006 18:56:22 -0000 1.1
+++ azureus-SecureMessageServiceClientHelper-bcprov.patch 3 Aug 2009 19:05:59 -0000 1.2
@@ -1,14 +1,15 @@
---- com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.~1.4.~ 2006-02-09 19:43:06.000000000 -0800
-+++ com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java 2006-07-08 11:05:19.000000000 -0700
-@@ -36,7 +36,6 @@
+diff -up azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.nobcprov azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
+--- azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.nobcprov 2009-02-19 19:54:38.000000000 +0200
++++ azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java 2009-07-30 20:35:13.000000000 +0300
+@@ -36,7 +36,6 @@ import org.bouncycastle.crypto.CipherPar
import org.bouncycastle.crypto.encodings.PKCS1Encoding;
import org.bouncycastle.crypto.engines.RSAEngine;
import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jce.provider.RSAUtil;
import org.gudy.azureus2.core3.util.Debug;
+ import org.gudy.azureus2.core3.util.RandomUtils;
import org.gudy.azureus2.plugins.utils.StaticUtilities;
-
-@@ -82,30 +81,12 @@
+@@ -83,30 +82,12 @@ SecureMessageServiceClientHelper
byte[] secret_bytes = session_key.getEncoded();
@@ -29,7 +30,7 @@
-
- CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
-
-- param = new ParametersWithRandom(param, new SecureRandom());
+- param = new ParametersWithRandom(param, RandomUtils.SECURE_RANDOM);
-
- padded_eng.init( true, param );
-
azureus-remove-manifest-classpath.patch:
build.xml | 1 -
1 file changed, 1 deletion(-)
Index: azureus-remove-manifest-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-remove-manifest-classpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-remove-manifest-classpath.patch 29 Jan 2008 16:02:38 -0000 1.3
+++ azureus-remove-manifest-classpath.patch 3 Aug 2009 19:05:59 -0000 1.4
@@ -1,10 +1,11 @@
---- oldbuild.xml 2005-10-25 04:22:46.000000000 -0400
-+++ build.xml 2008-01-29 10:00:49.000000000 -0500
-@@ -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>
-
+diff -up azureus-4.2.0.4/build.xml.remove-manifest-classpath azureus-4.2.0.4/build.xml
+--- azureus-4.2.0.4/build.xml.remove-manifest-classpath 2009-07-30 20:05:04.000000000 +0300
++++ azureus-4.2.0.4/build.xml 2009-07-30 20:17:48.000000000 +0300
+@@ -46,7 +46,6 @@ NOTE: You may need to set the ANT_OPTS
+ <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>
+
Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.script,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- azureus.script 19 Mar 2009 03:11:48 -0000 1.22
+++ azureus.script 3 Aug 2009 19:05:59 -0000 1.23
@@ -27,4 +27,4 @@ case $(uname -i) in
SWT=/usr/lib/eclipse/swt.jar
;;
esac
-MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:/usr/lib/eclipse/plugins/:/usr/lib/eclipse/:/usr/lib/ CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
+MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:LIBDIR/eclipse/plugins/:LIBDIR/eclipse/:LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- azureus.spec 24 Jul 2009 17:44:57 -0000 1.76
+++ azureus.spec 3 Aug 2009 19:05:59 -0000 1.77
@@ -1,8 +1,8 @@
-%define _newname Vuze
+%define _newname Vuze
Name: azureus
-Version: 4.0.0.4
-Release: 4%{?dist}
+Version: 4.2.0.4
+Release: 1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -13,57 +13,62 @@ Source0: http://downloads.sourceforge.ne
Source1: azureus.script
Source2: Azureus.desktop
Source3: azureus.applications
+
+#retrieved from CVS
+Source4: build.xml
#Source4: azureus-License.txt
#Source5: azplugins_2.1.6.jar
#Source6: bdcc_2.2.2.zip
-Patch0: azureus-remove-win32-osx-platforms.patch
+#Patch0: azureus-remove-win32-osx-platforms.patch
Patch2: azureus-cache-size.patch
Patch3: azureus-remove-manifest-classpath.patch
Patch9: azureus-no-shared-plugins.patch
-Patch12: azureus-no-updates-PluginInitializer.patch
+#Patch12: azureus-no-updates-PluginInitializer.patch
#Patch13: azureus-no-updates-PluginInterfaceImpl.patch
Patch14: azureus-no-update-manager-AzureusCoreImpl.patch
Patch15: azureus-no-update-manager-CorePatchChecker.patch
-Patch16: azureus-no-update-manager-CoreUpdateChecker.patch
-Patch18: azureus-no-update-manager-PluginInstallerImpl.patch
-Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch
-Patch20: azureus-no-update-manager-SWTUpdateChecker.patch
-Patch22: azureus-no-update-manager-UpdateMonitor.patch
-Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
+#Patch16: azureus-no-update-manager-CoreUpdateChecker.patch
+#Patch18: azureus-no-update-manager-PluginInstallerImpl.patch
+#Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch
+#Patch20: azureus-no-update-manager-SWTUpdateChecker.patch
+#Patch22: azureus-no-update-manager-UpdateMonitor.patch
+#Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
Patch27: azureus-SecureMessageServiceClientHelper-bcprov.patch
Patch28: azureus-configuration.patch
-Patch31: azureus-fix-menu-MainMenu.patch
+#Patch31: azureus-fix-menu-MainMenu.patch
-Patch50: azureus-4.0.0.4-boo-windows.diff
-Patch51: azureus-4.0.0.4-boo-osx.diff
-Patch52: azureus-4.0.0.4-screw-w32-tests.diff
-Patch53: azureus-4.0.0.4-boo-updating-w32.diff
-Patch54: azureus-4.0.0.4-screw-win32utils.diff
-Patch55: azureus-4.0.0.4-oops-return.diff
-Patch56: azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
-Patch57: azureus-4.0.0.4-stupid-invalid-characters.diff
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires: jakarta-commons-cli, log4j
-BuildRequires: libgconf-java
-BuildRequires: bouncycastle >= 1.33-3
-BuildRequires: eclipse-swt >= 3.4.0
-BuildRequires: junit
-Requires: jakarta-commons-cli, log4j
+Patch50: azureus-4.0.0.4-boo-windows.diff
+Patch51: azureus-4.0.0.4-boo-osx.diff
+Patch52: azureus-4.0.0.4-screw-w32-tests.diff
+Patch53: azureus-4.0.0.4-boo-updating-w32.diff
+Patch54: azureus-4.0.0.4-screw-win32utils.diff
+Patch55: azureus-4.0.0.4-oops-return.diff
+Patch56: azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
+Patch57: azureus-4.0.0.4-stupid-invalid-characters.diff
+
+Patch58: azureus-4.2.0.4-java5.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
+BuildRequires: jakarta-commons-cli, log4j
+BuildRequires: libgconf-java
+BuildRequires: bouncycastle >= 1.33-3
+BuildRequires: eclipse-swt >= 3.4.0
+BuildRequires: junit
+Requires: jakarta-commons-cli, log4j
Requires: xulrunner
-Requires: eclipse-swt >= 3.4.0
-Requires: libgconf-java
-Requires: bouncycastle >= 1.33-3
-Requires: java >= 1:1.6.0
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-BuildArch: noarch
+Requires: eclipse-swt >= 3.4.0
+Requires: libgconf-java
+Requires: bouncycastle >= 1.33-3
+Requires: java >= 1:1.6.0
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+BuildArch: noarch
%description
@@ -73,9 +78,11 @@ advanced users.
%prep
%setup -q -c
+
+cp %{SOURCE4} .
#%patch0 -p0
%patch2 -p0
-%patch3 -p0
+%patch3 -p1 -b .remove-manifest-classpath
%patch9 -p0
#%patch12 -p0
#%patch13 -p0
@@ -87,7 +94,7 @@ advanced users.
#%patch20 -p0
#%patch22 -p0
#%patch23 -p0
-%patch27 -p0
+%patch27 -p1 -b .nobcprov
%patch28 -p0
#%patch31 -p0
#rm com/aelitis/azureus/core/update -rf
@@ -96,14 +103,23 @@ advanced users.
#find ./ -name win32 | xargs rm -r
#find ./ -name Win32\* | xargs rm -r
# Remove test code
-%patch50 -b .orig
-%patch51 -b .orig
+
+rm org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java
+rm org/gudy/azureus2/platform/macosx/PlatformManagerImpl.java
+rm org/gudy/azureus2/platform/win32/PlatformManagerImpl.java
+%patch50 -b .boo-windows
+
+rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
+%patch51 -b .boo-osx
%patch52 -b .orig
-%patch53 -b .orig
+%patch53 -p1 -b .boo-updating-w32
%patch54 -b .orig
%patch55 -b .orig
-%patch56 -b .orig
+%patch56 -p1 -b .silly-java-tricks-are-for-kids
%patch57 -b .orig -p1
+
+%patch58 -p1 -b .java5
+
rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
#sed -i -e \
# "s|sun.security.action.GetPropertyAction|gnu.java.security.action.GetPropertyAction|" \
@@ -151,7 +167,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadi
install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
# TODO: fix launcher to be multilib-safe
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
-sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
+sed --in-place "s:LIBDIR:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
#install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
#install -pm 644 plugins/azplugins/azplugins_2.1.6.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_2.1.6.jar
@@ -171,9 +187,9 @@ install -m 644 org/gudy/azureus2/ui/icon
install -m 644 org/gudy/azureus2/ui/icons/a64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/azureus.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
+desktop-file-install --vendor fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --add-category X-Fedora \
%{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
@@ -201,7 +217,7 @@ fi
%files
%defattr(-,root,root)
-%doc ChangeLog.txt GPL.txt
+%doc ChangeLog.txt
%{_datadir}/applications/*
%{_datadir}/application-registry/*
%{_datadir}/pixmaps/azureus.png
@@ -212,6 +228,11 @@ fi
%{_datadir}/azureus
%changelog
+* Wed Jul 29 2009 David Juran <david at juran.se> - 4.2.0.4-1
+- Upgrade to 4.2.0.4
+- Fix SWT dir on x86_64 (Bz 515228)
+- fix rpmlint warnings
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -499,7 +520,7 @@ an updated azureus-themed.patch to work
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-9
- Require libgcj with the latest fixes for running Azureus.
-- Be explicit about .png files in %files.
+- Be explicit about .png files in files-section.
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-8
- Remove bouncycastle from build-classpath in startup script.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 26 Feb 2009 20:20:32 -0000 1.15
+++ sources 3 Aug 2009 19:05:59 -0000 1.16
@@ -1 +1 @@
-3f521ec1f74d5b1a78921db4174858a6 Vuze_4.0.0.4_source.zip
+5145354022b67cef3a26ac7f5bd1c4fb Vuze_4.2.0.4_source.zip
- Previous message (by thread): rpms/wordpress/devel .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 wordpress.spec, 1.32, 1.33
- Next message (by thread): rpms/ruby-gnome2/F-10 ruby-gnome2-0.19.1-vte-depend.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 ruby-gnome2.spec, 1.46, 1.47 sources, 1.7, 1.8 ruby-gnome2-0.19.0-gtk-missingheader.patch, 1.1, NONE ruby-gnome2-0.19.0-gtkmozembed.patch, 1.1, NONE ruby-gnome2-0.19.0-panel-applet.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list