[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 93403a47b8e572be3c6347793f9afb35121f015c

Benjamin Drung bdrung-guest at alioth.debian.org
Tue Nov 3 20:11:34 UTC 2009


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, upstream has been updated
       via  93403a47b8e572be3c6347793f9afb35121f015c (commit)
      from  31d83135ce25d7cba7209bf3e05a1af06a81462b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   39 +++++
 build.sh                                           |    8 +
 build.xml                                          |    9 +-
 eclipse-build-additionalArchs.tar.bz2              |  Bin 1013156 -> 96235 bytes
 eclipse-build-config/ChangeLog                     |   16 ++
 eclipse-build-config/build.properties              |   78 ---------
 eclipse-build-config/build.properties.in           |   53 ++++++
 .../productFiles/rcpConfig/build.properties        |   11 +-
 patches/eclipse-add-archs-executable.patch         |  171 +++++++++++++++++++-
 patches/eclipse-add-archs-filesystem.patch         |   93 ++++++++++-
 patches/eclipse-add-archs-swt.patch                |  144 +++++++++++++++--
 patches/eclipse-add-ppc64-sparc64-s390-s390x.patch |   39 +++--
 patches/eclipse-addArchesAnd64bitSWT.patch         |   38 +++++
 patches/eclipse-jdt_launch-customBuild.patch       |    2 +-
 14 files changed, 574 insertions(+), 127 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36fb116..bdc7fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2009-11-03  Andrew Overholt  <overholt at redhat.com>
+
+	* patches/eclipse-jdt_launch-customBuild.patch: Correct offset.
+	* patches/eclipse-addArchesAnd64bitSWT.patch: Fix end of file.
+	* patches/eclipse-add-archs-executable.patch: Likewise.
+	* build.xml: File strip level for above patch (5 -> 6).
+
+2009-11-03  Andrew Overholt  <overholt at redhat.com>
+
+	Bug #293952
+
+	* build.xml: Only build for target (idea courtesy Matthias Klose).
+
+2009-11-03  Matthias Klose  <doko at ubuntu.com>
+
+	* eclipse-build-additionalArchs.tar.bz2:  Add files for arm, mips, mipsel,
+	PA_RISC, alpha, ia64.  Fix existing files for 64-bit platforms (ppc64 and
+	sparc64).  Copy over fix for bug #293974.
+
+2009-11-03  Matthias Klose  <doko at ubuntu.com>
+
+	Bug #293948
+
+	* patches/eclipse-add-archs-filesystem.patch: Add MIPs, PA_RISC, alpha,
+	arm, ia64.  Alphabetize platforms.
+	* patches/eclipse-add-archs-executable.patch: Likewise.
+	* patches/eclipse-add-archs-swt.patch: Likewise.
+	* patches/eclipse-add-ppc64-sparc64-s390-s390x.patch: Add MIPS and arm.
+	* build.xml: Set strip=0 for eclipse-add-pp64-sparc64-s390-s390x.patch.
+	Add application of patches/eclipse-addArchesAnd64bitSWT.patch.
+	* patches/eclipse-64bitSWT.patch: New file.  Add arm, PA_RISC, sparcv9,
+	MIPS to SWT build.sh.  Make SWT 64-bit on alpha, too. 
+
+2009-11-03  Matthias Klose  <doko at ubuntu.com>
+
+	Bug #293951
+
+	* build.sh: Add MIPS and PA_RISC.
+
 2009-10-26  Matthias Klose  <doko at ubuntu.com>
 
 	* additionalArchs/rename.sh: Remove bashism.
diff --git a/build.sh b/build.sh
index 9802cbd..954e21f 100755
--- a/build.sh
+++ b/build.sh
@@ -8,10 +8,18 @@ fi
 
 # Massage arch for Eclipse-uname differences
 case ${arch} in
+	arm*)
+		arch=arm ;;
 	i[0-9]*86)
 		arch=x86 ;;
 	ia64)
 		arch=ia64 ;;
+	mips*)
+		if which dpkg-architecture >/dev/null 2>&1; then
+			arch=`dpkg-architecture -q-qDEB_HOST_ARCH`
+		fi ;;
+	parisc*)
+		arch=PA_RISC ;;
 	ppc)
 		arch=ppc ;;
 	ppc64)
