From 3a987e15a5292532eb96fcbeccbfaa79b969745f Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Thu, 12 Sep 2013 14:07:35 +0000 Subject: [PATCH] - Update to version 5.1.0.0 - Add patch removing use of SWT 3.8 API - Remove options, vuze don't build with ancient swt anymore Changes: http://blog.vuze.com/2013/08/14/vuze-5-1/ --- net-p2p/vuze/Makefile | 24 ++++--------------- net-p2p/vuze/distinfo | 4 ++-- .../vuze/files/patch-TableViewPainted.java | 12 ++++++++++ 3 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 net-p2p/vuze/files/patch-TableViewPainted.java diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile index fbb40e2ab101..d1ce289ea119 100644 --- a/net-p2p/vuze/Makefile +++ b/net-p2p/vuze/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vuze -PORTVERSION= 5.0.0.0 +PORTVERSION= 5.1.0.0 CATEGORIES= net-p2p java MASTER_SITES= SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g} DISTNAME= Vuze_${PORTVERSION:S/.//g}_source @@ -12,7 +12,9 @@ COMMENT= BitTorrent client written in Java BUILD_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \ ${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \ - ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit + ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ + ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel +RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel USE_JAVA= yes JAVA_VERSION= 1.6+ @@ -24,10 +26,6 @@ INSTALLS_ICONS= yes JARFILE= ${PORTNAME}.jar -OPTIONS_DEFINE= SWTDEVEL -OPTIONS_DEFAULT= SWTDEVEL -SWTDEVEL_DESC= Use SWT Development port - # build classpath from BUILD_DEPENDS MAKE_ENV= LANG=C CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar:T} @@ -40,7 +38,7 @@ PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} \ SUB_FILES= ${PORTNAME} SUB_LIST= LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \ - SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java" + SWTJAR="${JAVALIBDIR}/swt-devel.jar" JAVA="${LOCALBASE}/bin/java" DESKTOP_ENTRIES= "Vuze" \ "BitTorrent client" \ @@ -49,18 +47,6 @@ DESKTOP_ENTRIES= "Vuze" \ "Network;P2P;Java;" \ true -.include - -.if ${PORT_OPTIONS:MSWTDEVEL} -SWT= swt-devel -BUILD_DEPENDS+= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel -RUN_DEPENDS+= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel -.else -SWT= swt -BUILD_DEPENDS+= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt -RUN_DEPENDS+= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt -.endif - CLASSPATH=. .for jar in ${CLASSPATH_JARS} CLASSPATH:=${CLASSPATH}:${JAVALIBDIR}/${jar} diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo index b28956839225..1a4f6ecc6988 100644 --- a/net-p2p/vuze/distinfo +++ b/net-p2p/vuze/distinfo @@ -1,2 +1,2 @@ -SHA256 (Vuze_5000_source.zip) = b011da3c18cf311987c8c5371c14b779a3858f8346d925c6d7c0b1d8a3ba9979 -SIZE (Vuze_5000_source.zip) = 9731700 +SHA256 (Vuze_5100_source.zip) = 017e56175dc194621f4201e43ccf1af6f0cbc36518ad1b1de0263fd6b0869c46 +SIZE (Vuze_5100_source.zip) = 9873092 diff --git a/net-p2p/vuze/files/patch-TableViewPainted.java b/net-p2p/vuze/files/patch-TableViewPainted.java new file mode 100644 index 000000000000..d4c71b871a01 --- /dev/null +++ b/net-p2p/vuze/files/patch-TableViewPainted.java @@ -0,0 +1,12 @@ +--- org/gudy/azureus2/ui/swt/views/table/painted/TableViewPainted.java.orig 2013-09-10 23:18:13.000000000 +0200 ++++ org/gudy/azureus2/ui/swt/views/table/painted/TableViewPainted.java 2013-09-10 23:18:56.000000000 +0200 +@@ -2554,9 +2554,6 @@ + } + + private int getScrollbarsMode() { +- if (hasGetScrollBarMode) { +- return cTable.getScrollbarsMode(); +- } + return SWT.NONE; + } +