From 15ffd1320ea390f72bdcebc08d5d3f76d40db8d1 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Sep 30 2013 13:40:01 +0000 Subject: Update to 4.3.1 --- diff --git a/.gitignore b/.gitignore index dd94bab..d14ce5a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz /.xmvn /R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2 /eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz +/eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch new file mode 100644 index 0000000..ac92081 --- /dev/null +++ b/eclipse-bug-386377.patch @@ -0,0 +1,600 @@ +From 7aae376547c5f3306e311ce91c475c9a9667a0a0 Mon Sep 17 00:00:00 2001 +From: Krzysztof Daniel +Date: Tue, 30 Jul 2013 12:22:42 +0200 +Subject: [PATCH] Build executables in the first run. + +--- + bundles/org.eclipse.equinox.executable/pom.xml | 265 --------------------- + .../pom.xml | 56 ++++- + .../pom.xml | 55 +++++ + .../pom.xml | 55 +++++ + .../pom.xml | 56 +++++ + .../pom.xml | 56 +++++ + 6 files changed, 277 insertions(+), 266 deletions(-) + +diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml +index 5a15c5b..d4fb54e 100644 +--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml +@@ -28,5 +28,59 @@ + cocoa + x86_64 + +- ++ ++ ++ build-native-launchers-cocoa.macosx.x86_64 ++ ++ ++ native ++ cocoa.macosx.x86_64 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml +index 59f46ae..e7616ed 100644 +--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml +@@ -28,4 +28,59 @@ + gtk + x86 + ++ ++ ++ build-native-launchers-gtk.linux.x86 ++ ++ ++ native ++ gtk.linux.x86 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml +index d639b6e..8bf7d74 100644 +--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml +@@ -28,4 +28,59 @@ + gtk + x86_64 + ++ ++ ++ build-native-launchers-gtk.linux.x86_64 ++ ++ ++ native ++ gtk.linux.x86_64 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml +index e0b59be..f82005c 100644 +--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml +@@ -29,4 +29,60 @@ + win32 + x86 + ++ ++ ++ ++ build-native-launchers-win32.win32.x86 ++ ++ ++ native ++ win32.win32.x86 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml +index ce4252c..4b72b1f 100644 +--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml +@@ -29,4 +29,60 @@ + win32 + x86_64 + ++ ++ ++ ++ build-native-launchers-win32.win32.x86_64 ++ ++ ++ native ++ win32.win32.x86_64 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml +index ce4252c..4b72b1f 100644 +--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml +@@ -27,4 +27,60 @@ + gtk + s390 + ++ ++ ++ ++ build-native-launchers-gtk.linux.s390 ++ ++ ++ native ++ gtk.linux.s390 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml +index ce4252c..4b72b1f 100644 +--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml +@@ -27,4 +27,60 @@ + gtk + s390x + ++ ++ ++ ++ build-native-launchers-gtk.linux.s390x ++ ++ ++ native ++ gtk.linux.s390x ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml +index ce4252c..4b72b1f 100644 +--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml +@@ -29,4 +29,60 @@ + gtk + ppc + ++ ++ ++ ++ build-native-launchers-gtk.linux.ppc ++ ++ ++ native ++ gtk.linux.ppc ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml +index ce4252c..4b72b1f 100644 +--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml ++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml +@@ -28,4 +28,60 @@ + gtk + ppc64 + ++ ++ ++ ++ build-native-launchers-gtk.linux.ppc64 ++ ++ ++ native ++ gtk.linux.ppc64 ++ ++ ++ ++ ++ ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ compile-executable-natives ++ generate-resources ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ bsf ++ bsf ++ 2.4.0 ++ ++ ++ rhino ++ js ++ 1.7R2 ++ ++ ++ org.apache.ant ++ ant-apache-bsf ++ 1.8.3 ++ ++ ++ org.apache.ant ++ ant-nodeps ++ 1.8.1 ++ ++ ++ ++ ++ ++ ++ + +-- +1.8.3.1 + diff --git a/eclipse-bug-404448.patch b/eclipse-bug-404448.patch deleted file mode 100644 index e1f7654..0000000 --- a/eclipse-bug-404448.patch +++ /dev/null @@ -1,222 +0,0 @@ ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c" -@@ -11321,6 +11321,24 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf) - } - #endif - -+#ifndef NO__1gtk_1image_1set_1from_1gicon -+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1gicon) -+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) -+{ -+ OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon_FUNC); -+/* -+ gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2); -+*/ -+ { -+ OS_LOAD_FUNCTION(fp, gtk_image_set_from_gicon) -+ if (fp) { -+ ((void (CALLING_CONVENTION*)(GtkImage *, GIcon *, GtkIconSize))fp)((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2); -+ } -+ } -+ OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon_FUNC); -+} -+#endif -+ - #ifndef NO__1gtk_1image_1set_1from_1pixbuf - JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h" -@@ -175,6 +175,7 @@ - #define gtk_icon_info_free_LIB LIB_GTK - #define gtk_icon_set_render_icon_LIB LIB_GTK - #define gtk_icon_theme_lookup_by_gicon_LIB LIB_GTK -+#define gtk_image_set_from_gicon_LIB LIB_GTK - #define gdk_keyboard_ungrab_LIB LIB_GDK - #define gtk_icon_theme_get_default_LIB LIB_GTK - #define gtk_menu_item_remove_submenu_LIB LIB_GTK ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c" -@@ -818,6 +818,7 @@ char * OS_nativeFunctionNames[] = { - "_1gtk_1image_1menu_1item_1set_1image", - "_1gtk_1image_1new", - "_1gtk_1image_1new_1from_1pixbuf", -+ "_1gtk_1image_1set_1from_1gicon", - "_1gtk_1image_1set_1from_1pixbuf", - "_1gtk_1init_1check", - "_1gtk_1label_1get_1layout", ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h" -@@ -828,6 +828,7 @@ typedef enum { - _1gtk_1image_1menu_1item_1set_1image_FUNC, - _1gtk_1image_1new_FUNC, - _1gtk_1image_1new_1from_1pixbuf_FUNC, -+ _1gtk_1image_1set_1from_1gicon_FUNC, - _1gtk_1image_1set_1from_1pixbuf_FUNC, - _1gtk_1init_1check_FUNC, - _1gtk_1label_1get_1layout_FUNC, ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java" -@@ -8266,6 +8266,21 @@ public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*in - } - } - /** -+ * @method flags=dynamic -+ * @param image cast=(GtkImage *) -+ * @param gicon cast=(GIcon *) -+ * @param size cast=(GtkIconSize) -+ */ -+public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size); -+public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size) { -+ lock.lock(); -+ try { -+ _gtk_image_set_from_gicon(image, gicon, size); -+ } finally { -+ lock.unlock(); -+ } -+} -+/** - * @param argc cast=(int *) - * @param argv cast=(char ***) - */ ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java" -@@ -875,11 +875,11 @@ public void setImage (Image image) { - imageList = new ImageList (); - int imageIndex = imageList.add (image); - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf(imageHandle, pixbuf); - if (text.length () == 0) OS.gtk_widget_hide (labelHandle); - OS.gtk_widget_show (imageHandle); - } else { -- OS.gtk_image_set_from_pixbuf (imageHandle, 0); -+ gtk_image_set_from_pixbuf (imageHandle, 0); - OS.gtk_widget_show (labelHandle); - OS.gtk_widget_hide (imageHandle); - } ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java" -@@ -535,11 +535,11 @@ public void setImage (Image image) { - imageList = new ImageList (); - int imageIndex = imageList.add (image); - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf (imageHandle, pixbuf); - if (text.length () == 0) OS.gtk_widget_hide (labelHandle); - OS.gtk_widget_show (imageHandle); - } else { -- OS.gtk_image_set_from_pixbuf (imageHandle, 0); -+ gtk_image_set_from_pixbuf (imageHandle, 0); - OS.gtk_widget_show (labelHandle); - OS.gtk_widget_hide (imageHandle); - } ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java" -@@ -535,11 +535,11 @@ public void setImage (Image image) { - imageList = new ImageList (); - int imageIndex = imageList.add (image); - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf (imageHandle, pixbuf); - OS.gtk_widget_hide (labelHandle); - OS.gtk_widget_show (imageHandle); - } else { -- OS.gtk_image_set_from_pixbuf (imageHandle, 0); -+ gtk_image_set_from_pixbuf (imageHandle, 0); - OS.gtk_widget_show (labelHandle); - OS.gtk_widget_hide (imageHandle); - } ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java" -@@ -307,10 +307,10 @@ public void setImage (Image image) { - imageList.put (imageIndex, image); - } - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf (imageHandle, pixbuf); - OS.gtk_widget_show (imageHandle); - } else { -- OS.gtk_image_set_from_pixbuf (imageHandle, 0); -+ gtk_image_set_from_pixbuf (imageHandle, 0); - OS.gtk_widget_hide (imageHandle); - } - } ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java" -@@ -553,10 +553,10 @@ public void setImage (Image image) { - int imageIndex = headerImageList.indexOf (image); - if (imageIndex == -1) imageIndex = headerImageList.add (image); - long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf (imageHandle, pixbuf); - OS.gtk_widget_show (imageHandle); - } else { -- OS.gtk_image_set_from_pixbuf (imageHandle, 0); -+ gtk_image_set_from_pixbuf (imageHandle, 0); - OS.gtk_widget_hide (imageHandle); - } - } ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java" -@@ -608,7 +608,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) { - int index = imageList.indexOf (hotImage); - if (index != -1 && imageHandle != 0) { - long /*int*/ pixbuf = imageList.getPixbuf (index); -- OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf(imageHandle, pixbuf); - } - } - } -@@ -652,7 +652,7 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) { - int index = imageList.indexOf (image); - if (index != -1 && imageHandle != 0) { - long /*int*/ pixbuf = imageList.getPixbuf (index); -- OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf(imageHandle, pixbuf); - } - } - } -@@ -998,9 +998,9 @@ public void setImage (Image image) { - imageList.put (imageIndex, image); - } - long /*int*/ pixbuf = imageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf(imageHandle, pixbuf); - } else { -- OS.gtk_image_set_from_pixbuf(imageHandle, 0); -+ gtk_image_set_from_pixbuf(imageHandle, 0); - } - /* - * If Text/Image of a tool-item changes, then it is ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java" -@@ -550,10 +550,10 @@ public void setImage (Image image) { - int imageIndex = headerImageList.indexOf (image); - if (imageIndex == -1) imageIndex = headerImageList.add (image); - long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex); -- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf); -+ gtk_image_set_from_pixbuf (imageHandle, pixbuf); - OS.gtk_widget_show (imageHandle); - } else { -- OS.gtk_image_set_from_pixbuf (imageHandle, 0); -+ gtk_image_set_from_pixbuf (imageHandle, 0); - OS.gtk_widget_hide (imageHandle); - } - } ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java" -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java" -@@ -2171,4 +2171,13 @@ void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisit - OS.gtk_widget_size_request (widget, requisition); - } - } -+ -+void gtk_image_set_from_pixbuf (long /*int*/ imageHandle, long /*int*/ pixbuf){ -+ if (OS.GTK3) { -+ OS.gtk_image_set_from_gicon(imageHandle, pixbuf, OS.GTK_ICON_SIZE_SMALL_TOOLBAR); -+ } else { -+ OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf); -+ } -+} -+ - } diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch index 938d61c..60177b1 100644 --- a/eclipse-change-build-packagings.patch +++ b/eclipse-change-build-packagings.patch @@ -15,8 +15,8 @@ -- -+ +- ++ diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch index 297e3b0..4d5df65 100644 --- a/eclipse-fix-dropins.patch +++ b/eclipse-fix-dropins.patch @@ -82,81 +82,14 @@ } return engine.perform(plan, phaseSet, monitor); } ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java.bak 2013-06-10 09:33:20.000000000 +0200 -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationWizard_c.java 2013-06-11 15:44:28.654682088 +0200 -@@ -144,7 +144,7 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-10 09:33:20.000000000 +0200 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-11 15:44:28.654682088 +0200 +@@ -151,7 +151,7 @@ } public boolean performCancel() { -- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.ImportFromInstallationPag_LATER_BUTTON, IDialogConstants.NO_LABEL}; +- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL}; + String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}; - MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_TITLE, null, ProvUIMessages.ImportFromInstallationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); + MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); return rememberCancellationDecision(dialog.open()); ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/ImportFromInstallationPage_c.java -@@ -15,6 +15,7 @@ package org.eclipse.equinox.internal.p2.ui.sdk.scheduler.migration; - import java.net.URI; - import org.eclipse.core.runtime.Platform; - import org.eclipse.equinox.internal.p2.ui.ProvUI; -+import org.eclipse.equinox.internal.p2.ui.QueryProvider; - import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage; - import org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningOperationWizard; - import org.eclipse.equinox.internal.p2.ui.model.ProfileElement; -@@ -103,6 +104,12 @@ public class ImportFromInstallationPage_c extends AbstractImportPage_c implement - public org.eclipse.equinox.p2.query.IQueryable getQueryable() { - return toBeImportedProfile; - } -+ -+ @Override -+ public int getQueryType() { -+ return QueryProvider.STRICT_INSTALLED_IUS; -+ } -+ - }; - element.setQueryable(toBeImportedProfile); - input = element; -diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java -index 9cb6a53..b758ae7 100644 ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/QueryProvider.java -@@ -43,6 +43,7 @@ public class QueryProvider { - public static final int AVAILABLE_UPDATES = 5; - public static final int INSTALLED_IUS = 6; - public static final int AVAILABLE_ARTIFACTS = 7; -+ public static final int STRICT_INSTALLED_IUS = 8; - - public QueryProvider(ProvisioningUI ui) { - this.ui = ui; -@@ -224,6 +225,31 @@ public class QueryProvider { - return null; - return new ElementQueryDescriptor(queryable, ArtifactKeyQuery.ALL_KEYS, new Collector(), new ArtifactKeyWrapper((IArtifactRepository) queryable, element)); - -+ case STRICT_INSTALLED_IUS : -+ // Querying of IU's. We are drilling down into the requirements. -+ if (element instanceof IIUElement && context.getShowInstallChildren()) { -+ Collection reqs = ((IIUElement) element).getRequirements(); -+ IExpression[] requirementExpressions = new IExpression[reqs.size()]; -+ int i = 0; -+ for (IRequirement req : reqs) { -+ requirementExpressions[i++] = req.getMatches(); -+ } -+ IExpressionFactory factory = ExpressionUtil.getFactory(); -+ IQuery meetsAnyRequirementQuery = QueryUtil.createMatchQuery(factory.or(requirementExpressions)); -+ IQuery visibleAsAvailableQuery = policy.getVisibleAvailableIUQuery(); -+ //dropins things have no file property -+ IQuery strictQuery = QueryUtil.createIUPropertyQuery("file.name", null); //$NON-NLS-1$ -+ IQuery createCompoundQuery = QueryUtil.createCompoundQuery(QueryUtil.createCompoundQuery(visibleAsAvailableQuery, meetsAnyRequirementQuery, true), strictQuery, true); -+ return new ElementQueryDescriptor(queryable, createCompoundQuery, new Collector(), new InstalledIUElementWrapper(queryable, element)); -+ } -+ -+ profile = ProvUI.getAdapter(element, IProfile.class); -+ if (profile == null) -+ return null; -+ //dropins things have no file property -+ IQuery installedNotDropinsQuery = QueryUtil.createCompoundQuery(policy.getVisibleInstalledIUQuery(), QueryUtil.createIUPropertyQuery("file.name", null), true); -+ return new ElementQueryDescriptor(profile, installedNotDropinsQuery, new Collector(), new InstalledIUElementWrapper(profile, element)); //$NON-NLS-1$ -+ - default : - return null; - } diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index d5582f8..6851608 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -99,13 +99,14 @@ \ No newline at end of file --- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2013-03-14 11:35:02.000000000 +0100 +++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2013-03-14 12:53:51.015502076 +0100 -@@ -72,6 +72,13 @@ +@@ -72,6 +72,14 @@ + + -+ ++ ++ + + + diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index 9d06521..9352bff 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -369,13 +369,13 @@ build-native-launchers-win32.win32.x86_64 ---- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh.bak 2012-11-20 07:45:12.580081610 -0500 -+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh 2012-11-20 07:49:33.792018170 -0500 +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh.bak 2012-11-20 07:45:12.580081610 -0500 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2012-11-20 07:49:33.792018170 -0500 @@ -94,6 +94,11 @@ defaultJava=DEFAULT_JAVA_EXEC OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; -+ armv*) ++ arm*) + defaultOSArch="arm" + defaultJava=DEFAULT_JAVA_EXEC + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" diff --git a/eclipse.spec b/eclipse.spec index 5664d4b..8402992 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -7,10 +7,10 @@ Epoch: 1 %global eclipse_major 4 %global eclipse_minor 3 %global eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%global eclipse_micro 0 +%global eclipse_micro 1 %global initialize 1 %global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87 -%global eclipse_tag 84cba7bf43da88dc3f33bc113104eb680f12aa2d +%global eclipse_tag R4_3_1 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro} %global installation_loc %{_libdir}/%{pkg_name} @@ -51,12 +51,12 @@ fi; Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 4%{?dist} +Release: 1%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ #get-eclipse.sh -Source0: R4_platform-aggregator-%{eclipse_tag}.tar.bz2 +Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz #http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2 Source1: eclipse-build-%{eb_commit}.tar.xz @@ -123,7 +123,7 @@ Patch26: %{pkg_name}-fix-dropins.patch Patch27: %{pkg_name}-bug-408505.patch -Patch28: %{pkg_name}-bug-404448.patch +Patch29: %{pkg_name}-bug-386377.patch BuildRequires: ant >= 1.8.3 BuildRequires: rsync @@ -347,7 +347,9 @@ tar --strip-components=1 -xf %{SOURCE1} %patch25 %patch26 %patch27 -%patch28 +pushd rt.equinox.framework +%patch29 -p1 +popd #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 @@ -389,9 +391,7 @@ tar --strip-components=1 -xf %{SOURCE1} %pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc64 eclipse.platform.swt.binaries %pom_disable_module bundles/org.eclipse.swt.gtk.solaris.sparc eclipse.platform.swt.binaries %pom_disable_module bundles/org.eclipse.swt.gtk.solaris.x86 eclipse.platform.swt.binaries - -%pom_disable_module bundles/org.sat4j.core rt.equinox.p2 -%pom_disable_module bundles/org.sat4j.pb rt.equinox.p2 +%pom_disable_module bundles/org.eclipse.swt.gtk.hpux.ia64 eclipse.platform.swt.binaries # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) @@ -474,22 +474,28 @@ cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo find eclipse.platform.ua -name pom.xml -exec sed -i -e 's@org.apache.lucene<@org.apache.lucene.core<@g' {} \; +#this is not really necessary but reduces the build time. +pushd eclipse.platform.swt.binaries/bundles/ + for bundle in `ls | grep "org.eclipse.swt" | grep -v -e "org.eclipse.swt.gtk.linux.%{eclipse_arch}$"` ; do + if [ -e $bundle/pom.xml ]; then + %pom_xpath_remove "/pom:project/pom:build" $bundle/pom.xml + fi + done +popd + +sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml + %build %{?scl:%scl_maven_opts} #This is the lowest value where the build succeeds. 512m is not enough. export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" +export JAVA_HOME=%{java_home} #keep it here for secondary platforms. mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \ -DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130604-1421 -Dpackaging=jar -DskipTychoVersionCheck \ -Dtycho.local.keepTarget -# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377 -pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/ - export JAVA_HOME=%{java_home} - ant -popd - pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch} #keep it here for secondary platforms. mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \ @@ -502,9 +508,9 @@ pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_ popd export GTK_VERSION=3.0 -mvn-rpmbuild clean verify \ +mvn-rpmbuild clean verify -P update-branding-plugins \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ - -Dtycho.local.keepTarget + -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` #symlink necessary plugins (that are provided by other packages) dependencies/./replace_platform_plugins_with_symlinks.sh \ @@ -1008,6 +1014,11 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %changelog +* Mon Sep 30 2013 Krzysztof Daniel 1:4.3.1-1 +- Update to 4.3.1. +- Add buildId to the dialog. +- Reduce the build time by disabling unused SWT modules. + * Mon Jul 29 2013 Krzysztof Daniel 1:4.3.0-4 - 404448 [GTK3] Images of disabled buttons are not grayed out diff --git a/get-eclipse.sh b/get-eclipse.sh index 3a2f297..837e188 100755 --- a/get-eclipse.sh +++ b/get-eclipse.sh @@ -1,40 +1,18 @@ #!/bin/bash set -e AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git -TAG=84cba7bf43da88dc3f33bc113104eb680f12aa2d - -#source http://www.linuxjournal.com/content/normalizing-path-names-bash -function normalize() -{ - # Remove all /./ sequences. - path=${1//\/.\//\/} - - # Remove dir/.. sequences. - while [[ $path =~ ([^/][^/]*/\.\./) ]] - do - path=${path/${BASH_REMATCH[0]}/} - done -} - - +TAG=R4_3_1 rm -rf R4_platform-aggregator-$TAG -rm -rf R4_platform-aggregator-$TAG.tar.bz2 +rm -rf R4_platform-aggregator-$TAG.tar.xz -git clone --single-branch --depth 1 $AGGREGATOR_PATH R4_platform-aggregator-$TAG +git clone --branch $TAG --depth 1 $AGGREGATOR_PATH R4_platform-aggregator-$TAG pushd R4_platform-aggregator-$TAG git submodule init +git submodule update -for i in $(git submodule | sed -e 's/.* //'); do - spath=$(git config -f .gitmodules --get submodule.$i.path) - surl=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git/`git config -f .gitmodules --get submodule.$i.url` - normalize $surl - git clone --depth 1 $path $spath -done - -echo "Check out done" #comment this line to get a shallow clone. find . -type d -name ".git" | xargs rm rm -rf @@ -49,4 +27,4 @@ find . -type f -name *.jnilib -exec rm -rf {} \; popd -tar cjf R4_platform-aggregator-$TAG.tar.bz2 R4_platform-aggregator-$TAG +tar cJf R4_platform-aggregator-$TAG.tar.xz R4_platform-aggregator-$TAG \ No newline at end of file diff --git a/sources b/sources index 587a42b..5e73ede 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0aff7988c384ece2ac27e6abfe517e77 eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz +0408d6c5f1808b963f4981fda8123b3a R4_platform-aggregator-R4_3_1.tar.xz 3c59e76d97e8efbbcd650e83780e16e0 R4_platform-aggregator-84cba7bf43da88dc3f33bc113104eb680f12aa2d.tar.bz2