diff --git a/.cvsignore b/.cvsignore index adf7233..8ce3250 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,4 @@ eclipse-build-0_4_RC4.tar.gz eclipse-build-R0_4_0.tar.gz eclipse-3.5.2-src.tar.bz2 eclipse-build-0_5_0RC0.tar.gz +eclipse-build-0.5.0.tar.bz2 diff --git a/eclipse-addusrsharedropins.patch b/eclipse-addusrsharedropins.patch deleted file mode 100644 index 125f0ea..0000000 --- a/eclipse-addusrsharedropins.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.orig 2009-10-05 10:29:14.349001858 +0300 -+++ buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product 2009-10-05 10:46:26.812754089 +0300 -@@ -8,7 +8,7 @@ - - - -showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m -- -Xms40m -Xmx256m -+ -Xms40m -Xmx512m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins - -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - - diff --git a/eclipse-ini-install.patch b/eclipse-ini-install.patch deleted file mode 100644 index a200807..0000000 --- a/eclipse-ini-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: build.xml -=================================================================== ---- build.xml (revision 24359) -+++ build.xml (working copy) -@@ -821,8 +821,8 @@ - - - -- -- -+ -+ - - - diff --git a/eclipse-junit-dropins.patch b/eclipse-junit-dropins.patch deleted file mode 100644 index 6241217..0000000 --- a/eclipse-junit-dropins.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java -+++ plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java -@@ -90,6 +90,21 @@ class P2Utils { - try { - URL bundlesTxt= new URL(bundlesLocationURL.getProtocol(), bundlesLocationURL.getHost(), new File(bundlesLocationURL.getFile(), bundleInfoPath).getAbsolutePath()); - BundleInfo bundles[]= getBundlesFromFile(bundlesLocationURL, bundlesTxt); -+ if (useConfigArea) { -+ // the config area may have relative URLs that should be -+ // resolved to the install location. -+ URL installLocationURL = Platform.getInstallLocation().getURL(); -+ BundleInfo installBundles[]= getBundlesFromFile(installLocationURL, bundlesTxt); -+ if (bundles == null || bundles.length == 0) { -+ bundles = installBundles; -+ } -+ else if (installBundles != null && installBundles.length > 0) { -+ BundleInfo mergedBundles[] = new BundleInfo[bundles.length + installBundles.length]; -+ System.arraycopy(bundles, 0, mergedBundles, 0, bundles.length); -+ System.arraycopy(installBundles, 0, mergedBundles, bundles.length, installBundles.length); -+ bundles = mergedBundles; -+ } -+ } - if (bundles == null || bundles.length == 0) { - return null; - } diff --git a/eclipse-swtbug291128.patch b/eclipse-swtbug291128.patch deleted file mode 100644 index badd1ac..0000000 --- a/eclipse-swtbug291128.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -uNr build.xml build.xml ---- build.xml 2009-11-05 06:15:17.000000000 -0500 -+++ build.xml 2009-12-22 16:47:19.000000000 -0500 -@@ -247,6 +247,7 @@ - - - -+ - - - -diff -uNr patches/swtbug291128.patch patches/swtbug291128.patch ---- patches/swtbug291128.patch 1969-12-31 19:00:00.000000000 -0500 -+++ patches/swtbug291128.patch 2009-12-22 16:46:54.000000000 -0500 -@@ -0,0 +1,32 @@ -+### Eclipse Workspace Patch 1.0 -+#P org.eclipse.swt -+Index: Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java -+=================================================================== -+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java,v -+retrieving revision 1.46 -+diff -u -r1.46 AccessibleObject.java -+--- Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java 29 May 2009 21:30:30 -0000 1.46 -++++ Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java 22 Dec 2009 17:05:15 -0000 -+@@ -1176,7 +1176,12 @@ -+ } -+ -+ static AccessibleObject getAccessibleObject (int /*long*/ atkObject) { -+- return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject)); -++ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject)); -++ if (object == null) return null; -++ if (object.accessible == null) return null; -++ Control control = object.accessible.control; -++ if (control == null || control.isDisposed()) return null; -++ return object; -+ } -+ -+ AccessibleObject getChildByHandle (int /*long*/ handle) { -+@@ -1252,7 +1257,7 @@ -+ GObjectClass objectClassStruct = new GObjectClass (); -+ ATK.memmove (objectClassStruct, gObjectClass); -+ ATK.call (objectClassStruct.finalize, atkObject); -+- AccessibleObject object = getAccessibleObject (atkObject); -++ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject)); -+ if (object != null) { -+ AccessibleObjects.remove (new LONG (atkObject)); -+ object.release (); diff --git a/eclipse.spec b/eclipse.spec index d377d0d..94804c6 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -27,11 +27,11 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 2%{?dist} +Release: 3%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: %{download_url}eclipse-build-0_5_0RC0.tar.gz +Source0: %{download_url}eclipse-build-0.5.0.tar.bz2 Source1: %{download_url}eclipse-3.5.2-src.tar.bz2 Source2: eclipse.sh.in Source17: efj.sh.in @@ -47,8 +47,6 @@ Source28: %{name}-mv-Platform.sh Patch0: %{name}-target-platform-template.patch # make o.e.swt.gtk.linux.ppc64 version to match ppc Patch1: %{name}-swt-ppc64-version.patch -Patch2: %{name}-junit-dropins.patch -Patch3: %{name}-ini-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant ant-nodeps @@ -188,9 +186,8 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep -%setup -q -n eclipse-build-0_5_0RC0 +%setup -q -n eclipse-build-0.5.0 cp %{SOURCE1} . -%patch3 ant -DbuildArch=%{eclipse_arch} applyPatches pushd build/eclipse-%{version}-src @@ -243,7 +240,6 @@ fi %patch0 -p0 # make o.e.swt.gtk.linux.ppc64 version to match ppc #%patch1 -#%patch2 popd %build @@ -849,6 +845,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Fri Mar 19 2010 Alexander Kurtakov 1:3.5.2-3 +- Use eclipse-build 0.5.0 release. + * Mon Mar 8 2010 Alexander Kurtakov 1:3.5.2-2 - Fix multilib install. diff --git a/sources b/sources index cc2f9a0..4695629 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 24db7007d7ad739da5ed709cc97879ca eclipse-3.5.2-src.tar.bz2 -e05451e78243153647c2a8c5a4663d10 eclipse-build-0_5_0RC0.tar.gz +4222efa5f5817b369db90843b0ca7563 eclipse-build-0.5.0.tar.bz2