Rebuild for SR2 release of EMF

- Drop upstreamed patches
- Fixes rhbz#1177906

eclipse-bug-386377.patch

@@ -1,11 +1,11 @@
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>x86_64</arch>
    </properties>
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.x86_64</id>
 +      <activation>
 +        <property>
@@ -17,7 +17,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -32,28 +32,6 @@
 +                </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>
@@ -62,13 +40,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>win32</ws>
      <arch>x86_64</arch>
    </properties>
-+  
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-win32.win32.x86_64</id>
 +      <activation>
 +        <property>
@@ -80,7 +57,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -95,28 +72,6 @@
 +                </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>
@@ -125,13 +80,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig	2014-04-16 15:57:02.805249103 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml	2014-04-16 15:57:26.204834155 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>ppc64le</arch>
    </properties>
-+
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.ppc64le</id>
 +      <activation>
 +        <property>
@@ -143,7 +97,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -158,28 +112,6 @@
 +                </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>
@@ -188,12 +120,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>x86</arch>
    </properties>
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.x86</id>
 +      <activation>
 +        <property>
@@ -205,7 +137,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -220,28 +152,6 @@
 +                </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>
@@ -250,13 +160,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>win32</ws>
      <arch>x86</arch>
    </properties>
-+  
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-win32.win32.x86</id>
 +      <activation>
 +        <property>
@@ -268,7 +177,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -283,28 +192,6 @@
 +                </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>
@@ -313,13 +200,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>s390</arch>
    </properties>
-+  
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.s390</id>
 +      <activation>
 +        <property>
@@ -331,7 +217,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -346,28 +232,6 @@
 +                </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>
@@ -376,13 +240,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml	2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>s390x</arch>
    </properties>
-+  
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.s390x</id>
 +      <activation>
 +        <property>
@@ -394,7 +257,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -409,28 +272,6 @@
 +                </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>
@@ -439,13 +280,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml	2014-04-16 15:57:28.315796703 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>ppc64</arch>
    </properties>
-+  
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.ppc64</id>
 +      <activation>
 +        <property>
@@ -457,7 +297,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -472,28 +312,6 @@
 +                </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>
@@ -502,13 +320,12 @@
  </project>
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml	2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
      <ws>gtk</ws>
      <arch>ppc</arch>
    </properties>
-+  
 +  <profiles>
-+  <profile>
++    <profile>
 +      <id>build-native-launchers-gtk.linux.ppc</id>
 +      <activation>
 +        <property>
@@ -520,7 +337,7 @@
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
++            <version>1.7</version>
 +            <executions>
 +              <execution>
 +                <id>compile-executable-natives</id>
@@ -535,28 +352,6 @@
 +                </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>

eclipse-bug-438992.patch

