From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 2 17:10:24 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE5CD16A407 for ; Sat, 2 Dec 2006 17:10:24 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id B13CF43CB9 for ; Sat, 2 Dec 2006 17:09:50 +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 kB2HAB1n054404 for ; Sat, 2 Dec 2006 17:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB2HABEv054403; Sat, 2 Dec 2006 17:10:11 GMT (envelope-from gnats) Resent-Date: Sat, 2 Dec 2006 17:10:11 GMT Resent-Message-Id: <200612021710.kB2HABEv054403@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, "Robert C. Noland III" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 04A7616A407; Sat, 2 Dec 2006 17:05:00 +0000 (UTC) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D1DA43CAC; Sat, 2 Dec 2006 17:04:32 +0000 (GMT) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: from bbeng-laptop.acs.internap.com (c-24-99-227-6.hsd1.ga.comcast.net [24.99.227.6]) (authenticated bits=0) by gizmo.2hip.net (8.13.8/8.13.8) with ESMTP id kB2H4kGF006756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 2 Dec 2006 12:04:47 -0500 (EST) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: from bbeng-laptop.acs.internap.com (localhost.acs.internap.com [127.0.0.1]) by bbeng-laptop.acs.internap.com (8.13.8/8.13.8) with ESMTP id kB2H4SNd061853; Sat, 2 Dec 2006 12:04:28 -0500 (EST) (envelope-from rnoland@bbeng-laptop.acs.internap.com) Received: (from root@localhost) by bbeng-laptop.acs.internap.com (8.13.8/8.13.8/Submit) id kB2H4Fec061852; Sat, 2 Dec 2006 12:04:15 -0500 (EST) (envelope-from rnoland) Message-Id: <200612021704.kB2H4Fec061852@bbeng-laptop.acs.internap.com> Date: Sat, 2 Dec 2006 12:04:15 -0500 (EST) From: "Robert C. Noland III" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lioux@FreeBSD.org Subject: ports/106227: [PATCH] net-p2p/azureus: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Dec 2006 17:10:24 -0000 >Number: 106227 >Category: ports >Synopsis: [PATCH] net-p2p/azureus: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 02 17:10:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Robert C. Noland III >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD bbeng-laptop.acs.internap.com 7.0-CURRENT FreeBSD 7.0-CURRENT #81: Mon Nov 27 13:51:12 EST 2006 >Description: [DESCRIBE CHANGES] Pick up support for the new swt / swt-devel ports. Use OPTIONS to select which one. Removed file(s): - files/patch-swt31 Port maintainer (lioux@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- azureus-2.5.0.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net-p2p/azureus/Makefile /usr/home/rnoland/azureus/Makefile --- /usr/ports/net-p2p/azureus/Makefile Mon Oct 16 11:50:58 2006 +++ /usr/home/rnoland/azureus/Makefile Sat Dec 2 05:01:32 2006 @@ -19,10 +19,9 @@ ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \ ${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \ ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ - ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 \ ${JAVALIBDIR}/seda.jar:${PORTSDIR}/net/seda RUN_DEPENDS= \ - ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 + ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt ONLY_FOR_ARCHS= i386 amd64 @@ -41,11 +40,15 @@ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.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 + org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \ + com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java + NO_WRKSUBDIR= yes JARFILE= ${PORTNAME}.jar +OPTIONS= SWTDEVEL "Use SWT Development port" off + # build classpath from BUILD_DEPENDS MAKE_ENV= LANG=C CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar} @@ -60,7 +63,7 @@ -e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \ -e "s|%%JAVA_OS%%|${JAVA_OS}|" \ -e "s|%%JARFILE%%|${JARFILE}|" \ - -e "s|%%SWTJAR%%|${JAVALIBDIR}/swt.jar|" \ + -e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \ ${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME} do-install: @@ -73,6 +76,20 @@ @${CAT} ${PKGMESSAGE} .include + +.if defined(WITH_SWTDEVEL) +BUILD_DEPENDS+= \ + ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel +RUN_DEPENDS+= \ + ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel +SWT_JAR= swt-devel.jar +.else +BUILD_DEPENDS+= \ + ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt +RUN_DEPENDS+= \ + ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt +SWT_JAR= swt.jar +.endif CLASSPATH=. .for jar in ${CLASSPATH_JARS} diff -ruN --exclude=CVS /usr/ports/net-p2p/azureus/files/azureus /usr/home/rnoland/azureus/files/azureus --- /usr/ports/net-p2p/azureus/files/azureus Wed Jan 4 06:35:28 2006 +++ /usr/home/rnoland/azureus/files/azureus Sat Dec 2 03:21:45 2006 @@ -25,4 +25,4 @@ echo "LIB_PATH = ${LIB_PATH}" fi -exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=Linux" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}" +exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}" diff -ruN --exclude=CVS /usr/ports/net-p2p/azureus/files/patch-swt31 /usr/home/rnoland/azureus/files/patch-swt31 --- /usr/ports/net-p2p/azureus/files/patch-swt31 Mon Oct 16 11:50:58 2006 +++ /usr/home/rnoland/azureus/files/patch-swt31 Wed Dec 31 19:00:00 1969 @@ -1,186 +0,0 @@ -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. - ---- 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) { - if (!key.endsWith(".info")) -@@ -209,6 +211,7 @@ - } - } - } -+*/ - } - - ---- 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 - // columns around, messing up the SWT column indexes. -@@ -3167,6 +3173,7 @@ - } catch (NoSuchMethodError e) { - // sWT < 3.2 doesn't have column indicaters - } -+*/ - } - - 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); - 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.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 { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); -@@ -298,6 +299,7 @@ - // ignore - } - } -+*/ - Utils.setShellIcon(shell); - shell.setText(popupParams.title); - -@@ -537,6 +539,7 @@ - gc.dispose(); - - boolean bAlternateDrawing = true; -+/* - if (USE_SWT32_BG_SET) { - try { - 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. diff -ruN --exclude=CVS /usr/ports/net-p2p/azureus/pkg-message /usr/home/rnoland/azureus/pkg-message --- /usr/ports/net-p2p/azureus/pkg-message Mon Mar 20 00:57:26 2006 +++ /usr/home/rnoland/azureus/pkg-message Sat Dec 2 11:57:56 2006 @@ -7,8 +7,8 @@ latest version of all your installed packages. -For instance, make sure the swt31 -package is of version 3.1.1 or +For instance, make sure the swt +package is of version 3.2.1 or later. ==================================== --- azureus-2.5.0.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: