merge of chico-Overlay
This commit is contained in:
Micha Glave
@@ -1,27 +0,0 @@
|
||||
MD5 d315274aee3541c9394e25754c6cc170 eclipse-sdk-3.1.2.ebuild 10393
|
||||
RMD160 7e585ddfd4f61bc7703eb57c6287199853c432d3 eclipse-sdk-3.1.2.ebuild 10393
|
||||
SHA256 9fd84473fb6871825bb14bd4e777580ffad40e6d1adb8e871216ea0d909d8a68 eclipse-sdk-3.1.2.ebuild 10393
|
||||
MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
|
||||
RMD160 b1e41e2a202fcd91135b9df0573b3611c27bc046 files/01-distribute_ant_target-2.1.patch 1103
|
||||
SHA256 98b71329db9aae0bbeef88613939c68a9220764e8c207f4301f38a9087e72cd3 files/01-distribute_ant_target-2.1.patch 1103
|
||||
MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
|
||||
RMD160 3e95ebeb60bd16a584945aca923a5edc7cd82156 files/01-distribute_ant_target-3.0.patch 726
|
||||
SHA256 11248e25b16ac86634c6da2fd0d33dbff10c31d663aa92ec6db8e29bb111d300 files/01-distribute_ant_target-3.0.patch 726
|
||||
MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
|
||||
RMD160 4785681bd4c970b344fb163d42d19dd8682ebef7 files/02-konqueror_help_browser-2.1.patch 1013
|
||||
SHA256 56212dbd6e8e2ba9ced67e70b04e4b0111acfd7198021ae939286198db7dd244 files/02-konqueror_help_browser-2.1.patch 1013
|
||||
MD5 8f66a016be8f50dc8f57353c8207c669 files/03-motif-java1.5-build.patch 1848
|
||||
RMD160 274af67bdbfccb89ae4cf6b2ff431f8821c1aeac files/03-motif-java1.5-build.patch 1848
|
||||
SHA256 3bd0d4812b95070a807c51c36c4bfd3cf9d1b509484b43b25ea9080e33269707 files/03-motif-java1.5-build.patch 1848
|
||||
MD5 79d8cfcfc342234eac01538827998fa2 files/04-amd64-gtk.patch 388
|
||||
RMD160 ce337c9a8cd13dd104bdb7f01d1a46aeb966e090 files/04-amd64-gtk.patch 388
|
||||
SHA256 f2a492ccc0a24fec3af54e64594ea06814267e6849b0d7d9a31ee80cbdcea67b files/04-amd64-gtk.patch 388
|
||||
MD5 3110e7ec528bc98ef251172c2d7e2956 files/05-mozilla-xpcom.patch 862
|
||||
RMD160 307f83c9751c7f58a805026a3dff53ff98d26788 files/05-mozilla-xpcom.patch 862
|
||||
SHA256 aa188e120d350c55b333cbdcde7fed0a79015d4608a424d48ffcf1735c494648 files/05-mozilla-xpcom.patch 862
|
||||
MD5 a9f983102fa1b491ad4c4f154123d509 files/06-path-fixups.patch 4707
|
||||
RMD160 9870d6a1c6278d37f1dbbfaf966aef3604fae4e4 files/06-path-fixups.patch 4707
|
||||
SHA256 f031191538783d91e8370832ac7b712e47d2d32515d3979bdc409ac46567a4ca files/06-path-fixups.patch 4707
|
||||
MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2 310
|
||||
RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2 310
|
||||
SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2 310
|
||||
@@ -1,370 +0,0 @@
|
||||
# Copyright 1999-2005 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.1.1.ebuild,v 1.1 2005/11/09 19:00:28 axxo Exp $
|
||||
|
||||
inherit eutils java-utils
|
||||
|
||||
MY_A="eclipse-sourceBuild-srcIncluded-3.1.2.zip"
|
||||
DESCRIPTION="Eclipse Tools Platform"
|
||||
HOMEPAGE="http://www.eclipse.org/"
|
||||
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/${MY_A}"
|
||||
IUSE="gnome mozilla firefox jikes nosrc nodoc atk"
|
||||
SLOT="3.1"
|
||||
LICENSE="CPL-1.0"
|
||||
KEYWORDS="~x86 ~ppc ~amd64"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.4.2
|
||||
>=x11-libs/gtk+-2.2.4
|
||||
mozilla? ( >=www-client/mozilla-1.7 )
|
||||
atk? ( >=dev-libs/atk-1.6 )
|
||||
firefox? ( >=www-client/mozilla-firefox-1.0.2 )
|
||||
gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
>=virtual/jdk-1.4.2
|
||||
jikes? ( >=dev-java/jikes-1.21 )
|
||||
>=dev-java/ant-1.6.2
|
||||
>=dev-java/ant-core-1.6.2-r4
|
||||
>=sys-apps/findutils-4.1.7
|
||||
app-arch/unzip
|
||||
app-arch/zip"
|
||||
|
||||
# TODO:
|
||||
# - use CFLAGS from make.conf when building native libraries
|
||||
# - must patch eclipse build files
|
||||
# - also submit patch to bugs.eclipse
|
||||
# - intergration to eclipse plugin ebuilds most likely broken
|
||||
# - ppc support not tested, but not explicitly broken either
|
||||
|
||||
pkg_setup() {
|
||||
|
||||
einfo "Checking for sufficient physical RAM"
|
||||
check-ram
|
||||
check-cflags
|
||||
|
||||
java-utils_setup-vm
|
||||
|
||||
java-utils_ensure-vm-version-ge 1 4 2
|
||||
|
||||
# all other gentoo archs match in eclipse build system except amd64
|
||||
if [ ${ARCH} == 'amd64' ] ; then
|
||||
eclipsearch=x86_64
|
||||
else
|
||||
eclipsearch=${ARCH}
|
||||
fi
|
||||
|
||||
# all other gentoo archs match in sun jdk library patch except x86
|
||||
if [ ${ARCH} == 'x86' ] ; then
|
||||
jvmarch=i386
|
||||
else
|
||||
jvmarch=${ARCH}
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
|
||||
mkdir ${S}
|
||||
cd ${S}
|
||||
unpack ${MY_A} || die "Could not unpack ${MY_A}"
|
||||
|
||||
epatch ${FILESDIR}/06-path-fixups.patch
|
||||
|
||||
einfo "Setting up virtual machine"
|
||||
java-utils_setup-vm
|
||||
|
||||
einfo "Cleaning out prebuilt code"
|
||||
clean-prebuilt-code
|
||||
|
||||
einfo "Patching makefiles"
|
||||
process-makefiles
|
||||
|
||||
patch_amd64_ibm_jvm
|
||||
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
|
||||
# karltk: this should be handled by the java-pkg eclass in setup-vm
|
||||
addwrite "/proc/self/maps"
|
||||
addwrite "/proc/cpuinfo"
|
||||
addwrite "/dev/random"
|
||||
|
||||
# Figure out VM, set up ant classpath and native library paths
|
||||
setup-jvm-opts
|
||||
|
||||
${use_gtk} && use mozilla && setup-mozilla-opts
|
||||
|
||||
use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"
|
||||
|
||||
einfo "Bootstrapping bootstrap ecj"
|
||||
ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
|
||||
|
||||
einfo "Bootstrapping ecj"
|
||||
ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
|
||||
|
||||
einfo "Compiling Eclipse -- see ${S}/compilelog.txt for details"
|
||||
ANT_OPTS="-Xmx1024M" \
|
||||
ant -lib jdtcoresrc/ecj.jar -q -f build.xml \
|
||||
-DinstallOs=linux \
|
||||
-DinstallWs=gtk \
|
||||
-DinstallArch=${eclipsearch} \
|
||||
-Dbootclasspath=${bootclasspath} \
|
||||
-Dlibsconfig=true \
|
||||
-DjavacTarget=1.4 \
|
||||
-DjavacSource=1.4 \
|
||||
-DjavacVerbose=false \
|
||||
-DjavacFailOnError=true \
|
||||
-DjavacDebugInfo=true \
|
||||
-DbuildId="Gentoo Linux ${PF}" \
|
||||
|| die "Failed to compile Eclipse"
|
||||
|
||||
cp launchertmp/eclipse eclipse-gtk || die "Cannot find eclipse binary"
|
||||
|
||||
einfo "Creating .desktop entry"
|
||||
create-desktop-entry
|
||||
}
|
||||
|
||||
src_install() {
|
||||
|
||||
eclipse_dir="/usr/lib/eclipse-${SLOT}"
|
||||
|
||||
dodir /usr/lib
|
||||
|
||||
einfo "Installing features and plugins"
|
||||
|
||||
[ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ] || die "tar.gz bundle was not built properly!"
|
||||
tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib || die "Failed to extract the built package"
|
||||
|
||||
|
||||
mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
|
||||
|
||||
insinto ${eclipse_dir}
|
||||
|
||||
# Install launchers and native code
|
||||
exeinto ${eclipse_dir}
|
||||
|
||||
einfo "Installing eclipse-gtk binary"
|
||||
doexe eclipse-gtk || die "Failed to install eclipse binary"
|
||||
|
||||
if use nosrc ; then
|
||||
einfo "Stripping away source code"
|
||||
strip-src
|
||||
fi
|
||||
|
||||
if use nodoc ; then
|
||||
einfo "Stripping away documentation"
|
||||
strip-docs
|
||||
fi
|
||||
|
||||
# Install startup script
|
||||
exeinto /usr/bin
|
||||
doexe ${FILESDIR}/eclipse-${SLOT}
|
||||
|
||||
install-desktop-entry
|
||||
|
||||
doman ${FILESDIR}/eclipse.1
|
||||
|
||||
install-link-files
|
||||
}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Helper functions
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
function setup-mozilla-opts()
|
||||
{
|
||||
mozilla_dir="--mozdir-unset---"
|
||||
|
||||
if [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
|
||||
einfo "Compiling against www-client/mozilla-firefox"
|
||||
mozilla_dir=/usr/lib/MozillaFirefox
|
||||
elif [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
|
||||
einfo "Compiling against www-client/mozilla"
|
||||
mozilla_dir=/usr/lib/mozilla
|
||||
else
|
||||
eerror "You have enabled the embedded mozilla component, but no suitable"
|
||||
eerror "provider was found. You need Mozilla or Firefox compiled against"
|
||||
eerror "gtk+ v2.0 or newer."
|
||||
eerror "To merge it, execute 'USE=\"gtk2\" emerge mozilla' as root."
|
||||
eerror "To disable embedded mozilla, remove \"mozilla\" from your USE flags."
|
||||
die "Need Mozilla compiled with gtk+-2.x support"
|
||||
fi
|
||||
|
||||
export GECKO_SDK="${mozilla_dir}"
|
||||
export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \
|
||||
-I${GECKO_SDK}/include/nspr \
|
||||
-I${GECKO_SDK}/include/nspr \
|
||||
-I${GECKO_SDK}/include/xpcom \
|
||||
-I${GECKO_SDK}/include/string \
|
||||
-I${GECKO_SDK}/include/embed_base \
|
||||
-I${JAVA_HOME}/include/linux"
|
||||
export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
|
||||
}
|
||||
|
||||
function build-native() {
|
||||
sh features/org.eclipse.platform.launchers/library/gtk/build.sh \
|
||||
-os linux -ws gtk \
|
||||
-arch ${eclipsearch} || die "Failed to build launcher"
|
||||
}
|
||||
|
||||
function process-makefiles() {
|
||||
|
||||
# Comment out hard-coded JAVA_HOME
|
||||
sed -i 's/^JAVA_HOME/#JAVA_HOME/' plugins/org.eclipse.core.resources.linux/src/Makefile || die "Failed to patch Makefile"
|
||||
|
||||
# Select the set of native libraries to compile
|
||||
local libs="make_swt make_awt make_atk"
|
||||
|
||||
if use gnome ; then
|
||||
einfo "Building GNOME VFS support"
|
||||
libs="${libs} make_gnome"
|
||||
fi
|
||||
|
||||
if use mozilla ; then
|
||||
einfo "Building Mozilla embed support"
|
||||
libs="${libs} make_mozilla"
|
||||
fi
|
||||
|
||||
if use atk ; then
|
||||
einfo "Building ATK support"
|
||||
libs="${libs} make_atk"
|
||||
fi
|
||||
|
||||
sed -i "s/^all:.*/all: ${libs}/" "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" || die "Failed to patch make_linux.mak"
|
||||
}
|
||||
|
||||
function create-desktop-entry() {
|
||||
|
||||
cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
|
||||
sed -e "s/@PV@/${PV}/" \
|
||||
> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
|
||||
}
|
||||
|
||||
function install-desktop-entry() {
|
||||
|
||||
dodir /usr/share/applications
|
||||
insinto /usr/share/applications
|
||||
doins eclipse-${SLOT}.desktop
|
||||
}
|
||||
|
||||
function clean-prebuilt-code() {
|
||||
|
||||
find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f
|
||||
}
|
||||
|
||||
function get-memory-total() {
|
||||
cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([0-9]+).*/\1/"
|
||||
}
|
||||
|
||||
function check-ram() {
|
||||
|
||||
local mem=$(get-memory-total)
|
||||
[ $(get-memory-total) -lt 775000 ] &&
|
||||
(
|
||||
echo
|
||||
ewarn "To build Eclipse, at least 768MB of RAM is recommended."
|
||||
ewarn "Your machine has less RAM. Continuing anyway. If the build"
|
||||
ewarn "stops with an error about invalid memory, increase your swap."
|
||||
echo
|
||||
)
|
||||
}
|
||||
|
||||
function install-link-files() {
|
||||
|
||||
einfo "Installing link files"
|
||||
|
||||
dodir /usr/lib/eclipse-${SLOT}/links
|
||||
|
||||
echo "path=/opt/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.link
|
||||
echo "path=/opt/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.1.link
|
||||
|
||||
echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
|
||||
echo "path=/usr/lib/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.1.link
|
||||
}
|
||||
|
||||
function patch_amd64_ibm_jvm() {
|
||||
# the ibm jdk ebuild should have fixed headers, but until then
|
||||
# we just fix the compiling here (see bug #97421)
|
||||
if [ ${ARCH} == 'amd64' ]; then
|
||||
if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
|
||||
einfo "Fixing IBM jdk header problem"
|
||||
find plugins -name "make_linux.mak" -print0 | xargs -0 sed -i -e 's/^CFLAGS =/CFLAGS = -D_JNI_IMPORT_OR_EXPORT_= /'
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
function setup-jvm-opts() {
|
||||
|
||||
# Figure out correct boot classpath
|
||||
# karltk: this should be handled by the java-pkg eclass in setup-vm
|
||||
if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
|
||||
# IBM JRE
|
||||
local bp="$(java-config --jdk-home)/jre/lib"
|
||||
bootclasspath="${bp}/core.jar:${bp}/xml.jar:${bp}/graphics.jar:${bp}/security.jar:${bp}/server.jar"
|
||||
JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
|
||||
else
|
||||
# Sun derived JREs (Blackdown, Sun)
|
||||
local bp="$(java-config --jdk-home)/jre/lib"
|
||||
bootclasspath="${bp}/rt.jar:${bp}/jsse.jar"
|
||||
JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}"
|
||||
fi
|
||||
einfo "Using bootclasspath ${bootclasspath}"
|
||||
einfo "Using JVM library path ${JAVA_LIB_DIR}"
|
||||
|
||||
if [ ! -f ${JAVA_LIB_DIR}/libawt.so ] ; then
|
||||
die "Could not find libawt.so native library"
|
||||
fi
|
||||
|
||||
export AWT_LIB_PATH=${JAVA_LIB_DIR}
|
||||
}
|
||||
|
||||
function strip-src() {
|
||||
|
||||
local bp=${D}/${eclipse_dir}
|
||||
|
||||
rm -rf ${bp}/plugins/org.eclipse.pde.source_3*
|
||||
rm -rf ${bp}/plugins/org.eclipse.jdt.source_3*
|
||||
rm -rf ${bp}/plugins/org.eclipse.platform.source.linux.*
|
||||
rm -rf ${bp}/plugins/org.eclipse.platform.source_3*
|
||||
|
||||
rm -rf ${bp}/features/org.eclipse.jdt.source_3*/
|
||||
rm -rf ${bp}/features/org.eclipse.pde.source_3*/
|
||||
rm -rf ${bp}/features/org.eclipse.platform.source_3*/
|
||||
}
|
||||
|
||||
function strip-docs() {
|
||||
local bp=${D}/${eclipse_dir}
|
||||
|
||||
rm -rf ${bp}/plugins/org.eclipse.platform.doc.*
|
||||
rm -rf ${bp}/plugins/org.eclipse.jdt.doc.*
|
||||
rm -rf ${bp}/plugins/org.eclipse.pde.doc.*
|
||||
}
|
||||
|
||||
function check-cflags() {
|
||||
|
||||
einfo "Checking for bad CFLAGS"
|
||||
|
||||
local badflags="-fomit-frame-pointer -msse2"
|
||||
local error=false
|
||||
|
||||
for x in ${badflags} ; do
|
||||
if [ ! -z "$(echo ${CFLAGS} | grep -- $x)" ] ; then
|
||||
ewarn "Found offending option $x in your CFLAGS"
|
||||
error=true
|
||||
fi
|
||||
done
|
||||
if [ ${error} == "true" ]; then
|
||||
echo
|
||||
ewarn "One or more potentially gruesome CFLAGS detected. When you run into trouble,"
|
||||
ewarn "please edit /etc/make.conf and remove all offending flags, then recompile"
|
||||
ewarn "Eclipse and all its dependencies before submitting a bug report."
|
||||
echo
|
||||
ewarn "In particular, gtk+ is extremely sensitive to which which flags it was"
|
||||
ewarn "compiled with."
|
||||
echo
|
||||
einfo "Tip: use equery depgraph \"=${PF}\" to list all dependencies."
|
||||
echo
|
||||
ebeep
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -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">
|
||||
@@ -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" />
|
||||
@@ -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
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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)
|
||||
{
|
||||
@@ -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" />
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user