@@ -1,96 +0,0 @@
-From faa3866df482c0e42ac5b308a5551882f833a3aa Mon Sep 17 00:00:00 2001
-From: Alexander Kurtakov
-Date: Thu, 10 Jul 2014 09:06:28 +0300
-Subject: Bug 438992 - Combo dropdown has empty space at top
-
-Setting wrap_width also trims the empty whitespace on top for combo
-popup.
-
-Change-Id: I073d1ccef913de8f1ccfa0ff1eb09538606f8f74
-Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
-index 89185b9..813f451 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c	
-@@ -9970,6 +9970,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
- }
- #endif
- 
-+#ifndef NO__1gtk_1combo_1box_1set_1wrap_1width
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width)
-+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-+{
-+	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
-+	gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1);
-+	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
-+}
-+#endif
-+
- #ifndef NO__1gtk_1combo_1box_1text_1insert
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1insert)
- 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
-index fefc07e..16d6664 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c	
-@@ -723,6 +723,7 @@ char * OS_nativeFunctionNames[] = {
- 	"_1gtk_1combo_1box_1remove_1text",
- 	"_1gtk_1combo_1box_1set_1active",
- 	"_1gtk_1combo_1box_1set_1focus_1on_1click",
-+	"_1gtk_1combo_1box_1set_1wrap_1width",
- 	"_1gtk_1combo_1box_1text_1insert",
- 	"_1gtk_1combo_1box_1text_1new",
- 	"_1gtk_1combo_1box_1text_1new_1with_1entry",
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
-index aa408c5..78460d0 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h	
-@@ -733,6 +733,7 @@ typedef enum {
- 	_1gtk_1combo_1box_1remove_1text_FUNC,
- 	_1gtk_1combo_1box_1set_1active_FUNC,
- 	_1gtk_1combo_1box_1set_1focus_1on_1click_FUNC,
-+	_1gtk_1combo_1box_1set_1wrap_1width_FUNC,
- 	_1gtk_1combo_1box_1text_1insert_FUNC,
- 	_1gtk_1combo_1box_1text_1new_FUNC,
- 	_1gtk_1combo_1box_1text_1new_1with_1entry_FUNC,
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
-index b531bf9..ab42819 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	
-@@ -7135,6 +7135,19 @@ public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int in
- 		lock.unlock();
- 	}
- }
-+/**
-+ * @param combo_box cast=(GtkComboBox *)
-+ * @param width cast=(gint)
-+ */
-+public static final native void _gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width);
-+public static final void gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width) {
-+	lock.lock();
-+	try {
-+		_gtk_combo_box_set_wrap_width(combo_box, width);
-+	} finally {
-+		lock.unlock();
-+	}
-+}
- /** @method flags=dynamic */
- public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
- public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
-index ea5a93e..6589c9e 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java	
-@@ -455,6 +455,8 @@ void createHandle (int index) {
- 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
- 		cellHandle = OS.gtk_bin_get_child (handle);
- 		if (cellHandle == 0) error (SWT.ERROR_NO_HANDLES);
-+		// Setting wrap width has the side effect of removing the whitespace on top in popup bug#438992
-+		OS.gtk_combo_box_set_wrap_width(handle, 1);
- 	} else {
- 		if (OS.GTK3) {
- 			handle = OS.gtk_combo_box_text_new_with_entry();
--- 
-cgit v0.10.1-9-gd18e
-

eclipse-secondary-arches.patch

@@ -103,13 +103,12 @@ diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binari
 index 7dd0536..66d79ee 100644
 --- a/eclipse.platform.swt.binaries/pom.xml
 +++ b/eclipse.platform.swt.binaries/pom.xml
-@@ -53,6 +53,9 @@
-     <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
+@@ -54,6 +54,8 @@
+     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
      <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
      <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
 +    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
 +    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
-+    <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
      <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
      <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
      <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
@@ -117,16 +116,15 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
 index b46cdc6..0fb36a5 100644
 --- a/rt.equinox.framework/pom.xml
 +++ b/rt.equinox.framework/pom.xml
-@@ -55,6 +55,9 @@
+@@ -55,6 +55,8 @@
      <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
-+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
 diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
 index f5fb504..1187e84 100644
 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
@@ -143,22 +141,12 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip
 index 7e1f520..734dd10 100644
 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
 +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -409,6 +409,36 @@
+@@ -419,6 +419,26 @@
           install-size="0"
           version="0.0.0"
           fragment="true"/>
 +         
 +   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64le"
-+         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"
@@ -180,23 +168,12 @@ index 7e1f520..734dd10 100644
  
     <plugin
           id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -583,6 +613,39 @@
+@@ -583,6 +613,28 @@
           version="0.0.0"
           fragment="true"
           unpack="false"/>
 +         
 +   <plugin
-+         id="org.eclipse.swt.gtk.linux.ppc64le"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64le"
-+         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"
@@ -224,19 +201,6 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
 index 29d3871..45526c8 100644
 --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-@@ -104,6 +104,12 @@
- 				[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
- 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
- 				;;
-+			"ppc64le")
-+				defaultOSArch="ppc64le"
-+				defaultJava=DEFAULT_JAVA_EXEC
-+				[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
-+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+				;;
- 			"s390")
- 				defaultOSArch="s390"
- 				defaultJava=DEFAULT_JAVA_EXEC
 @@ -119,6 +125,16 @@
  				defaultJava=DEFAULT_JAVA_EXEC
  				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
@@ -258,7 +222,7 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
 index fac13bf..e487001 100644
 --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-@@ -259,6 +259,129 @@
+@@ -219,6 +219,189 @@
          </plugins>
        </build>
      </profile>
@@ -384,13 +348,84 @@ index fac13bf..e487001 100644
 +        </plugins>
 +      </build>
 +    </profile>
++    <profile>
++      <id>build-native-launchers-gtk.linux.s390x</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.s390x</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>build-native-launchers-gtk.linux.s390</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.s390</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
 +
      <profile>
        <id>build-native-launchers-win32.win32.x86_64</id>
        <activation>
+@@ -530,8 +530,8 @@
+                         <include name="gtk/solaris/x86/**/*" />
+                         <include name="win32/win32/x86/**/*" />
+                         <include name="win32/win32/x86_64/**/*" />
+-                      </fileset>
+-                      <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
++                        <include name="gtk/linux/arm/**/*" />
++                        <include name="gtk/linux/aarch64/**/*" />
+                         <include name="gtk/linux/s390/**/*" />
+                         <include name="gtk/linux/s390x/**/*" />
+                       </fileset>
 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:20:28.958177815 +0300
 +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:33:42.942025740 +0300
-@@ -30,6 +30,64 @@
+@@ -30,6 +30,44 @@
          <version>2.6</version>
          <executions>
            <execution>
@@ -431,26 +466,6 @@ index fac13bf..e487001 100644
 +              </resources>
 +            </configuration>
 +          </execution>
-+          <execution>
-+            <id>copy-resources-gtk.linux.ppc64le</id>
-+            <phase>validate</phase>
-+            <goals>
-+              <goal>copy-resources</goal>
-+            </goals>
-+            <configuration>
-+              <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc64le</outputDirectory>
-+              <resources>
-+                <resource>
-+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le
-+                  </directory>
-+                  <includes>
-+                    <include>about_files/*</include>
-+                    <include>about.html</include>
-+                  </includes>
-+              </resource>
-+            </resources>
-+          </configuration>
-+          </execution>
 +          <execution>
              <id>copy-resources-gtk.linux.x86</id>
              <phase>validate</phase>

eclipse-test-support.patch

@@ -292,8 +292,8 @@
 -# assuming metacity attaches to "current" display by default (which should have
 -# already been set by Hudson). We echo its value here just for extra reference/cross-checks.
 -
--echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):"
--wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep)
+-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):"
+-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
 -echo "Window Manager processes: $wmpss"
 -echo
 -
@@ -316,7 +316,7 @@
 -echo
 -
 -echo "Triple check if any window managers are running (at least metacity should be!):"
--wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
 -echo "Window Manager processes: $wmpss"
 -echo
 -echo "extdirprop in runtest: ${extdirprop}"

eclipse-webkit2-support.patch

@@ -125,7 +125,7 @@ index 780a82c..c3bedd0 100644
 +
  }
 diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
-index 6bce587..051c806 100644
+index 6bce587..fea2a5b 100644
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	
 @@ -48,6 +48,7 @@ XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -150,11 +150,11 @@ index 6bce587..051c806 100644
  	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o
  
 +webkit_extension.o: webkit_extension.c webkit_extension.h
-+	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkit_extension.c -o webkit_extension.o `pkg-config --cflags --libs webkit2gtk-3.0`
++	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkit_extension.c -o webkit_extension.o `pkg-config --cflags --libs webkit2gtk-4.0`
 +
 +$(WEBKIT_EXTENSION): webkit_extension.o
 +	$(CC) -g -shared -Wl,-no-undefined,-soname,$(WEBKIT_EXTENSION) \
-+        `pkg-config --cflags --libs webkit2gtk-3.0` -o $(WEBKIT_EXTENSION) webkit_extension.o -lc
++        `pkg-config --cflags --libs webkit2gtk-4.0` -o $(WEBKIT_EXTENSION) webkit_extension.o -lc
 +
  #
  # GLX lib
@@ -716,6 +716,20 @@ index 15b7761..3994f37 100644
  #ifndef NO__1webkit_1web_1view_1get_1progress
  JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress)
  	(JNIEnv *env, jclass that, jintLong arg0)
+diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
+index f54feb4..0598b9f 100644
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h	
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h	
+@@ -31,6 +31,9 @@
+ 			char *webkit2 = getenv("SWT_WEBKIT2"); \
+ 			if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \
+ 				handle = dlopen("libwebkit2gtk-3.0.so.25", LOAD_FLAGS); /* webkit2 */ \
++                                if (!handle) { \
++                                    handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \
++                                } \
+ 			} else { \
+ 				handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \
+ 			} \
 diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
 index c3cf9ee..b0e6650 100644
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c	

eclipse.spec

@@ -11,9 +11,9 @@ Epoch:                  1
 
 %global eclipse_major   4
 %global eclipse_minor   4
-%global eclipse_micro   0
+%global eclipse_micro   2
 %global eb_commit       db6b9cd54787feb7cf7c7a28c80e740340213bd3
-%global eclipse_tag     R4_4
+%global eclipse_tag     R4_4_2
 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
 %global _jetty_version  9.2.1
 
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        14%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -111,9 +111,7 @@ Patch21:        %{pkg_name}-mockito.patch
 
 Patch22:        %{pkg_name}-policy-comparators.patch
 
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=438992
-Patch23:        %{pkg_name}-bug-438992.patch
-Patch24:        %{pkg_name}-webkit2-support.patch
+Patch23:        %{pkg_name}-webkit2-support.patch
 
 BuildRequires: rsync
 BuildRequires: make, gcc
@@ -131,8 +129,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: java-1.8.0-openjdk-devel
 BuildRequires: libXt-devel
 BuildRequires: webkitgtk-devel
-BuildRequires: webkitgtk3
-BuildRequires: webkitgtk3-devel
+BuildRequires: webkitgtk4-devel
 BuildRequires: geronimo-annotation >= 1.0-7
 BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:52.1
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
@@ -150,21 +147,21 @@ BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
 BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
 BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
 BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
-BuildRequires: %{?scl_prefix}lucene-core >= 4.8.1-3
-BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
+BuildRequires: %{?scl_prefix}lucene-core >= 4.10.2
+BuildRequires: %{?scl_prefix}lucene-analysis >= 4.10.2
 BuildRequires: junit >= 4.10-5
 BuildRequires: hamcrest >= 0:1.1-11
 BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
 BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.2-2
 BuildRequires: zip
 BuildRequires: sac >= 1.3-12
-BuildRequires: batik >= 1.8
+BuildRequires: batik-css >= 1.8-0.17
 BuildRequires: xml-commons-apis >= 1.4.01-12
 BuildRequires: atinject >= 1-6
 BuildRequires: tycho >= 0.19
 BuildRequires: tycho-extras >= 0.19
-BuildRequires: eclipse-ecf-core >= 3.9.0-1
-BuildRequires: eclipse-emf-core >= 1:2.10.0-1
+BuildRequires: eclipse-ecf-core >= 3.9.1-1
+BuildRequires: eclipse-emf-core >= 1:2.10.2-1
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
 BuildRequires: glassfish-jsp >= 2.2.5
 BuildRequires: glassfish-servlet-api >= 3.1.0
@@ -191,7 +188,7 @@ Requires:       jpackage-utils
 Requires:       gtk2
 Requires:       gtk3
 Requires:       webkitgtk
-Requires:       webkitgtk3
+Requires:       webkitgtk4
 
 %description swt
 SWT Library for GTK+.
@@ -223,16 +220,16 @@ Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
 Requires: jsch >= 0.1.46-2
-Requires: %{?scl_prefix}lucene-core >= 4.8.1-3
-Requires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
+Requires: %{?scl_prefix}lucene-core >= 4.10.2
+Requires: %{?scl_prefix}lucene-analysis >= 4.10.2
 Requires: %{?scl_prefix}sat4j >= 2.3.5-1
 Requires: sac >= 1.3-12
-Requires: batik >= 1.8
+Requires: batik-css >= 1.8-0.17
 Requires: xml-commons-apis >= 1.4.01-12
 Requires: atinject >= 1-6
 Requires: geronimo-annotation >= 1.0-7
-Requires: eclipse-ecf-core >= 3.9.0-1
-Requires: eclipse-emf-core >= 1:2.10.0-1
+Requires: eclipse-ecf-core >= 3.9.1-1
+Requires: eclipse-emf-core >= 1:2.10.2-1
 Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
 Requires: glassfish-servlet-api >= 3.1.0
@@ -325,8 +322,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch20
 %patch21
 %patch22
-%patch23 -p1
-%patch24
+%patch23
 
 #Disable as many things as possible to make the build faster. We care only for Eclipse.
 %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -407,7 +403,7 @@ done
 for dir in eclipse.platform.swt.binaries/bundles \
            rt.equinox.framework/bundles rt.equinox.binaries ; do
   utils/ensure_arch.sh "$dir" x86 arm
-  utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64le
+  utils/ensure_arch.sh "$dir" x86_64 aarch64
 done
 
 # Don't mirror stuff to the repo that we haven't built
@@ -434,14 +430,13 @@ sed -i -e '/^root\.[^l]/d' \
   rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
   eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
 
-#hack - there should be a patch providing a profile for each arch
+# Hack - this can go away once upstream grows arm and aarch64 support
 mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
 
 #pdebuild script should point to dropins
 sed -i -e "s|@DATADIR@|%{_datadir}|g" eclipse.pde.build/org.eclipse.pde.build/templates/package-build/build.properties
 
-
-#ensure that bundles with *.so libs are dirs, so no *.so is extracted into user.home
+# Ensure that bundles with native artifacts are dir-shaped, so no *.so is extracted into user.home
 for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.* -name MANIFEST.MF` ; do 
     echo -e "Eclipse-BundleShape: dir\n\n" >> $f; 
 done
@@ -498,7 +493,7 @@ xmvn -o clean verify \
    -Declipse.javadoc=/usr/bin/javadoc \
    -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
    -Dtycho.local.keepTarget -Ddirector.running.env.only=true \
-   -Dtargets=install
+   -Dtargets=install -DbuildType=Z
 
 #ant again
 dependencies/fake_ant_dependency.sh \
@@ -533,9 +528,9 @@ pushd p2/org.eclipse.equinox.p2.engine/.settings
     sed -i "/repositories\/memory/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
 popd
 
-#ini file adjustements
+# ini file adjustements
 sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
-sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
+sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
 sed -i '1i-protect\nmaster' eclipse.ini
 
 # Use GTK3 by default on F22 or newer
@@ -565,6 +560,7 @@ popd #eclipse
 
 # Some directories we need
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}/dropins
@@ -573,24 +569,26 @@ install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 
 # Install icons
 install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{?scl_prefix}eclipse.png
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{name}.png
 install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{?scl_prefix}eclipse.png
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{name}.png
 install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{name}.png
 install -d $RPM_BUILD_ROOT/usr/share/pixmaps
-ln -s /usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png \
-    $RPM_BUILD_ROOT/usr/share/pixmaps/%{?scl_prefix}eclipse.png
+ln -s /usr/share/icons/hicolor/256x256/apps/%{name}.png \
+    $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png
 
-# Install desktop file and app data
+# Install desktop file
 %{?scl: sed -i -e 's/Exec=eclipse/Exec=scl enable %{scl_name} eclipse/g' desktopintegration/eclipse.desktop}
 %{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktopintegration/eclipse.desktop}
 %{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktopintegration/eclipse.desktop}
-install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
-install -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
-install -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
-install -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
-desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
+install -m644 -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+
+# Install appstream appdata
+install -m644 -D desktopintegration/eclipse.appdata.xml      $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse.appdata.xml
+install -m644 -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-jdt.metainfo.xml
+install -m644 -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-pde.metainfo.xml
 
 #################################
 ### Extraced from old build.xml #
@@ -616,28 +614,23 @@ install -m 755 jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT%{_bindir}/efj
 TARGET_LAUNCHER=%{_libdir}/%{pkg_name}/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*`
 sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT%{_bindir}/efj
 
-#eclipse binary
+# Symlink eclipse binary
 pushd $RPM_BUILD_ROOT%{_bindir}
     ln -s %{_libdir}/%{pkg_name}/eclipse
 popd 
 
-#SWT is now a folder, but we need to provide jars for others that depend on it.
-pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}
-pushd plugins
+# SWT is a directory, but we need to provide jars for others that depend on it
+pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}/plugins
 SWT_JAR=`ls | grep swt.gtk`