diff --git a/build.xml b/build.xml
index bd3fdff..871961a 100644
--- a/build.xml
+++ b/build.xml
@@ -239,10 +239,11 @@
 		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.patch" dir="${buildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" />
+		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="6" />
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="0" />
-		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
+		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="0" />
 		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
@@ -254,6 +255,12 @@
 		<patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
 		<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307 -->
 		<patch patchfile="${basedir}/patches/gtk2.18zorder.patch" dir="${buildDirectory}/plugins/org.eclipse.swt" strip="0" />
+		<!-- Only build for one target (bug #293952) -->
+		<copy 
+			file="${buildConfigs}/eclipse-build-config/build.properties.in"
+			tofile="${buildConfigs}/eclipse-build-config/build.properties"/>
+		<replace file="${buildConfigs}/eclipse-build-config/build.properties"
+			token="@build_arch@" value="${buildArch}"/>
 		<echo file="patch-stamp" />
 	</target>
 
diff --git a/eclipse-build-additionalArchs.tar.bz2 b/eclipse-build-additionalArchs.tar.bz2
index 5f8c8d7..9401717 100644
Binary files a/eclipse-build-additionalArchs.tar.bz2 and b/eclipse-build-additionalArchs.tar.bz2 differ
diff --git a/eclipse-build-config/ChangeLog b/eclipse-build-config/ChangeLog
index befa467..ea69312 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,5 +1,21 @@
+2009-11-03  Andrew Overholt  <overholt at redhat.com>
+
+	Bug #293952 (Matthias Klose)
+
+	* build.properties.in: Re-name from build.properties and copy to
+	build.properties at build time.
+
+2009-11-03  Matthias Klose  <doko at ubuntu.com>
+
+	Bug #293951
+
+	* build.properties: Add MIPS and PA_RISC.
+	* productFiles/rcpConfig/build.properties: Likewise.
+
 2009-11-02  Matthias Klose  <doko at ubuntu.com>
 
+	Bug #293951
+
 	* productFiles/rcpConfig/build.properties: Add arm support.
 	* build.properties: Likewise.
 
diff --git a/eclipse-build-config/build.properties b/eclipse-build-config/build.properties
deleted file mode 100755
index 421d8fb..0000000
--- a/eclipse-build-config/build.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Red Hat, Inc. - modified from "master" for eclipse-build
-###############################################################################
-topLevelElementId=eclipse-build-feature
-topLevelElementType=feature
-baseLocation=
-outputUpdateJars = true
-individualSourceBundles=true
-flattenDependencies=true
-parallelCompilation=true
-runPackager=true
-groupConfigurations=true
-p2.gathering=true
-p2.compress=true
-p2.publishonerror=true
-name=${p2.repo.name}
-skipMirroring=true
-p2.build.repo=file:${buildDirectory}/buildRepo
-generateAPIDescription=false
-buildDirectory=${basedir}/build
-bootclasspath=${java.home}/lib/rt.jar
-buildType=I
-buildId=build
-buildLabel=${buildType}.${buildId}
-timestamp=0000
-collPlace=eclipse
-collBase=.
-configs=\
-	win32, win32, x86 &\
-	win32, wpf, x86 &\
-	win32, win32, x86_64 &\
-	wce_ppc, win32, arm &\
-	linux, gtk, alpha &\
-	linux, gtk, arm &\
-	linux, gtk, x86 & \
-	linux, gtk, ppc & \
-	linux, gtk, ppc64 & \
-	linux, gtk, x86_64 &\
-	linux, gtk, s390 &\
-	linux, gtk, s390x &\
-	linux, gtk, sparc &\
-	linux, gtk, sparcv9 &\
-	linux, gtk, sparc64 &\
-	linux, motif, x86 & \
-	solaris, gtk, sparc & \
-	solaris, gtk, x86 & \
-	solaris, motif, sparc & \
-	aix, motif, ppc & \
-	hpux, motif, PA_RISC & \
-	hpux, motif, ia64_32 & \
-	macosx, carbon, ppc & \
-	macosx, cocoa, x86 & \
-	macosx, cocoa, x86_64 & \
-	qnx, photon, x86
-
-archivesFormat =group,group,group-zip
-javacFailOnError=false
-javacDebugInfo=on
-javacVerbose=true
-compilerArg=-inlineJSR -enableJavadoc -encoding ISO-8859-1
-
-zipargs=
-tarargs=--owner=0 --group=0 
-
-collectingFolder=eclipse
-archivePrefix=eclipse
-
-baseos=linux
-basews=gtk
-basearch=x86
diff --git a/eclipse-build-config/build.properties.in b/eclipse-build-config/build.properties.in
new file mode 100755
index 0000000..a654bfb
--- /dev/null
+++ b/eclipse-build-config/build.properties.in
@@ -0,0 +1,53 @@
+###############################################################################
+# Copyright (c) 2000, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Red Hat, Inc. - modified from "master" for eclipse-build
+###############################################################################
+topLevelElementId=eclipse-build-feature
+topLevelElementType=feature
+baseLocation=
+outputUpdateJars = true
+individualSourceBundles=true
+flattenDependencies=true
+parallelCompilation=true
+runPackager=true
+groupConfigurations=true
+p2.gathering=true
+p2.compress=true
+p2.publishonerror=true
+name=${p2.repo.name}
+skipMirroring=true
+p2.build.repo=file:${buildDirectory}/buildRepo
+generateAPIDescription=false
+buildDirectory=${basedir}/build
+bootclasspath=${java.home}/lib/rt.jar
+buildType=I
+buildId=build
+buildLabel=${buildType}.${buildId}
+timestamp=0000
+collPlace=eclipse
+collBase=.
+configs=\
+	linux, gtk, @build_arch@
+
+archivesFormat =group,group,group-zip
+javacFailOnError=false
+javacDebugInfo=on
+javacVerbose=true
+compilerArg=-inlineJSR -enableJavadoc -encoding ISO-8859-1
+
+zipargs=
+tarargs=--owner=0 --group=0 
+
+collectingFolder=eclipse
+archivePrefix=eclipse
+
+baseos=linux
+basews=gtk
+basearch=x86
diff --git a/eclipse-build-config/productFiles/rcpConfig/build.properties b/eclipse-build-config/productFiles/rcpConfig/build.properties
index da6a805..3863774 100644
--- a/eclipse-build-config/productFiles/rcpConfig/build.properties
+++ b/eclipse-build-config/productFiles/rcpConfig/build.properties
@@ -21,6 +21,12 @@ root.solaris.gtk.x86=absolute:${buildDirectory}/features/org.eclipse.equinox.exe
 
 root.linux.gtk.arm=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.arm,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/arm
 root.linux.gtk.arm.permissions.755=*.so*
+root.linux.gtk.mips=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.mips,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/mips
+root.linux.gtk.mips.permissions.755=*.so*
+root.linux.gtk.mipsel=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.mipsel,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/mipsel
+root.linux.gtk.mipsel.permissions.755=*.so*
+root.linux.gtk.PA_RISC=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.PA_RISC,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/PA_RISC
+root.linux.gtk.PA_RISC.permissions.755=*.so*
 root.linux.gtk.x86=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86
 root.linux.gtk.x86.permissions.755=*.so*
 root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
@@ -38,9 +44,8 @@ root.linux.gtk.s390x.permissions.755=*.so*
 root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
 root.linux.gtk.x86_64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
 root.linux.gtk.x86_64.permissions.755=*.so*
-#root.linux.gtk.ia64=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64
-# Need to be fixed to reflect eventual change into feature.xml
-#root.qnx.photon.x86=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/photon/qnx/x86
+root.linux.gtk.ia64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ia64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64
+root.linux.gtk.ia64.permissions.755=*.so*
 
 root.linux.motif.x86=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/motif/linux/x86,absolue:file:${buildDirectory}/features/plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2
 root.linux.motif.x86.permissions.755=*.so*
diff --git a/patches/eclipse-add-archs-executable.patch b/patches/eclipse-add-archs-executable.patch
index fbc0880..ecab35e 100644
--- a/patches/eclipse-add-archs-executable.patch
+++ b/patches/eclipse-add-archs-executable.patch
@@ -1,28 +1,140 @@
 --- features/org.eclipse.equinox.executable/target.build.properties.real	2009-10-21 14:21:08.843594049 +0300
 +++ features/org.eclipse.equinox.executable/target.build.properties	2009-10-21 14:22:18.142845083 +0300
-@@ -25,6 +25,15 @@ root.linux.gtk.x86.permissions.755=libca
+@@ -19,12 +19,48 @@
+ root.win32.win32.ia64=file:contributed/win32/win32/ia64/launcher.exe
+ root.win32.wpf.x86=file:bin/wpf/win32/x86/launcher.exe
+ 
+-root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
+-root.linux.gtk.x86.permissions.755=libcairo-swt.so
++root.linux.gtk.alpha=bin/gtk/linux/alpha,gtk_root
++root.linux.gtk.alpha.permissions.755=libcairo-swt.so
++
++root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
++root.linux.gtk.arm.permissions.755=libcairo-swt.so
++
++root.linux.gtk.ia64=bin/gtk/linux/ia64,gtk_root
++root.linux.gtk.ia64.permissions.755=libcairo-swt.so
++
++root.linux.gtk.mips=bin/gtk/linux/mips,gtk_root
++root.linux.gtk.mips.permissions.755=libcairo-swt.so
++
++root.linux.gtk.mipsel=bin/gtk/linux/mipsel,gtk_root
++root.linux.gtk.mipsel.permissions.755=libcairo-swt.so
++
++root.linux.gtk.PA_RISC=bin/gtk/linux/PA_RISC,gtk_root
++root.linux.gtk.PA_RISC.permissions.755=libcairo-swt.so
+ 
  root.linux.gtk.ppc=bin/gtk/linux/ppc,gtk_root
  root.linux.gtk.ppc.permissions.755=libcairo-swt.so
  
 +root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
 +root.linux.gtk.ppc64.permissions.755=libcairo-swt.so
 +
++root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
++root.linux.gtk.s390.permissions.755=libcairo-swt.so
++
++root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
++root.linux.gtk.s390x.permissions.755=libcairo-swt.so
++
 +root.linux.gtk.sparc=bin/gtk/linux/sparc,gtk_root
 +root.linux.gtk.sparc.permissions.755=libcairo-swt.so
 +
 +root.linux.gtk.sparc64=bin/gtk/linux/sparc64,gtk_root
 +root.linux.gtk.sparc64.permissions.755=libcairo-swt.so
 +
++root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
++root.linux.gtk.x86.permissions.755=libcairo-swt.so
++
++root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
++root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
++
  root.macosx.carbon.ppc=bin/carbon/macosx/ppc
  root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
  
+@@ -49,9 +85,6 @@
+ root.solaris.gtk.x86=bin/gtk/solaris/x86
+ root.solaris.gtk.sparc=bin/gtk/solaris/sparc
+ 
+-root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
+-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+-
+ root.qnx.photon.x86=bin/photon/qnx/x86
+ 
+ root.linux.motif.x86=bin/motif/linux/x86,motif_root
+ 
 --- features/org.eclipse.equinox.executable/feature.xml.real	2009-10-21 14:35:44.818598403 +0300
 +++ features/org.eclipse.equinox.executable/feature.xml	2009-10-21 14:37:07.063593607 +0300
-@@ -97,6 +97,36 @@
-          install-size="0"
+@@ -89,6 +89,66 @@
+          fragment="true"/>
+ 
+    <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.alpha"
++         os="linux"
++         ws="gtk"
++         arch="alpha"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.arm"
++         os="linux"
++         ws="gtk"
++         arch="arm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.ia64"
++         os="linux"
++         ws="gtk"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.mips"
++         os="linux"
++         ws="gtk"
++         arch="mips"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.mipsel"
++         os="linux"
++         ws="gtk"
++         arch="mipsel"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.PA_RISC"
++         os="linux"
++         ws="gtk"
++         arch="PA_RISC"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
+          id="org.eclipse.equinox.launcher.gtk.linux.ppc"
+          os="linux"
+          ws="gtk"
+@@ -98,6 +158,56 @@
           version="0.0.0"
           fragment="true"/>
-+	 
+ 
 +    <plugin
 +         id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
 +         os="linux"
@@ -34,6 +146,26 @@
 +         fragment="true"/>
 +	 
 +   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.s390"
++         os="linux"
++         ws="gtk"
++         arch="s390"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
++         os="linux"
++         ws="gtk"
++         arch="s390x"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
 +         id="org.eclipse.equinox.launcher.gtk.linux.sparc"
 +         os="linux"
 +         ws="gtk"
@@ -42,7 +174,7 @@
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"/>
-+   
++
 +   <plugin
 +         id="org.eclipse.equinox.launcher.gtk.linux.sparc64"
 +         os="linux"
@@ -52,6 +184,33 @@
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"/>
- 
++
     <plugin
           id="org.eclipse.equinox.launcher.gtk.linux.x86"
+          os="linux"
+@@ -198,25 +308,5 @@
+          version="0.0.0"
+          fragment="true"/>
+ 
+-   <plugin
+-         id="org.eclipse.equinox.launcher.gtk.linux.s390"
+-         os="linux"
+-         ws="gtk"
+-         arch="s390"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"/>
+-
+-   <plugin
+-         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
+-         os="linux"
+-         ws="gtk"
+-         arch="s390x"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"/>
+-
+ 
+ </feature>
diff --git a/patches/eclipse-add-archs-filesystem.patch b/patches/eclipse-add-archs-filesystem.patch
index 7d5b8f2..5c831f9 100644
--- a/patches/eclipse-add-archs-filesystem.patch
+++ b/patches/eclipse-add-archs-filesystem.patch
@@ -1,6 +1,73 @@
---- ./features/org.eclipse.platform/feature.xml	2009-08-07 18:30:54.000000000 +0300
-+++ ./features/org.eclipse.platform/feature.xml	2009-08-07 18:50:29.043863537 +0300
-@@ -440,6 +440,36 @@
+--- ./features/org.eclipse.platform/feature.xml.orig	2009-10-29 20:07:20.000000000 +0100
++++ ./features/org.eclipse.platform/feature.xml	2009-10-29 20:16:08.000000000 +0100
+@@ -432,6 +432,66 @@
+          unpack="false"/>
+ 
+    <plugin
++         id="org.eclipse.core.filesystem.linux.alpha"
++         os="linux"
++         arch="alpha"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++	 
++   <plugin
++         id="org.eclipse.core.filesystem.linux.arm"
++         os="linux"
++         arch="arm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++	 
++   <plugin
++         id="org.eclipse.core.filesystem.linux.ia64"
++         os="linux"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.core.filesystem.linux.mips"
++         os="linux"
++         arch="mips"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.core.filesystem.linux.mipsel"
++         os="linux"
++         arch="mipsel"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.core.filesystem.linux.PA_RISC"
++         os="linux"
++         arch="PA_RISC"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.core.filesystem.linux.ppc"
+          os="linux"
+          arch="ppc"
+@@ -440,6 +500,56 @@
           version="0.0.0"
           fragment="true"
           unpack="false"/>
@@ -16,6 +83,26 @@
 +         unpack="false"/>
 +	 
 +   <plugin
++         id="org.eclipse.core.filesystem.linux.s390"
++         os="linux"
++         arch="s390"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++	 
++   <plugin
++         id="org.eclipse.core.filesystem.linux.s390x"
++         os="linux"
++         arch="s390x"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++	 
++   <plugin
 +         id="org.eclipse.core.filesystem.linux.sparc"
 +         os="linux"
 +         arch="sparc"
diff --git a/patches/eclipse-add-archs-swt.patch b/patches/eclipse-add-archs-swt.patch
index e232030..315f614 100644
--- a/patches/eclipse-add-archs-swt.patch
+++ b/patches/eclipse-add-archs-swt.patch
@@ -1,52 +1,162 @@
-diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rcp/feature.xml
---- ./features/org.eclipse.rcp/feature.xml.arches	2008-10-03 09:05:02.000000000 -0400
-+++ ./features/org.eclipse.rcp/feature.xml	2008-10-03 09:06:45.000000000 -0400
-@@ -229,6 +229,48 @@
+--- ./features/org.eclipse.rcp/feature.xml.orig	2009-10-25 09:34:48.000000000 +0100
++++ ./features/org.eclipse.rcp/feature.xml	2009-10-29 20:13:44.000000000 +0100
+@@ -217,10 +217,87 @@
           unpack="false"/>
  
     <plugin
-+         id="org.eclipse.swt.gtk.linux.ppc64"
+-         id="org.eclipse.swt.gtk.linux.x86"
++         id="org.eclipse.swt.gtk.linux.alpha"
+          os="linux"
+          ws="gtk"
+-         arch="x86"
++         arch="alpha"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.arm"
 +         os="linux"
 +         ws="gtk"
-+         arch="ppc64"
++         arch="arm"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
 +
-+
-+
-+
 +   <plugin
-+         id="org.eclipse.swt.gtk.linux.sparc"
++         id="org.eclipse.swt.gtk.linux.ia64"
 +         os="linux"
 +         ws="gtk"
-+         arch="sparc"
++         arch="ia64"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
 +
++   <plugin
++         id="org.eclipse.swt.gtk.linux.mips"
++         os="linux"
++         ws="gtk"
++         arch="mips"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
 +
-+
++   <plugin
++         id="org.eclipse.swt.gtk.linux.mipsel"
++         os="linux"
++         ws="gtk"
++         arch="mipsel"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.swt.gtk.linux.sparc64"
++         id="org.eclipse.swt.gtk.linux.PA_RISC"
 +         os="linux"
 +         ws="gtk"
-+         arch="sparc64"
++         arch="PA_RISC"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
 +
++   <plugin
++         id="org.eclipse.swt.gtk.linux.ppc"
++         os="linux"
++         ws="gtk"
++         arch="ppc"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
 +
++   <plugin
++         id="org.eclipse.swt.gtk.linux.ppc64"
++         os="linux"
++         ws="gtk"
++         arch="ppc64"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+@@ -250,8 +327,8 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.swt.gtk.solaris.sparc"
+-         os="solaris"
++         id="org.eclipse.swt.gtk.linux.sparc"
++         os="linux"
+          ws="gtk"
+          arch="sparc"
+          download-size="0"
+@@ -259,12 +336,12 @@
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+-         
 +
+    <plugin
+-         id="org.eclipse.swt.gtk.solaris.x86"
+-         os="solaris"
++         id="org.eclipse.swt.gtk.linux.sparc64"
++         os="linux"
+          ws="gtk"
+-         arch="x86"
++         arch="sparc64"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+@@ -272,10 +349,10 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.swt.gtk.linux.ppc"
++         id="org.eclipse.swt.gtk.linux.x86"
+          os="linux"
+          ws="gtk"
+-         arch="ppc"
++         arch="x86"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+@@ -294,6 +371,28 @@
+          unpack="false"/>
+ 
+    <plugin
++         id="org.eclipse.swt.gtk.solaris.sparc"
++         os="solaris"
++         ws="gtk"
++         arch="sparc"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++         
++   <plugin
++         id="org.eclipse.swt.gtk.solaris.x86"
++         os="solaris"
++         ws="gtk"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
 +
 +   <plugin
-          id="org.eclipse.swt.gtk.solaris.sparc"
-          os="solaris"
-          ws="gtk"
+          id="org.eclipse.swt.carbon.macosx"
+          os="macosx"
+          ws="carbon"
diff --git a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
index 3a2c701..9ffd6b0 100644
--- a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
+++ b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
@@ -1,7 +1,6 @@
-diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2007-06-25 15:57:02.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2007-07-16 16:08:02.000000000 -0400
-@@ -47,6 +47,11 @@
+--- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java.orig	2009-10-25 09:34:49.000000000 +0100
++++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2009-10-29 20:24:58.000000000 +0100
+@@ -48,6 +48,14 @@
  			Platform.ARCH_X86, //
  			Platform.ARCH_AMD64, // 
  			Platform.ARCH_IA64, //
@@ -10,14 +9,15 @@ diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/c
 +			Platform.ARCH_S390, //
 +			Platform.ARCH_S390X, //
 +			Platform.ARCH_ALPHA, //
++			Platform.ARCH_ARM, //
++			Platform.ARCH_MIPS, //
++			Platform.ARCH_MIPSEL, //
  			Platform.ARCH_IA64_32};
  
  	// debug support:  set in loadOptions()
-Only in eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime: InternalPlatform.java.orig
-diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	2007-06-25 15:57:18.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	2007-07-16 16:08:02.000000000 -0400
-@@ -346,6 +346,12 @@
+--- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig	2009-10-25 09:34:49.000000000 +0100
++++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	2009-10-29 20:25:41.000000000 +0100
+@@ -349,6 +349,15 @@
  	 * @since 3.1
  	 */
  	public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
@@ -27,26 +27,26 @@ diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/c
 +	public static final String ARCH_S390 = "s390";//$NON-NLS-1$
 +	public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
 +	public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
++	public static final String ARCH_ARM = "arm";//$NON-NLS-1$
++	public static final String ARCH_MIPS = "mips";//$NON-NLS-1$
++	public static final String ARCH_MIPSEL = "mipsel";//$NON-NLS-1$
  
  	/**
  	 * Constant string (value "win32") indicating the platform is running on a
-Only in eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime: Platform.java.orig
-diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
---- eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java	2007-06-25 15:57:06.000000000 -0400
-+++ eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java	2007-07-16 16:08:02.000000000 -0400
+--- ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java.orig	2009-10-25 09:34:54.000000000 +0100
++++ ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java	2009-10-29 20:23:01.000000000 +0100
 @@ -64,7 +64,7 @@
  	private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
  	private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
  	private static PluginConverterImpl instance;
 -	private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64};
-+	private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X, org.eclipse.osgi.service.environment.Constants.ARCH_ALPHA};
++	private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X, org.eclipse.osgi.service.environment.Constants.ARCH_ALPHA, org.eclipse.osgi.service.environment.Constants.ARCH_ARM, org.eclipse.osgi.service.environment.Constants.ARCH_MIPS, org.eclipse.osgi.service.environment.Constants.ARCH_MIPSEL};
  	static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
  	static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
  	static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
-diff -ru eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java eclipse-3.4-src/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
---- eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig	2008-07-22 08:37:14.000000000 -0400
-+++ eclipse-3.4-src/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	2008-07-22 08:38:02.000000000 -0400
-@@ -131,6 +131,12 @@
+--- ./plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig	2009-10-25 09:34:54.000000000 +0100
++++ ./plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	2009-10-29 20:24:10.000000000 +0100
+@@ -153,6 +153,15 @@
  	 */
  	public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
  
@@ -55,6 +55,9 @@ diff -ru eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclips
 +	public static final String ARCH_S390 = "s390";//$NON-NLS-1$
 +	public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
 +	public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
++	public static final String ARCH_ARM = "arm";//$NON-NLS-1$
++	public static final String ARCH_MIPS = "mips";//$NON-NLS-1$
++	public static final String ARCH_MIPSEL = "mipsel";//$NON-NLS-1$
 +
  	/**
  	 * Constant string (value "win32") indicating the platform is running on a
diff --git a/patches/eclipse-addArchesAnd64bitSWT.patch b/patches/eclipse-addArchesAnd64bitSWT.patch
new file mode 100644
index 0000000..a740c25
--- /dev/null
+++ b/patches/eclipse-addArchesAnd64bitSWT.patch
@@ -0,0 +1,38 @@
+--- ./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~	2009-10-25 09:34:55.000000000 +0100
++++ ./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2009-10-29 20:40:31.000000000 +0100
+@@ -55,11 +55,24 @@
+ if [ "${MODEL}" = "" ]; then
+ 	if uname -i > /dev/null 2>&1; then
+ 		MODEL=`uname -i`
+-	else
++	fi
++	if [ "${MODEL}" = "unknown" ]; then
+ 		MODEL=`uname -m`
+ 	fi
+ fi
+ case $MODEL in
++	arm*)
++		MODEL=arm ;;
++	parisc*)
++		MODEL=PA_RISC ;;
++	sparcv9)
++		MODEL=sparc ;;
++	mips*)
++		if which dpkg-architecture >/dev/null 2>&1; then
++			MODEL=`dpkg-architecture -q-qDEB_HOST_ARCH`
++		fi
++esac
++case $MODEL in
+ 	"x86_64")
+ 		SWT_ARCH=x86_64
+ 		AWT_ARCH=amd64
+@@ -75,7 +86,7 @@
+ esac
+ 
+ # For 64-bit CPUs, we have a switch
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'alpha' ]; then
+ 	SWT_PTR_CFLAGS=-DJNI64
+ 	export SWT_PTR_CFLAGS
+ 	if [ -d /lib64 ]; then
+
diff --git a/patches/eclipse-jdt_launch-customBuild.patch b/patches/eclipse-jdt_launch-customBuild.patch
index 03eef30..9e21d4d 100644
--- a/patches/eclipse-jdt_launch-customBuild.patch
+++ b/patches/eclipse-jdt_launch-customBuild.patch
@@ -1,6 +1,6 @@
 --- plugins/org.eclipse.jdt.launching/scripts/customBuild.xml.orig	2009-03-09 15:06:45.000000000 +0100
 +++ plugins/org.eclipse.jdt.launching/scripts/customBuild.xml	2009-03-09 16:57:53.000000000 +0100
-@@ -14,5 +14,64 @@
+@@ -24,5 +24,64 @@
      	<property name="bundleJavacTarget" value="${tempTarget}"/>
      </target>	
  


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.



More information about the pkg-java-commits mailing list