rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A couple of problems more fixed

This commit is contained in:
Krzysztof Daniel 2012-07-30 18:00:09 +02:00
parent f37837f70e
commit fcb15c3485
4 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
eclipse-fix-compatibility-class.patch Normal file
View File

@ -0,0 +1,52 @@
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak 2012-07-25 17:28:30.000000000 +0200
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2012-07-30 15:48:17.936540760 +0200
@@ -23,4 +23,49 @@
<artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
<version>3.5.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <copy todir="classes/org/eclipse/core/runtime" file="../org.eclipse.core.runtime/target/classes/org/eclipse/core/runtime/IPluginDescriptor.class"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>

22
eclipse-fix-debug-ui.patch Normal file
View File

@ -0,0 +1,22 @@
--- eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java.bak 2012-07-30 14:27:39.000000000 +0200
+++ eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java 2012-07-30 14:28:00.277726901 +0200
@@ -182,7 +182,7 @@
}
int cmp;
if (num1 instanceof Long && num2 instanceof Long) {
- cmp = ((Long)num1).compareTo(num2);
+ cmp = ((Long)num1).compareTo((Long)num2);
} else {
cmp = Double.compare(num1.doubleValue(), num2.doubleValue());
}
--- eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java.bak 2012-07-25 17:26:39.000000000 +0200
+++ eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java 2012-07-30 15:09:46.416687878 +0200
@@ -853,7 +853,7 @@
*/
private boolean isEnabled(Object element) {
if (element instanceof ICommand) {
- Boolean enabled= (Boolean)((ICommand) element).getArguments().get(COMMAND_ENABLED);
+ Boolean enabled= (Boolean)(Object)((ICommand) element).getArguments().get(COMMAND_ENABLED);
if (enabled != null) {
return enabled.booleanValue();
}

15
eclipse-no-source-for-dependencies.patch
View File

@ -440,3 +440,18 @@
<plugin
id="org.eclipse.jetty.continuation"
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2012-07-25 17:40:44.000000000 +0200
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2012-07-30 16:28:44.017838079 +0200
@@ -67,6 +67,12 @@
<plugin id="org.eclipse.swt.gtk.aix.ppc" />
<plugin id="org.eclipse.swt.gtk.aix.ppc64" />
<plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
+
+ <plugin id="org.w3c.dom.svg" />
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <plugin id=" org.apache.felix.gogo.command" />
+ <plugin id="org.apache.felix.gogo.runtime" />
+ <plugin id="org.apache.felix.gogo.shell" />
</excludes>
</configuration>
</execution>

7
eclipse.spec
View File

@ -71,6 +71,9 @@ Patch9: %{name}-fix-master-ecf.patch
Patch10: %{name}-fix-master-equinox.patch
#services
Patch11: %{name}-osgi-unpack-sources.patch
Patch12: %{name}-fix-debug-ui.patch
Patch13: %{name}-fix-compatibility-class.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@ -257,6 +260,8 @@ developing Eclipse plugins.
%patch9
%patch10
%patch11
%patch12
%patch13
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
@ -306,6 +311,8 @@ find . -name *.jar -exec rm -f {} \;
find . -name *.class -exec rm -f {} \;
find . -name *.so -exec rm -f {} \;
find . -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \;
#popd
%build