Update to 2.5.0.0

PR:		103590
Submitted by:	Rainer Alves <rainer.alves@gmail.com>

4 files changed, 160 insertions, 28 deletions

diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index a83ea3aaceab..5fe3d3ded7d7 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	2.4.0.2
+PORTVERSION=	2.5.0.0
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,7 +39,9 @@ USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
 		org/gudy/azureus2/ui/swt/Messages.java \
 		org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java \
 		org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
-		org/gudy/azureus2/ui/swt/views/TableView.java
+		org/gudy/azureus2/ui/swt/views/TableView.java \
+		org/gudy/azureus2/ui/swt/Utils.java \
+		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 NO_WRKSUBDIR=	yes
 
 JARFILE=	${PORTNAME}.jar
diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo
index b281d6f1ef2f..e6d2c0e32bd7 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,3 +1,3 @@
-MD5 (Azureus_2.4.0.2_source.zip) = f79a2c3664fe26a21d208551bfac4b6f
-SHA256 (Azureus_2.4.0.2_source.zip) = 3c25d6560110b64acf7b395950f1b9b2553a365215a0e3fb6bce3d2414147099
-SIZE (Azureus_2.4.0.2_source.zip) = 5188679
+MD5 (Azureus_2.5.0.0_source.zip) = f487f75f37674820bd3b2cc6af97ce57
+SHA256 (Azureus_2.5.0.0_source.zip) = 64aa4150bb8036f11e5207a602253431d46578ce9cd3b62732b0ae0f555a08c4
+SIZE (Azureus_2.5.0.0_source.zip) = 5856328
diff --git a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
new file mode 100644
index 000000000000..c5cab31b137e
--- /dev/null
+++ b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
@@ -0,0 +1,20 @@
+--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig	Sun Sep 24 16:18:49 2006
++++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java	Sun Sep 24 16:19:07 2006
+@@ -19,7 +19,7 @@
+  */
+ package org.gudy.azureus2.platform.macosx.access.jnilib;
+ 
+-import org.eclipse.swt.internal.carbon.AEDesc;
++// import org.eclipse.swt.internal.carbon.AEDesc;
+ 
+ import org.gudy.azureus2.core3.util.Debug;
+ 
+@@ -42,7 +42,7 @@
+ 		}
+ 	}
+ 
+-	public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
++//	public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
+ 
+ 	public static final native String getVersion();
+ 	
diff --git a/net-p2p/vuze/files/patch-swt31 b/net-p2p/vuze/files/patch-swt31
index 20cf8cbdd5bf..3db8d63cdc7d 100644
--- a/net-p2p/vuze/files/patch-swt31
+++ b/net-p2p/vuze/files/patch-swt31
@@ -2,75 +2,185 @@ This set of patches allows Azureus to build against the 3.1.x version
 of SWT. When the 3.2.x is _released_ by Eclipse, and our x11-toolkits/swt31
 port is updated, this file can be removed from the Azureus port.
 
-	-mi
-
---- org/gudy/azureus2/ui/swt/Messages.java	Fri Feb 10 00:08:06 2006
-+++ org/gudy/azureus2/ui/swt/Messages.java	Tue Mar 14 11:00:05 2006
-@@ -218,5 +218,5 @@
+--- org/gudy/azureus2/ui/swt/Messages.java.orig	Sun Sep 24 15:18:49 2006
++++ org/gudy/azureus2/ui/swt/Messages.java	Sun Sep 24 15:55:09 2006
+@@ -100,6 +100,7 @@
+         
+         // XXX We could (should?) send this event for all widget types
+         // XXX Would it better to have a custom event type?
++/*
+         if (SWT.getVersion() > 3200) {
+ 	        Event event = new Event();
+ 	    		// SWT 3.2 only.  Code Ok -- Only called in SWT 3.2 mode
+@@ -107,6 +108,7 @@
+ 	        event.widget = widget;
+ 	        widget.notifyListeners(SWT.Settings, event);
+         }
++*/
+       }
+       else if (widget instanceof Tree) {
+         Tree tree = (Tree) widget;
+@@ -191,7 +193,7 @@
+ 							Constants.isOSX ? "Cmd+" : "Ctrl+"));
          }
        }
 -    } else if (widget instanceof TableColumn) {
 +    } /* else if (widget instanceof TableColumn) {
        String key = (String) widget.getData();
  			if (key != null) {
-@@ -236,4 +236,5 @@
+ 				if (!key.endsWith(".info"))
+@@ -209,6 +211,7 @@
+ 				}
  			}
      }
 +*/
    }
    
