From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 24 20:20:32 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 663E316A40F for ; Sun, 24 Sep 2006 20:20:32 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0622443D49 for ; Sun, 24 Sep 2006 20:20:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8OKKTc3099343 for ; Sun, 24 Sep 2006 20:20:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8OKKTrs099342; Sun, 24 Sep 2006 20:20:29 GMT (envelope-from gnats) Resent-Date: Sun, 24 Sep 2006 20:20:29 GMT Resent-Message-Id: <200609242020.k8OKKTrs099342@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rainer Alves Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C731E16A47B; Sun, 24 Sep 2006 20:18:30 +0000 (UTC) (envelope-from rainer@valfenda.ibest.com.br) Received: from valfenda.ibest.com.br (valfenda.ibest.com.br [200.181.68.248]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8C6443D49; Sun, 24 Sep 2006 20:18:29 +0000 (GMT) (envelope-from rainer@valfenda.ibest.com.br) Received: from valfenda.ibest.com.br (valfenda.ibest.com.br [127.0.0.1]) by valfenda.ibest.com.br (Postfix) with ESMTP id C04253E8FD3; Sun, 24 Sep 2006 17:18:20 -0300 (BRST) Received: (from root@localhost) by valfenda.ibest.com.br (8.13.3/8.13.3/Submit) id k8OKIKD5088332; Sun, 24 Sep 2006 17:18:20 -0300 (BRST) (envelope-from rainer) Message-Id: <200609242018.k8OKIKD5088332@valfenda.ibest.com.br> Date: Sun, 24 Sep 2006 17:18:20 -0300 (BRST) From: Rainer Alves To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lioux@FreeBSD.org Subject: ports/103590: [UPDATE] net-p2p/azureus to 2.5.0.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rainer Alves List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Sep 2006 20:20:32 -0000 >Number: 103590 >Category: ports >Synopsis: [UPDATE] net-p2p/azureus to 2.5.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 24 20:20:29 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rainer Alves >Release: FreeBSD 7.0-CURRENT i386 >Organization: BrasilTelecom >Environment: >Description: - Update to 2.5.0.0 Note to maintainer: E ae lioux, como vai? Espero que esse patch lhe seja util. Um abraco, Rainer Alves. >How-To-Repeat: >Fix: --- azureus-2.5.0.0.diff begins here --- diff -ruN /usr/ports/net-p2p/azureus/Makefile net-p2p/azureus/Makefile --- /usr/ports/net-p2p/azureus/Makefile Mon Mar 20 09:54:25 2006 +++ net-p2p/azureus/Makefile Sun Sep 24 16:59:27 2006 @@ -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 @@ 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 -ruN /usr/ports/net-p2p/azureus/distinfo net-p2p/azureus/distinfo --- /usr/ports/net-p2p/azureus/distinfo Mon Mar 20 09:54:25 2006 +++ net-p2p/azureus/distinfo Sat Sep 23 18:19:11 2006 @@ -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 -ruN /usr/ports/net-p2p/azureus/files/patch-jnilib net-p2p/azureus/files/patch-jnilib --- /usr/ports/net-p2p/azureus/files/patch-jnilib Wed Dec 31 21:00:00 1969 +++ net-p2p/azureus/files/patch-jnilib Sun Sep 24 16:20:19 2006 @@ -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 -ruN /usr/ports/net-p2p/azureus/files/patch-swt31 net-p2p/azureus/files/patch-swt31 --- /usr/ports/net-p2p/azureus/files/patch-swt31 Mon Mar 20 02:57:26 2006 +++ net-p2p/azureus/files/patch-swt31 Sun Sep 24 16:25:56 2006 @@ -2,75 +2,185 @@ 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. --- azureus-2.5.0.0.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: