Fixed motif compilation problem with Tiger/1.5/5.0

4 files changed, 43 insertions, 8 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 73464e374b08..2a5c335820bc 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.47 2004/07/04 20:57:58 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.48 2004/07/06 23:24:45 karltk Exp $
 
-  04 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  07 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  eclipse-sdk-3.0.0.ebuild: Added patch to allow compiling the
+  Motif frontend with Tiger, sorry, Java 1.5, sorry, 5.0.
+
+  04 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   eclipse-sdk-3.0.0.ebuild: New upstream version. Added block
   against media-fonts/unifont, at the request of Billy Biggs
   from Eclipse.
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 6d523a541306..0f33dad1a768 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,6 +1,6 @@
-MD5 fa6f4d8423ea5c30bc251c9629d94811 ChangeLog 9987
+MD5 080fc0d01f7bfba2ddd006533c086512 ChangeLog 10166
 MD5 69cecfe6f58b8032c3e2520d32db2f58 eclipse-sdk-3.0.0_rc1.ebuild 10867
-MD5 799e83ac3b08416d8481d1faa00e3ee0 eclipse-sdk-3.0.0.ebuild 10845
+MD5 593e72cef0cb6694faf8c951e57060a1 eclipse-sdk-3.0.0.ebuild 10895
 MD5 0991896a28c83192bdff31a038289a7e eclipse-sdk-3.0.0_pre9.ebuild 10592
 MD5 f2e1142f14509268baf54a10a8659983 eclipse-sdk-2.1.3-r3.ebuild 8820
 MD5 f919182142d51ed7e92e72e4f9a802a9 eclipse-sdk-3.0.0_rc2.ebuild 10613
@@ -12,6 +12,7 @@ MD5 4359f5dff0419b45859cb8293690174a files/digest-eclipse-sdk-3.0.0_rc1 89
 MD5 37706eb7efb04f7734c9c296e1d802dd files/digest-eclipse-sdk-3.0.0_rc2 89
 MD5 053cb6bc468bfe44ceafc173b4a42b83 files/digest-eclipse-sdk-3.0.0_rc3 89
 MD5 a906ea8f3ba53fe4ea766495c8f991c8 files/digest-eclipse-sdk-3.0.0_pre9 88
+MD5 8f66a016be8f50dc8f57353c8207c669 files/03-motif-java1.5-build.patch 1848
 MD5 8ddebeb4f299a5fe8d69270538037f14 files/eclipse-2 956
 MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
 MD5 59dd8f6412f3150438363ffe94892db7 files/eclipse-3 950
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
index d434ffc6f33b..096af4d304ed 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild,v 1.2 2004/07/04 20:57:58 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild,v 1.3 2004/07/06 23:24:45 karltk Exp $
 
 inherit eutils
 
@@ -51,6 +51,10 @@ pkg_setup() {
 		die "Detected JDK (${version}) is too old to compile Eclipse, need at least 1.4.2!"
 	fi
 
+	# Needed for the IBM JDK
+	addwrite "/proc/self/maps"
+	addwrite "/proc/cpuinfo"
+
 	set_dirs
 	use gtk && use_gtk='true' || use_gtk='false'
 	use motif && use_motif='true' || use_motif='false'
@@ -94,9 +98,7 @@ src_unpack() {
 	cd ${S}
 	unpack ${A}
 
-	# Needed for the IBM JDK
-	addwrite "/proc/self/maps"
-	addwrite "/proc/cpuinfo"
+	epatch ${FILESDIR}/03-motif-java1.5-build.patch
 
 	# Clean up all pre-built code
 	ant -q -DinstallWs=gtk -DinstallOs=linux clean
diff --git a/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch b/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
new file mode 100644
index 000000000000..3d639216967a
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
@@ -0,0 +1,28 @@
+diff -urN eclipse-sdk-3.0.0.orig/plugins/org.eclipse.swt.motif/build.xml eclipse-sdk-3.0.0/plugins/org.eclipse.swt.motif/build.xml
+--- eclipse-sdk-3.0.0.orig/plugins/org.eclipse.swt.motif/build.xml	2004-06-25 18:26:03.000000000 +0200
++++ eclipse-sdk-3.0.0/plugins/org.eclipse.swt.motif/build.xml	2004-07-07 00:53:06.000000000 +0200
+@@ -105,7 +105,7 @@
+ 		<property name="destdir" value="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
+ 		<delete dir="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
+ 		<mkdir dir="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
+-		<javac destdir="${temp.folder}/ws/motif/swt-gtk.jar.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}">
++		<javac destdir="${temp.folder}/ws/motif/swt-gtk.jar.bin" source="1.3" target="1.2" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}">
+ 			<src path="${plugindir}/Eclipse SWT PI/motif_gtk/"/>
+ 		</javac>
+         <property name="includes" value=""/>
+@@ -125,7 +125,7 @@
+ 	<property name="destdir" value="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
+ 	<delete dir="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
+ 	<mkdir dir="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
+-	<javac destdir="${temp.folder}/ws/motif/swt-mozilla.jar.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" classpath="${build.result.folder}/ws/motif/swt-gtk.jar">
++	<javac destdir="${temp.folder}/ws/motif/swt-mozilla.jar.bin" source="1.3" target="1.2" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" classpath="${build.result.folder}/ws/motif/swt-gtk.jar">
+ 		<src path="${plugindir}/Eclipse SWT Mozilla/gtk/"/>
+ 		<src path="${plugindir}/Eclipse SWT Mozilla/common/"/>
+ 	</javac>
+@@ -315,4 +315,4 @@
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-</project>
+\ No newline at end of file
++</project>