-#it's a dir now
-cd ${SWT_JAR}
-#fix privileges
-#zip the contents
-zip -r "../../swt.jar" *
-popd
-    ln -s  swt.jar swt-gtk.jar
-    mkdir -p ../../lib/java
-    ln -s  %{_libdir}/%{pkg_name}/swt.jar ../../lib/java/swt.jar
+(cd ${SWT_JAR} && zip -r "../../swt.jar" * )
 popd
 
-#eclipse ini
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
+# Symlink SWT jar
+pushd $RPM_BUILD_ROOT/%{_jnidir}/
+    ln -s  %{_libdir}/%{pkg_name}/swt.jar
+popd
+
+# Symlink eclipse ini
 pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
     ln -s %{_libdir}/%{pkg_name}/eclipse.ini
 popd
@@ -694,20 +687,19 @@ unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/ecl
 unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
-cp production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
 rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
 
 pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
  f=`ls | grep -e "^org.easymock_"`
- rm -rf $f 
+ rm -rf $f
  ln -s %{_javadir}/easymock.jar ${f%.jar}.jar
  f=`ls | grep -e "^org.mockito.mockito-core_"`
- rm -rf $f 
+ rm -rf $f
  ln -s %{_javadir}/mockito.jar ${f%.jar}.jar
  f=`ls | grep -e "^org.objenesis_"`
