gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge of chico-Overlay

Browse Source
This commit is contained in:
Micha Glave
2006-04-05 11:42:10 +00:00
parent 49a0cfa23b
commit d48cbb4e0b
26 changed files with 294 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dev-util/eclipse-sdk/files/01-distribute_ant_target-2.1.patch
View File

@@ -1,26 +0,0 @@
diff -urN eclipse.orig/build.xml eclipse/build.xml
--- eclipse.orig/build.xml 2003-11-03 14:29:23.000000000 +0100
+++ eclipse/build.xml 2004-01-14 20:27:03.777314290 +0100
@@ -8,6 +8,13 @@
<!-- sourcepath setting for rt.jar in javadoc scripts in org.eclipse.platform.doc.isv and org.eclipse.jdt.doc.isv -->
<property name="rt" value="${bootclasspath}" />
+
+ <!-- target for making a set of distribution zipfiles -->
+ <target name="distribute" depends="init">
+ <antcall target="allElements">
+ <param name="target" value="zip.distribution"/>
+ </antcall>
+ </target>
<!-- default target that runs complete build -->
<target name="run" depends="compile,buildDoc,install" />
@@ -28,7 +35,7 @@
Compiles jars for all sdk plugins, and generates javadoc.
Deletes previously compiled jars first.
-->
- <target name="compile" depends="init,clean">
+ <target name="compile" depends="init">
<record name="compilelog.txt" action="start" />
<antcall target="compileSwt" />
<antcall target="allElements">

19
dev-util/eclipse-sdk/files/01-distribute_ant_target-3.0.patch
View File

@@ -1,19 +0,0 @@
--- eclipse-sdk-3.0.0_pre8.orig/build.xml 2004-05-17 20:10:10.021687520 +0200
+++ eclipse-sdk-3.0.0_pre8/build.xml 2004-05-17 20:11:25.842161056 +0200
@@ -24,7 +24,15 @@
Compiles jars for all sdk plugins, and generates javadoc.
Deletes previously compiled jars first.
-->
- <target name="compile" depends="init,clean">
+
+ <!-- target for making a set of distribution zipfiles -->
+ <target name="distribute" depends="init">
+ <antcall target="allElements">
+ <param name="target" value="zip.distribution"/>
+ </antcall>
+ </target>
+
+ <target name="compile" depends="init">
<record name="compilelog.txt" action="start" />
<antcall target="allElements">
<param name="target" value="build.jars" />

28
dev-util/eclipse-sdk/files/02-konqueror_help_browser-2.1.patch
View File

@@ -1,28 +0,0 @@
--- eclipse-sdk-2.1.3.orig/plugins/org.eclipse.help/plugin.xml 2004-05-16 20:57:36.098652288 +0200
+++ eclipse-sdk-2.1.3/plugins/org.eclipse.help/plugin.xml 2004-05-16 20:58:17.043427736 +0200
@@ -94,6 +94,25 @@
<extension
point="org.eclipse.help.browser">
<browser
+ name="%konqueror_adapter"
+ id="org.eclipse.help.konquerorLinux">
+ <factoryclass
+ class="org.eclipse.help.internal.browser.MozillaFactory">
+ <parameter
+ name="executable"
+ value="konqueror">
+ </parameter>
+ <parameter
+ name="executableName"
+ value="%konqueror">
+ </parameter>
+ <parameter
+ name="os"
+ value="Linux">
+ </parameter>
+ </factoryclass>
+ </browser>
+ <browser
name="%mozilla_adapter"
id="org.eclipse.help.mozillaLinux">
<factoryclass

28
dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
View File

@@ -1,28 +0,0 @@
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>

12
dev-util/eclipse-sdk/files/04-amd64-gtk.patch
View File

@@ -1,12 +0,0 @@
*** eclipse-3.0.1.orig/plugins/platform-launcher/library/gtk/eclipseGtk.c Thu Sep 16 17:46:23 2004
--- eclipse-3.0.1/plugins/platform-launcher/library/gtk/eclipseGtk.c Sun Oct 17 21:06:47 2004
***************
*** 23,28 ****
--- 23,29 ----
#include <stdio.h>
#include <string.h>
#include <locale.h>
+ #include <stdlib.h>
#include <gtk/gtk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>

20
dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch
View File

