new upstream version. also fixed segfault problem on amd64, the wrong distfile was used for amd64. thanks to Ricardo Correia <gentoo-bugs@wizy.org> for his effort.

(Portage version: 2.0.51.20-r5)

7 files changed, 168 insertions, 6 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index bda418cb7e9d..7596659a9cad 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.12 2005/04/09 12:19:51 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.13 2005/05/04 11:52:54 luckyduck Exp $
+
+*swt-3.1_pre5 (04 May 2005)
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/build-3.1_pre5.xml, swt-3.1_pre2.ebuild, +swt-3.1_pre5.ebuild:
+  new upstream version. also fixed segfault problem on amd64, the wrong
+  distfile was used for amd64. thanks to Ricardo Correia
+  <gentoo-bugs@wizy.org> for his effort.
 
 *swt-3.1_pre2 (09 Apr 2005)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 18a166247218..63de361155fb 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,12 +1,15 @@
+MD5 80773a9bf7519c455cbff62edd5992b1 swt-3.1_pre5.ebuild 4280
 MD5 25ede423575048b79da0f2c310e43c66 swt-3.0-r2.ebuild 3084
-MD5 dff1e48bf434802f53602b79c4565ab7 swt-3.1_pre2.ebuild 4036
+MD5 3585896a5b64949f4bfecadccba7ab16 swt-3.1_pre2.ebuild 4242
 MD5 39de7935a662313cbc1aaae1144bfe54 swt-3.0.ebuild 3081
 MD5 ad887ee17423be97002117a0949781fb swt-3.0-r1.ebuild 3084
-MD5 8bc3bc40ebfb5dcd657a765299049cb9 ChangeLog 1997
+MD5 80503c57f10caf154a66738359cb9c15 ChangeLog 2321
 MD5 4dcb6dd494f5e369aed5a367e303aef4 metadata.xml 433
 MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.1_pre2.xml 437
+MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.1_pre5.xml 437
 MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0-r1 67
 MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0-r2 67
 MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.0.xml 437
 MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0 67
-MD5 6f0351cc3517fc6665af5422acc29a7b files/digest-swt-3.1_pre2 69
+MD5 4f82f20829e012ee55c8ecf16261d5e8 files/digest-swt-3.1_pre2 144
+MD5 bd191dfc71013927ffb09f1e464399e8 files/digest-swt-3.1_pre5 147
diff --git a/dev-java/swt/files/build-3.1_pre5.xml b/dev-java/swt/files/build-3.1_pre5.xml
new file mode 100644
index 000000000000..79a86eba692e
--- /dev/null
+++ b/dev-java/swt/files/build-3.1_pre5.xml
@@ -0,0 +1,17 @@
+<project name="SWT" default="jar" basedir=".">
+	<property name="src" location="src"/>
+	<property name="bin" location="class"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${bin}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="compile the source">
+		<javac srcdir="${src}" destdir="${bin}" />
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar destfile="swt.jar" basedir="${bin}" />
+	</target>
+</project>
diff --git a/dev-java/swt/files/digest-swt-3.1_pre2 b/dev-java/swt/files/digest-swt-3.1_pre2
index 533ce998aa5e..7f7b083786d3 100644
--- a/dev-java/swt/files/digest-swt-3.1_pre2
+++ b/dev-java/swt/files/digest-swt-3.1_pre2
@@ -1 +1,2 @@
 MD5 1c50c1c49f29c76a9feb5d7dd9bb476a swt-3.1M2-linux-gtk.zip 2332510
+MD5 1165677ebf8dd5fd8eeac746e2d4b221 swt-3.1M2-linux-gtk-amd64.zip 2344204
diff --git a/dev-java/swt/files/digest-swt-3.1_pre5 b/dev-java/swt/files/digest-swt-3.1_pre5
new file mode 100644
index 000000000000..2543c56e1ad7
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.1_pre5
@@ -0,0 +1,2 @@
+MD5 5d8fa0f4c4f44e94bbd80227b86669c1 swt-3.1M5a-linux-gtk.zip 2544679
+MD5 2ec8125407ce4be940c3b9ce5ed1e5cd swt-3.1M5a-linux-gtk-x86_64.zip 2570843
diff --git a/dev-java/swt/swt-3.1_pre2.ebuild b/dev-java/swt/swt-3.1_pre2.ebuild
index 425699ee5c3d..46230cc005e3 100644
--- a/dev-java/swt/swt-3.1_pre2.ebuild
+++ b/dev-java/swt/swt-3.1_pre2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre2.ebuild,v 1.1 2005/04/09 12:19:51 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre2.ebuild,v 1.2 2005/05/04 11:52:54 luckyduck Exp $
 
 inherit eutils java-pkg
 
 DESCRIPTION="SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/downloads/drops/S-3.1M2-200409240800/swt-3.1M2-linux-gtk.zip"
+SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/S-3.1M2-200409240800/swt-3.1M2-linux-gtk.zip )
+	amd64? ( http://download.eclipse.org/downloads/drops/S-3.1M2-200409240800/swt-3.1M2-linux-gtk-amd64.zip )"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 KEYWORDS="~x86 ~amd64"
 SLOT="3"
@@ -86,6 +87,11 @@ src_compile() {
 	export XTEST_LIB_PATH=/usr/X11R6/lib
 	export AWT_LIB_PATH=$JAVA_HOME/jre/bin
 
+	# Fix for bug #91340
+	if use amd64 ; then
+		export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+	fi
+
 	make make_swt || die "Failed to build platform-independent SWT support"
 	make make_atk || die "Failed to build atk support"
 
diff --git a/dev-java/swt/swt-3.1_pre5.ebuild b/dev-java/swt/swt-3.1_pre5.ebuild
new file mode 100644
index 000000000000..71b387ac9349
--- /dev/null
+++ b/dev-java/swt/swt-3.1_pre5.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre5.ebuild,v 1.1 2005/05/04 11:52:54 luckyduck Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+
+MY_PV="3.1M5a"
+MY_PVA="${MY_PV}-200502191500"
+
+SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/S-${MY_PVA}/swt-${MY_PV}-linux-gtk.zip )
+	amd64? ( http://download.eclipse.org/downloads/drops/S-${MY_PVA}/swt-${MY_PV}-linux-gtk-x86_64.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~x86 ~amd64"
+SLOT="3"
+
+IUSE="gnome mozilla"
+
+RDEPEND=">=x11-libs/gtk+-2.2.4
+	mozilla? ( >=www-client/mozilla-1.5 )
+	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4
+	dev-java/ant
+	app-arch/unzip"
+
+src_unpack() {
+	mkdir ${S} && cd ${S}
+	unpack ${A}
+
+	rm -f *.so *.jar
+	use mozilla || rm -f swt-mozillasrc.zip
+
+	for i in *.zip ; do
+		einfo "Unpacking ${i} to ${S}"
+		unzip ${i} &> /dev/null
+	done
+
+	if use mozilla; then
+		cp library/*.cpp ${S} || die "Failed copy *.cpp"
+	fi
+
+	mkdir src && mv org src/
+	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml || die "Failed to copy build.xml"
+
+	sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
+
+	use mozilla ||
+		(
+			rm -rf ${S}/src/org/eclipse/swt/browser
+			rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
+		)
+
+}
+
+src_compile() {
+	if use gnome ; then
+	    gnome_libs=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export-dynamic:--export-dynamic:"`
+	fi
+
+	gtk_libs=`pkg-config --libs gtk+-2.0 | sed -e "s:-Wl,--export-dynamic:--export-dynamic:"`
+	gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export-dynamic:--export-dynamic:"`
+	atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export-dynamic:--export-dynamic:"`
+
+	sed -e :a -e '/\\$/N; s/\\\n//; ta' make_linux.mak > makefile.mak
+	moz_cflags="-O -fno-rtti -fno-exceptions -fPIC -Wall -Wno-non-virtual-dtor -DNO_nsEmbedString_1Equals \
+		-DXPCOM_GLUE=1 -DMOZILLA_STRICT_API=1 -DSWT_VERSION=\$(SWT_VERSION) \$(NATIVE_STATS) \
+		-include \$(MOZILLA_FIVE_HOME)/include/mozilla-config.h \
+		-I./ -I./library \
+		-I\$(MOZILLA_FIVE_HOME)/include \
+		-I\$(MOZILLA_FIVE_HOME)/include/java \
+		-I\$(MOZILLA_FIVE_HOME)/include/nspr -I\$(MOZILLA_FIVE_HOME)/include/nspr/include \
+		-I\$(MOZILLA_FIVE_HOME)/include/xpcom -I\$(MOZILLA_FIVE_HOME)/include/xpcom/include \
+		-I\$(MOZILLA_FIVE_HOME)/include/string -I\$(MOZILLA_FIVE_HOME)/include/string/include \
+		-I\$(MOZILLA_FIVE_HOME)/include/embed_base -I\$(MOZILLA_FIVE_HOME)/include/embed_base/include \
+		-I\$(MOZILLA_FIVE_HOME)/include/embedstring -I\$(MOZILLA_FIVE_HOME)/include/embedstring/include"
+	moz_libs="-shared -Wl,--version-script=mozilla_exports -Bsymbolic -L\$(MOZILLA_FIVE_HOME) -lgtkembedmoz"
+
+	sed -e "s:\`pkg-config --libs gtk+-2.0\`:${gtk_libs}:" \
+		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
+		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_libs}:" \
+		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:-I\$(JAVA_HOME)/include\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:MOZILLACFLAGS = .*$:MOZILLACFLAGS = ${moz_cflags}:" \
+		-e "s:MOZILLALIBS = .*$:MOZILLALIBS = ${moz_libs}:" \
+		makefile.mak > Makefile
+
+	export XTEST_LIB_PATH=/usr/X11R6/lib
+	export AWT_LIB_PATH=$JAVA_HOME/jre/bin
+
+	# Fix for bug #91340
+	if use amd64 ; then
+		export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+	fi
+
+	make make_swt || die "Failed to build platform-independent SWT support"
+	make make_atk || die "Failed to build atk support"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		make make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	if use mozilla ; then
+		einfo "Building Mozilla component"
+		make make_mozilla || die "Failed to build Mozilla support"
+	fi
+
+	einfo "Building java source"
+	ant jar || die "Failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
+
+	java-pkg_sointo /usr/lib
+	java-pkg_doso *.so || die "Install of .so-files failed"
+
+	dohtml about.html
+}
+