Compare commits
18 Commits
master
...
eclipse-lu
Author | SHA1 | Date | |
---|---|---|---|
|
f11858d8c4 | ||
|
9dcfe82a6d | ||
|
a8482a6311 | ||
|
7c3fd0e248 | ||
|
76040486b8 | ||
|
0cce5fa515 | ||
|
a7f3fa10f0 | ||
|
a31e746398 | ||
|
7199e64ade | ||
|
e4bad79d79 | ||
|
812b0aa76d | ||
|
5f6b18614e | ||
|
c1f3ca4b48 | ||
|
b6c33eb86b | ||
|
363d476474 | ||
|
f0edd6dfa6 | ||
|
4d77eeb33c | ||
|
cd534319f1 |
@ -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
|
||||
|
96
eclipse-bug-444143.patch
Normal file
96
eclipse-bug-444143.patch
Normal file
@ -0,0 +1,96 @@
|
||||
From 716d35d30c1f639a04515188fedd89bb3aaf12bc Mon Sep 17 00:00:00 2001
|
||||
From: Sami Wagiaalla
|
||||
Date: Mon, 15 Sep 2014 11:51:44 -0400
|
||||
Subject: Bug 444143 - [GTK3] Reset selected background color in Table
|
||||
|
||||
When setBackgroundColor is called for Table it results in
|
||||
a call to gtk_widget_override_background_color with the flag
|
||||
GTK_STATE_FLAG_NORMAL which overrides the color for selected
|
||||
items' background despite the flag. Therefore the selected item
|
||||
color must be reset to the default.
|
||||
|
||||
Change-Id: Iab3cad4e01cf87cca04e536fdea8991c818d0336
|
||||
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
|
||||
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
index 96493c6..2558fd1 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
@@ -11,12 +11,28 @@
|
||||
package org.eclipse.swt.widgets;
|
||||
|
||||
|
||||
-import org.eclipse.swt.*;
|
||||
-import org.eclipse.swt.internal.*;
|
||||
-import org.eclipse.swt.internal.cairo.*;
|
||||
-import org.eclipse.swt.internal.gtk.*;
|
||||
-import org.eclipse.swt.graphics.*;
|
||||
-import org.eclipse.swt.events.*;
|
||||
+import org.eclipse.swt.SWT;
|
||||
+import org.eclipse.swt.SWTException;
|
||||
+import org.eclipse.swt.events.SelectionEvent;
|
||||
+import org.eclipse.swt.events.SelectionListener;
|
||||
+import org.eclipse.swt.graphics.Color;
|
||||
+import org.eclipse.swt.graphics.Font;
|
||||
+import org.eclipse.swt.graphics.GC;
|
||||
+import org.eclipse.swt.graphics.Image;
|
||||
+import org.eclipse.swt.graphics.Point;
|
||||
+import org.eclipse.swt.graphics.Rectangle;
|
||||
+import org.eclipse.swt.internal.Converter;
|
||||
+import org.eclipse.swt.internal.ImageList;
|
||||
+import org.eclipse.swt.internal.cairo.Cairo;
|
||||
+import org.eclipse.swt.internal.gtk.GdkColor;
|
||||
+import org.eclipse.swt.internal.gtk.GdkEventButton;
|
||||
+import org.eclipse.swt.internal.gtk.GdkEventExpose;
|
||||
+import org.eclipse.swt.internal.gtk.GdkRGBA;
|
||||
+import org.eclipse.swt.internal.gtk.GdkRectangle;
|
||||
+import org.eclipse.swt.internal.gtk.GtkAllocation;
|
||||
+import org.eclipse.swt.internal.gtk.GtkCellRendererClass;
|
||||
+import org.eclipse.swt.internal.gtk.GtkRequisition;
|
||||
+import org.eclipse.swt.internal.gtk.OS;
|
||||
|
||||
/**
|
||||
* Instances of this class implement a selectable user interface
|
||||
@@ -3006,6 +3022,17 @@ void setBackgroundColor (GdkColor color) {
|
||||
super.setBackgroundColor (color);
|
||||
if (!OS.GTK3) {
|
||||
OS.gtk_widget_modify_base (handle, 0, color);
|
||||
+ } else {
|
||||
+ // Setting the background color overrides the selected background color
|
||||
+ // so we have to reset it the default.
|
||||
+ GdkColor defaultColor = getDisplay().COLOR_LIST_SELECTION;
|
||||
+ GdkRGBA selectedBackground = new GdkRGBA ();
|
||||
+ selectedBackground.alpha = 1;
|
||||
+ selectedBackground.red = (defaultColor.red & 0xFFFF) / (float)0xFFFF;
|
||||
+ selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF;
|
||||
+ selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF;
|
||||
+
|
||||
+ OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
index 2a40869..4603cff 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
@@ -3038,6 +3038,17 @@ void setBackgroundColor (GdkColor color) {
|
||||
super.setBackgroundColor (color);
|
||||
if (!OS.GTK3) {
|
||||
OS.gtk_widget_modify_base (handle, 0, color);
|
||||
+ } else {
|
||||
+ // Setting the background color overrides the selected background color
|
||||
+ // so we have to reset it the default.
|
||||
+ GdkColor defaultColor = getDisplay().COLOR_LIST_SELECTION;
|
||||
+ GdkRGBA selectedBackground = new GdkRGBA ();
|
||||
+ selectedBackground.alpha = 1;
|
||||
+ selectedBackground.red = (defaultColor.red & 0xFFFF) / (float)0xFFFF;
|
||||
+ selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF;
|
||||
+ selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF;
|
||||
+
|
||||
+ OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.10.1-9-gd18e
|
||||
|
@ -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"
|
||||
|
@ -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}"
|
||||
|
28
eclipse-workspace-chooser.patch
Normal file
28
eclipse-workspace-chooser.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From ba6d6b9708a06fa267240471407c239d02484821 Mon Sep 17 00:00:00 2001
|
||||
From: Timo Kinnunen
|
||||
Date: Fri, 7 Nov 2014 15:28:21 +0100
|
||||
Subject: Fixed bug 429308: Make workspace selection dialog visible in the task
|
||||
manager of the OS
|
||||
|
||||
Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
|
||||
diff --git a/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
|
||||
index 4797d2d..d88f57f 100644
|
||||
--- a/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
|
||||
+++ b/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
|
||||
@@ -314,7 +314,12 @@ public class IDEApplication implements IApplication, IExecutableExtension {
|
||||
URL url = null;
|
||||
do {
|
||||
// okay to use the shell now - this is the splash shell
|
||||
- new ChooseWorkspaceDialog(shell, launchData, false, true).prompt(force);
|
||||
+ new ChooseWorkspaceDialog(shell, launchData, false, true) {
|
||||
+ @Override
|
||||
+ protected Shell getParentShell() {
|
||||
+ return null;
|
||||
+ }
|
||||
+ }.prompt(force);
|
||||
String instancePath = launchData.getSelection();
|
||||
if (instancePath == null) {
|
||||
return null;
|
||||
--
|
||||
cgit v0.10.1-9-gd18e
|
||||
|
209
eclipse.spec
209
eclipse.spec
@ -1,5 +1,6 @@
|
||||
%{?scl:%scl_package eclipse}
|
||||
%{!?scl:%global pkg_name %{name}}
|
||||
%{?scl:%global app_name Eclipse Luna}
|
||||
|
||||
# Set to 1 to build Eclipse without dependency to eclipse-pde
|
||||
# Some parts (help) will not be built, and second run will be required,
|
||||
@ -11,11 +12,11 @@ Epoch: 1
|
||||
|
||||
%global eclipse_major 4
|
||||
%global eclipse_minor 4
|
||||
%global eclipse_micro 0
|
||||
%global eclipse_micro 1
|
||||
%global eb_commit db6b9cd54787feb7cf7c7a28c80e740340213bd3
|
||||
%global eclipse_tag R4_4
|
||||
%global eclipse_tag R4_4_1
|
||||
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
||||
%global _jetty_version 9.2.1
|
||||
%global _jetty_version 9.0.5
|
||||
|
||||
%ifarch %{ix86}
|
||||
%define eclipse_arch x86
|
||||
@ -38,7 +39,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 14%{?dist}
|
||||
Release: 1%{?dist}.3
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
@ -111,9 +112,11 @@ 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
|
||||
Patch24: %{pkg_name}-bug-444143.patch
|
||||
|
||||
# Make workspace selection dialog visible in the task manager of the OS
|
||||
Patch25: eclipse-workspace-chooser.patch
|
||||
|
||||
BuildRequires: rsync
|
||||
BuildRequires: make, gcc
|
||||
@ -131,8 +134,7 @@ BuildRequires: desktop-file-utils
|
||||
BuildRequires: java-1.8.0-openjdk-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: webkitgtk-devel
|
||||
BuildRequires: webkitgtk3
|
||||
BuildRequires: webkitgtk3-devel
|
||||
BuildRequires: %{?scl_prefix}webkitgtk3-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
|
||||
@ -141,8 +143,8 @@ BuildRequires: jsch >= 0:0.1.46-2
|
||||
BuildRequires: apache-commons-el >= 1.0-22
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-codec >= 1.6-2
|
||||
BuildRequires: felix-gogo-command >= 0.14.0-2
|
||||
BuildRequires: felix-gogo-shell >= 0.10.0-3
|
||||
BuildRequires: %{?scl_prefix}felix-gogo-command >= 0.14.0-2
|
||||
BuildRequires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
|
||||
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
||||
@ -154,29 +156,30 @@ BuildRequires: %{?scl_prefix}lucene-core >= 4.8.1-3
|
||||
BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
|
||||
BuildRequires: junit >= 4.10-5
|
||||
BuildRequires: hamcrest >= 0:1.1-11
|
||||
BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
|
||||
BuildRequires: 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: %{?scl_prefix}batik >= 1.8
|
||||
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: %{?scl_prefix}tycho >= 0.20
|
||||
BuildRequires: %{?scl_prefix}tycho-extras >= 0.20
|
||||
BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.9.0-1
|
||||
BuildRequires: %{?scl_prefix}eclipse-emf-core >= 1:2.10.1-1.2
|
||||
BuildRequires: tomcat-el-2.2-api
|
||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||
BuildRequires: glassfish-jsp >= 2.2.5
|
||||
BuildRequires: glassfish-servlet-api >= 3.1.0
|
||||
BuildRequires: cbi-plugins
|
||||
BuildRequires: %{?scl_prefix}cbi-plugins
|
||||
BuildRequires: xml-maven-plugin
|
||||
BuildRequires: httpcomponents-core
|
||||
BuildRequires: httpcomponents-client
|
||||
BuildRequires: mockito
|
||||
%if ! %{bootstrap}
|
||||
BuildRequires: eclipse-pde
|
||||
BuildRequires: %{?scl_prefix}eclipse-pde
|
||||
%endif
|
||||
BuildRequires: eclipse-license
|
||||
BuildRequires: %{?scl_prefix}eclipse-license
|
||||
|
||||
%description
|
||||
The Eclipse platform is designed for building integrated development
|
||||
@ -191,7 +194,7 @@ Requires: jpackage-utils
|
||||
Requires: gtk2
|
||||
Requires: gtk3
|
||||
Requires: webkitgtk
|
||||
Requires: webkitgtk3
|
||||
Requires: %{?scl_prefix}webkitgtk3
|
||||
|
||||
%description swt
|
||||
SWT Library for GTK+.
|
||||
@ -213,8 +216,8 @@ Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant
|
||||
Requires: apache-commons-el >= 1.0-23
|
||||
Requires: apache-commons-logging
|
||||
Requires: apache-commons-codec >= 1.6-2
|
||||
Requires: felix-gogo-command >= 0.14.0-2
|
||||
Requires: felix-gogo-shell >= 0.10.0-3
|
||||
Requires: %{?scl_prefix}felix-gogo-command >= 0.14.0-2
|
||||
Requires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
|
||||
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
||||
@ -225,14 +228,15 @@ 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}sat4j >= 2.3.5-1
|
||||
Requires: sat4j >= 2.3.5-1
|
||||
Requires: sac >= 1.3-12
|
||||
Requires: batik >= 1.8
|
||||
Requires: %{?scl_prefix}batik >= 1.8
|
||||
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: %{?scl_prefix}eclipse-ecf-core >= 3.9.0-1
|
||||
Requires: %{?scl_prefix}eclipse-emf-core >= 1:2.10.1-1.2
|
||||
Requires: tomcat-el-2.2-api
|
||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||
Requires: glassfish-jsp >= 2.2.5
|
||||
Requires: glassfish-servlet-api >= 3.1.0
|
||||
@ -325,8 +329,9 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
%patch20
|
||||
%patch21
|
||||
%patch22
|
||||
%patch23 -p1
|
||||
%patch24
|
||||
%patch23
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
|
||||
#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 +412,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 +439,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
|
||||
@ -469,10 +473,12 @@ sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom
|
||||
# Allow usage of javax.servlet.jsp 2.3.
|
||||
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
|
||||
|
||||
# Use com.sun.el.java.el (Glassfish) instead of javax.el (Tomcat)
|
||||
sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \
|
||||
eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \
|
||||
eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
# Force usage of javax.servlet 3.1
|
||||
sed -i '/javax.servlet/ s/2\.4\.0/3\.1\.0/' eclipse.platform.ua/org.eclipse.help.webapp/META-INF/MANIFEST.MF
|
||||
|
||||
# Tomcat provides javax.el
|
||||
sed -i 's/com\.sun\.el\.javax\.el/javax\.el/' dependencies/replace_platform_plugins_with_symlinks.sh
|
||||
sed -i 's/glassfish-el\.jar/tomcat-el-api\.jar/' dependencies/replace_platform_plugins_with_symlinks.sh
|
||||
|
||||
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
|
||||
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
|
||||
@ -485,7 +491,15 @@ sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.eq
|
||||
|
||||
sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
|
||||
# Not sure why this is needed yet...
|
||||
mkdir -p .m2/org/eclipse/tycho/tycho-bundles-external/0.20.0
|
||||
mkdir -p .m2/org/eclipse/tycho/tycho-standalone-p2-director/0.20.0
|
||||
cp %{_javadir}/tycho/tycho-bundles-external.zip .m2/org/eclipse/tycho/tycho-bundles-external/0.20.0/tycho-bundles-external-0.20.0.zip
|
||||
cp %{_javadir}/tycho/tycho-standalone-p2-director.zip .m2/org/eclipse/tycho/tycho-standalone-p2-director/0.20.0/tycho-standalone-p2-director-0.20.0.zip
|
||||
|
||||
%build
|
||||
%{?scl:scl enable %{scl} - << "EOF"}
|
||||
set -x
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export JAVA_HOME=%{java_home}
|
||||
@ -499,6 +513,7 @@ xmvn -o clean verify \
|
||||
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
|
||||
-Dtycho.local.keepTarget -Ddirector.running.env.only=true \
|
||||
-Dtargets=install
|
||||
%{?scl:EOF}
|
||||
|
||||
#ant again
|
||||
dependencies/fake_ant_dependency.sh \
|
||||
@ -565,6 +580,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 +589,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
|
||||
%{?scl: sed -i -e 's/Name=Eclipse/Name=%{app_name}/g' desktopintegration/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 +634,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,7 +707,6 @@ 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
|
||||
@ -746,15 +758,15 @@ popd
|
||||
find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \;
|
||||
|
||||
%post platform
|
||||
touch --no-create %{_datadir}/icons/hicolor
|
||||
touch --no-create /usr/share/icons/hicolor
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
||||
gtk-update-icon-cache -q /usr/share/icons/hicolor
|
||||
fi
|
||||
|
||||
%postun platform
|
||||
touch --no-create %{_datadir}/icons/hicolor
|
||||
touch --no-create /usr/share/icons/hicolor
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
||||
gtk-update-icon-cache -q /usr/share/icons/hicolor
|
||||
fi
|
||||
|
||||
|
||||
@ -766,9 +778,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 +789,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}/
|
||||
@ -798,7 +809,7 @@ fi
|
||||
%{_libdir}/%{pkg_name}/plugins/javax.servlet-api_*
|
||||
%{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_*
|
||||
%{_libdir}/%{pkg_name}/plugins/javax.xml_*
|
||||
%{_libdir}/%{pkg_name}/plugins/com.sun.el.javax.el_*
|
||||
%{_libdir}/%{pkg_name}/plugins/javax.el_*
|
||||
%{_libdir}/%{pkg_name}/plugins/javax.inject_*.jar
|
||||
%{_libdir}/%{pkg_name}/plugins/org.apache.ant_*
|
||||
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.css_*
|
||||
@ -987,12 +998,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 +1024,50 @@ 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 Nov 12 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1.3
|
||||
- Backport patch to make workspace selection dialog visible in the task manager
|
||||
- Tidy up SWT symlinks
|
||||
|
||||
* Thu Oct 16 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1.2
|
||||
- Rebuild for EMF fixes
|
||||
|
||||
* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1.1
|
||||
- Require latest EMF
|
||||
|
||||
* 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-13.2
|
||||
- Fix unreadable autocomplete selection.
|
||||
|
||||
* Wed Aug 20 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-13.1
|
||||
- Merge in changes from latest f21
|
||||
|
||||
* 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.1
|
||||
- Re-base to lastest f21
|
||||
- Require scl-ised webkitgtk3
|
||||
|
||||
* 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.
|
||||
* Wed Aug 13 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-10.1
|
||||
- Re-base to lastest f21
|
||||
|
||||
* 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.
|
||||
|
||||
* Thu Jul 17 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-8.1
|
||||
- Fix icon cache update errors
|
||||
|
||||
* Wed Jul 16 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-8
|
||||
- Update eclipse-build snapshot
|
||||
@ -1044,6 +1082,13 @@ fi
|
||||
- Only assemble products for current running target environment
|
||||
- Tidy up some unnecessary SCL bits
|
||||
|
||||
* Fri Jul 11 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5.2
|
||||
- Non-bootstrap build
|
||||
- Re-enable Java 8 bundles
|
||||
|
||||
* Wed Jul 09 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5.1
|
||||
- Bootstrap into SCL
|
||||
|
||||
* Tue Jul 08 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5
|
||||
- Make GTK3 the default SWT implementation in eclipse.ini
|
||||
|
||||
|
@ -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_1
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user