- rm -rf $f 
+ rm -rf $f
  ln -s %{_javadir}/objenesis/objenesis.jar ${f%.jar}.jar
  # These are already present in the platform
  rm -rf org.hamcrest.core_*
@@ -766,9 +758,8 @@ fi
 %{_libdir}/%{pkg_name}/epl-v10.html
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.*
-%{_libdir}/%{pkg_name}/swt-gtk*.jar
 %{_libdir}/%{pkg_name}/swt.jar
-%{_libdir}/../lib/java/swt.jar
+%{_jnidir}/swt.jar
 
 %files platform -f .mfiles-platform
 %{_bindir}/%{pkg_name}
@@ -778,7 +769,7 @@ fi
 /usr/share/applications/*
 /usr/share/pixmaps/*
 /usr/share/icons/*/*/apps/*
-/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
+%{_datadir}/appdata/eclipse.appdata.xml
 %{_libdir}/%{pkg_name}/eclipse
 %dir %{_libdir}/%{pkg_name}/dropins
 %dir %{_datadir}/%{pkg_name}/
@@ -987,12 +978,12 @@ fi
 
 %files jdt
 %{_bindir}/efj
-/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
+%{_datadir}/appdata/eclipse-jdt.metainfo.xml
 %{_libdir}/%{pkg_name}/dropins/jdt
 
 %files pde
 %{_bindir}/%{pkg_name}-pdebuild
-/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
+%{_datadir}/appdata/eclipse-pde.metainfo.xml
 %{_libdir}/%{pkg_name}/buildscripts
 %{_libdir}/%{pkg_name}/dropins/sdk
 %{_libdir}/%{pkg_name}/dropins/cvs
@@ -1013,23 +1004,65 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
-* Tue Aug 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-14
+* Wed Mar 04 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.2-2
+- Rebuild for SR2 release of EMF
+
+* Mon Mar 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.2-1
+- Update to Luna SR2 release
+- Drop upstreamed patches
+- Fixes rhbz#1177906
+
+* Mon Jan 12 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-9
+- Require batik version with proper obsoletes.
+
+* Fri Jan 9 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-8
+- Move to the slimmer batik-css.
+
+* Fri Nov 28 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-7
+- Rebuild for new ECF
+
+* Mon Nov 17 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-6
+- Increase max heap size to 1024m
+  - But don't do this as a patch, it doesn't work
+- Fix build ID to always be lexigraphically higher that upstream
+
+* Wed Nov 12 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-5
+- Backport patch to make workspace selection dialog visible in the task manager
+- Tidy up SWT symlinks
+
+* Fri Oct 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-4
+- Rebuild for latest lucene.
+
+* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-3
+- Require latest EMF
+
+* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-2
+- Fix s390 launcher build
+
+* Fri Sep 26 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1
+- Update to Luna SR1
+- Drop upstreamed patch and fix permissions on appdata files
+
+* Thu Sep 18 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-15
+- Fix GTK 3 autocomplete not readable.
+
+* Tue Aug 26 2014 Sami Wagiaalla <swagiaal@edhat.com> - 1:4.4.0-14
+- Build agianst webkitgtk4.
+
+* Tue Aug 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-13
 - Rebuild against new ECF
 
-* Mon Aug 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-13
+* Mon Aug 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-12
 - Drop custom buildId, to keep it lexographically greater than upstream's
 
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-12
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Mon Jul 28 2014 Sami Wagiaalla <swagiaal@redhat.com> 1:4.4.0-11
-- Add patch for webkit2 support.
-
 * Mon Jul 28 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-10
 - Provide org.eclipse.tycho:org.eclipse.osgi.compatibility.state.
 
-* Mon Jul 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-9
-- Rebuild for new ecf and asm.
+* Thu Jul 24 2014 Sami Wagiaalla <swagiaal@redhat.com> 1:4.4.0-9
+- Add patch for webkit2 support.
 
 * Wed Jul 16 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-8
 - Update eclipse-build snapshot

get-eclipse.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=R4_4
+TAG=R4_4_2
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
@@ -15,6 +15,7 @@ pushd R4_platform-aggregator-$TAG
 git submodule init
 git submodule update
 
+rm -rf bootstrap streams scripts
 
 # Comment this line to get a shallow clone.
 find . -type d -name ".git" | xargs rm -rf

sources

@@ -1,2 +1,2 @@
-d1e37d9af6848edbdd54d5988c77fa58  R4_platform-aggregator-R4_4.tar.xz
+a5eea41345c311a3c6668eed12e27d42  R4_platform-aggregator-R4_4_2.tar.xz
 b5c946f8de3fb487cf9f385a0ae707e2  org.eclipse.linuxtools.eclipse-build-db6b9cd54787feb7cf7c7a28c80e740340213bd3.tar.bz2