---- org/gudy/azureus2/ui/swt/views/TableView.java	Fri Feb 10 00:07:52 2006
-+++ org/gudy/azureus2/ui/swt/views/TableView.java	Tue Mar 14 11:03:38 2006
-@@ -2714,5 +2714,5 @@
+
+--- org/gudy/azureus2/ui/swt/views/TableView.java.orig	Sun Sep 24 15:23:49 2006
++++ org/gudy/azureus2/ui/swt/views/TableView.java	Sun Sep 24 16:04:17 2006
+@@ -631,6 +631,7 @@
+ 			});
+ 		}
+ 
++/*
+     if (Utils.SWT32_TABLEPAINT) {
+   		// SWT 3.2 only.  Code Ok -- Only called in SWT 3.2 mode
+ 			table.addListener(SWT.PaintItem, new Listener() {
+@@ -643,6 +644,7 @@
+ 				}
+ 			});
+ 		}
++*/
+ 
+     // Deselect rows if user clicks on a black spot (a spot with no row)
+     table.addMouseListener(new MouseAdapter() {
+@@ -816,6 +818,7 @@
+     
+     // we are sent a SWT.Settings event when the language changes and
+     // when System fonts/colors change.  In both cases, invalidate
++/*
+     if (SWT.getVersion() > 3200) {
+ 	    table.addListener(SWT.Settings, new Listener() {
+ 	      public void handleEvent(Event e) {
+@@ -823,6 +826,7 @@
+ 	      }
+ 	    });
+     }
++*/
+ 
+     // XXX Disabled.  We handle unset rows ourselves via table paints which
+     //     are more reliable.
+@@ -970,6 +974,7 @@
+ 		}
+ 
+ 		// SWT 3.2 only.  Code Ok -- Only called in SWT 3.2 mode
++/*
+ 		Rectangle cellBounds = item.getBounds(event.index);
+ 		
+ 		cellBounds.x += 3;
+@@ -1018,6 +1023,7 @@
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		}
++*/
+ 	}
+ 
+ 	public void runDefaultAction() {
+@@ -3148,7 +3154,7 @@
+ 	private void changeColumnIndicator() {
  		if (table == null || table.isDisposed())
  			return;
 -
 +/*
  		try {
  			// can't use TableColumnCore.getPosition, because user may have moved
-@@ -2733,4 +2733,5 @@
+ 			// columns around, messing up the SWT column indexes.  
+@@ -3167,6 +3173,7 @@
+ 		} catch (NoSuchMethodError e) {
  			// sWT < 3.2 doesn't have column indicaters
  		}
 +*/
  	}
  
---- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	Fri Feb 10 00:08:06 2006
-+++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	Tue Mar 14 11:06:20 2006
-@@ -374,4 +374,5 @@
+ 	private void visibleRowsChanged() {
+--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.orig	Sun Sep 24 15:28:27 2006
++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	Sun Sep 24 15:29:27 2006
+@@ -406,12 +406,14 @@
+ 			tc.addSelectionListener(new SelectionAdapter() {
  				public void widgetSelected(SelectionEvent e) {
  					boolean ascending = comparator.setField(table.indexOf(tc));
 +/*
  					try {
  						table.setSortColumn(tc);
-@@ -380,4 +381,5 @@
+ 						table.setSortDirection(ascending ? SWT.UP : SWT.DOWN);
+ 					} catch (NoSuchMethodError ignore) {
  						// Ignore Pre 3.0
  					}
 +*/
  					Collections.sort(pluginIFs, comparator);
  					table.clearAll();
---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	Thu Mar 16 14:04:50 2006
-+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	Fri Mar 17 08:16:49 2006
-@@ -208,4 +208,5 @@
- 		// Create shell & widgets
- 		shell = new Shell(display, SWT.ON_TOP);
+ 				}
+--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig	Sun Sep 24 15:32:29 2006
++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	Sun Sep 24 15:59:32 2006
+@@ -64,7 +64,7 @@
+  *
+  */
+ public class MessageSlideShell {
+-	private static boolean USE_SWT32_BG_SET = true;
++	private static boolean USE_SWT32_BG_SET = false;
+ 
+ 	private static final boolean DEBUG = false;
+ 
+@@ -289,6 +289,7 @@
+ 		if (shell == null) {
+ 			shell = new Shell(display, style);
+ 		}
 +/*
  		if (USE_SWT32_BG_SET) {
  			try {
-@@ -215,4 +216,5 @@
+ 				shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
+@@ -298,6 +299,7 @@
+ 				// ignore
  			}
  		}
 +*/
  		Utils.setShellIcon(shell);
+ 		shell.setText(popupParams.title);
  
-@@ -435,4 +437,5 @@
+@@ -537,6 +539,7 @@
+ 			gc.dispose();
  
  			boolean bAlternateDrawing = true;
 +/*
  			if (USE_SWT32_BG_SET) {
  				try {
-@@ -442,4 +445,5 @@
+ 					shell.setBackgroundImage(imgBackground);
+@@ -544,7 +547,7 @@
+ 				} catch (NoSuchMethodError e) {
  				}
  			}
+-
 +*/
- 
  			if (bAlternateDrawing) {
+ 				// Drawing of BG Image for pre SWT 3.2
+ 
+
+--- org/gudy/azureus2/ui/swt/Utils.java.orig	Sun Sep 24 16:24:39 2006
++++ org/gudy/azureus2/ui/swt/Utils.java	Sun Sep 24 16:25:05 2006
+@@ -680,6 +680,7 @@
+ 		if (!table.isVisible() || iTopIndex >= itemCount)
+ 			return -1;
+ 		
++/*
+ 		if (Constants.isOSX) {
+ 			try {
+ 				TableItem item = table.getItem(iTopIndex);
+@@ -702,6 +703,7 @@
+ 								table.getItemHeight()) + 1, table.getItemCount() - 1);
+ 			}
+ 		}
++*/
+ 
+ 		// getItem will return null if clientArea's height is smaller than
+ 		// header height.