@@ -1,20 +0,0 @@
diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
--- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp 2005-03-11 15:59:28.000000000 +0200
+++ eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp 2005-03-30 08:03:03.983042167 +0300
@@ -234,16 +234,6 @@
return rc;
}
-JNIEXPORT jboolean JNICALL XPCOM_NATIVE(nsString_1Equals)
- (JNIEnv *env, jclass, jint arg0, jint arg1)
-{
- nsEmbedString *lparg0 = NULL;
- nsEmbedString *lparg1 = NULL;
- if (arg0 != 0) lparg0 = (nsEmbedString*)arg0;
- if (arg1 != 0) lparg1 = (nsEmbedString*)arg1;
- return lparg0->Equals(*lparg1);
-}
-
JNIEXPORT jstring JNICALL XPCOM_NATIVE(PR_1GetEnv)
(JNIEnv *env, jclass, jstring arg0)
{

88
dev-util/eclipse-sdk/files/06-path-fixups.patch
View File

@@ -1,88 +0,0 @@
diff -ur eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml
--- eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml 2005-05-13 21:34:52.000000000 +0300
+++ eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml 2005-05-23 21:43:30.000000000 +0300
@@ -57,10 +57,15 @@
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
+ <exec dir="./src" executable="make">
+ </exec>
+ <copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
+ <fileset dir="src" includes="*.so"/>
+ </copy>
<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="os/,META-INF/,about.html" />
</copy>
- <chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" />
+ <chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" />
</target>
<target name="build.zips" depends="init">
diff -ur eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml
--- eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml 2005-05-13 21:37:28.000000000 +0300
+++ eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml 2005-05-23 21:43:30.000000000 +0300
@@ -5,7 +5,7 @@
<!-- Set a meaningful default value for when it is not. -->
<property name="eclipse-home" value="${basedir}/../.."/>
<property name="jdk-path" value="${java.home}"/>
- <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
+ <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
<property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
<property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
@@ -47,17 +47,17 @@
<property name="header-path" value="${jdk-path}/../include"/>
<property name="header-linux-path" value="${header-path}/linux" />
- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
+ <echo message="gcc -o ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
<apply executable="gcc" dest="${eclipse-home}/" parallel="false">
<arg value="-o"/>
<arg value="${library-file}"/>
<arg value="-shared"/>
+ <arg value="-fPIC"/>
<arg value="-I${src-path}"/>
<arg value="-I${header-path}"/>
<arg value="-I${header-linux-path}"/>
<srcfile/>
- <arg value="-static"/>
<arg value="-lc"/>
<fileset dir="${src-path}" includes="*.c"/>
<mapper type="glob" from="*.c" to="*.o"/>
diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.fix/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
--- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2005-06-27 23:46:32.000000000 +0300
+++ eclipse.fix./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2005-06-27 23:51:09.000000000 +0300
@@ -30,7 +30,9 @@
if [ "${JAVA_HOME}" = "" ]; then
JAVA_HOME=/bluebird/teamswt/swt-builddir/jdk1.5.0
fi
- AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+ if [ "${AWT_LIB_PATH}" = "" ]; then
+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+ fi
XTEST_LIB_PATH=/usr/X11R6/lib64
if [ "${GECKO_SDK}" = "" ]; then
GECKO_SDK=/mozilla/mozilla/1.7/amd64/gtk2/mozilla/dist/sdk
@@ -48,7 +50,9 @@
if [ "${JAVA_HOME}" = "" ]; then
JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
fi
- AWT_LIB_PATH=$JAVA_HOME/jre/bin
+ if [ "${AWT_LIB_PATH}" = "" ]; then
+ AWT_LIB_PATH=$JAVA_HOME/jre/bin
+ fi
XTEST_LIB_PATH=/usr/X11R6/lib
if [ "${GECKO_SDK}" = "" ]; then
GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
--- eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml.orig 2005-07-02 23:53:29.888012464 +0000
+++ eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml 2005-07-02 23:53:42.596080544 +0000
@@ -165,7 +165,7 @@
<java
classname="org.apache.jasper.JspC"
fork="true"
- failonerror="false"
+ failonerror="true"
classpathref="jasper.classpath"
output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
<arg value="-v3" />

3
dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
View File

@@ -1,3 +0,0 @@
MD5 f2c8066151de14c5ccdf420266ce9f39 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
RMD160 ffe59352fe02b4a47be3e9a6daad3a5501f196b0 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
SHA256 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673