From owner-freebsd-eclipse@FreeBSD.ORG Mon Jan 23 16:06:18 2006 Return-Path: X-Original-To: freebsd-eclipse@freebsd.org Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DA8C16A41F; Mon, 23 Jan 2006 16:06:18 +0000 (GMT) (envelope-from mi@aldan.algebra.com) Received: from aldan.algebra.com (aldan.algebra.com [216.254.65.224]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFB5243D48; Mon, 23 Jan 2006 16:06:17 +0000 (GMT) (envelope-from mi@aldan.algebra.com) Received: from aldan.algebra.com (blue [127.0.0.1]) by aldan.algebra.com (8.13.4/8.13.4) with ESMTP id k0NG6F3K018682 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 23 Jan 2006 11:06:15 -0500 (EST) (envelope-from mi@aldan.algebra.com) Received: (from mi@localhost) by aldan.algebra.com (8.13.4/8.13.4/Submit) id k0NG6FUf018681; Mon, 23 Jan 2006 11:06:15 -0500 (EST) (envelope-from mi) Date: Mon, 23 Jan 2006 11:06:15 -0500 (EST) Message-Id: <200601231606.k0NG6FUf018681@aldan.algebra.com> To: FreeBSD-gnats-submit@freebsd.org From: "Mikhail T." X-send-pr-version: 3.113 X-GNATS-Notify: Cc: klm@ptc.com, freebsd-eclipse@freebsd.org Subject: [PATCH] Fixing Azureus to work on amd64 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 16:06:18 -0000 >Submitter-Id: current-users >Originator: Mikhail T. >Organization: Virtual Estates, Inc. >Confidential: no >Synopsis: [PATCH] Fixing Azureus to work on amd64 >Severity: serious >Priority: medium >Category: ports >Class: change-request >Release: FreeBSD 6.0-STABLE amd64 >Environment: System: FreeBSD aldan.algebra.com 6.0-STABLE FreeBSD 6.0-STABLE #5: Sun Nov 20 20:06:48 EST 2005 mi@aldan.algebra.com:/var/src/sys/amd64/compile/GENERIC-aldan amd64 >Description: As soon as the PR 92190 is closed: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/92190 azureus can be made to work on amd64 (and Java-1.5 on other platforms) with the simple patch below. I'm running it right now, as a matter of fact. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/azureus/Makefile,v retrieving revision 1.29 diff -U2 -r1.29 Makefile --- Makefile 4 Jan 2006 23:24:28 -0000 1.29 +++ Makefile 23 Jan 2006 16:00:34 -0000 @@ -26,10 +26,9 @@ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 -ONLY_FOR_ARCHS= i386 USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk -JAVA_VERSION= 1.4 +JAVA_VERSION= 1.4+ JAVA_OS= native USE_ANT= yes @@ -38,4 +38,5 @@ USE_REINPLACE= yes USE_ZIP= yes +USE_DOS2UNIX= org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java NO_WRKSUBDIR= yes @@ -43,4 +44,5 @@ # build classpath from BUILD_DEPENDS +MAKE_ENV= LANG=C _JAVA_OPTIONS=-Xmx512M CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar} Index: files/patch-TransferTypes =================================================================== RCS file: files/patch-TransferTypes diff -N files/patch-TransferTypes --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-TransferTypes 23 Jan 2006 16:00:34 -0000 @@ -0,0 +1,17 @@ +--- org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java Fri Dec 12 09:56:48 2003 ++++ org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java Sat Jun 11 16:06:40 2005 +@@ -41,5 +41,5 @@ + TransferData[] data = event.dataTypes; + for (int i = 0; i < data.length; i++) { +- int id = data[i].type; ++ long id = data[i].type; + String name = getNameFromId(id); + System.out.println("Data type is " + id + " " + name); +@@ -97,5 +97,5 @@ + return ids; + } +- static String getNameFromId(int id) { ++ static String getNameFromId(long id) { +- switch (id) { ++ switch ((int)id) { + case 1 :