From dea287ee2ac9e8f82c7cb7c9348b100cfd4531b7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 10 Apr 2018 17:25:15 +0100 Subject: [PATCH] Ensure patches apply cleanly Use java API stubs from ecj package --- eclipse-bug-431423.patch | 6 +++--- eclipse-bug-531928-1.patch | 28 +++++++++++++-------------- eclipse-bug-531928-2.patch | 20 +++++++++---------- eclipse-bug-531928-3.patch | 26 ++++++++++++------------- eclipse-support-symlink-bundles.patch | 4 ++-- eclipse.spec | 15 +++++++------- 6 files changed, 49 insertions(+), 50 deletions(-) diff --git a/eclipse-bug-431423.patch b/eclipse-bug-431423.patch index b83e467..699d081 100644 --- a/eclipse-bug-431423.patch +++ b/eclipse-bug-431423.patch @@ -118,7 +118,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal index a343cfe..a324248 100644 --- a/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 -@@ -1143,6 +1143,18 @@ public class GTK extends OS { +@@ -6388,6 +6388,18 @@ public class GTK extends OS { /** * @method flags=dynamic */ @@ -149,7 +149,7 @@ index d6ddbbc..6620fbc 100644 /** * Constructs a new instance of this class given its parent, -@@ -228,7 +228,9 @@ +@@ -227,7 +228,9 @@ * will fail. The fix is to ensure that the timestamp of the last * event processed is used. */ @@ -159,7 +159,7 @@ index d6ddbbc..6620fbc 100644 } else { sendEvent (SWT.Hide); } -@@ -1125,6 +1128,49 @@ void setOrientation (boolean create) { +@@ -1069,6 +1072,49 @@ void setOrientation (boolean create) { } /** diff --git a/eclipse-bug-531928-1.patch b/eclipse-bug-531928-1.patch index 953fd9e..1327d8d 100644 --- a/eclipse-bug-531928-1.patch +++ b/eclipse-bug-531928-1.patch @@ -62,7 +62,7 @@ index 5bb916a..e29d144 100644 LinkedList dragDetectionQueue; -@@ -5360,7 +5361,7 @@ void setParentBackground () { +@@ -5286,7 +5287,7 @@ void setParentBackground () { if (fixedHandle != 0) setBackgroundColor (fixedHandle, null); } @@ -71,7 +71,7 @@ index 5bb916a..e29d144 100644 } boolean setRadioSelection (boolean value) { -@@ -5565,6 +5566,13 @@ public void setVisible (boolean visible) { +@@ -5491,6 +5492,13 @@ public void setVisible (boolean visible) { state &= ~HIDDEN; if ((state & (ZERO_WIDTH | ZERO_HEIGHT)) == 0) { if (enableWindow != 0) OS.gdk_window_show_unraised (enableWindow); @@ -85,7 +85,7 @@ index 5bb916a..e29d144 100644 OS.gtk_widget_show (topHandle); } } else { -@@ -5601,6 +5609,13 @@ public void setVisible (boolean visible) { +@@ -5527,6 +5535,13 @@ public void setVisible (boolean visible) { OS.gtk_widget_hide (topHandle); if (isDisposed ()) return; if (enableWindow != 0) OS.gdk_window_hide (enableWindow); @@ -99,7 +99,7 @@ index 5bb916a..e29d144 100644 sendEvent (SWT.Hide); } } -@@ -5762,7 +5777,7 @@ void showWidget () { +@@ -5682,7 +5697,7 @@ void showWidget () { state |= ZERO_WIDTH | ZERO_HEIGHT; long /*int*/ topHandle = topHandle (); long /*int*/ parentHandle = parent.parentingHandle (); @@ -112,7 +112,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tab index e3d1441..b664f29 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java -@@ -1258,9 +1258,6 @@ Rectangle getClientAreaInPixels () { +@@ -1205,9 +1205,6 @@ Rectangle getClientAreaInPixels () { int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height; Rectangle rect = new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height); @@ -122,7 +122,7 @@ index e3d1441..b664f29 100644 return rect; } -@@ -1653,9 +1650,6 @@ TableItem getItemInPixels (Point point) { +@@ -1601,9 +1598,6 @@ TableItem getItemInPixels (Point point) { long /*int*/ [] path = new long /*int*/ [1]; OS.gtk_widget_realize (handle); int y = point.y; @@ -132,7 +132,7 @@ index e3d1441..b664f29 100644 if (!OS.gtk_tree_view_get_path_at_pos (handle, point.x, y, path, null, null, null)) return null; if (path [0] == 0) return null; long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]); -@@ -2505,10 +2499,6 @@ boolean mnemonicMatch (char key) { +@@ -2453,10 +2447,6 @@ boolean mnemonicMatch (char key) { @Override long /*int*/ paintWindow () { OS.gtk_widget_realize (handle); @@ -143,7 +143,7 @@ index e3d1441..b664f29 100644 return OS.gtk_tree_view_get_bin_window (handle); } -@@ -3734,9 +3724,23 @@ void setParentBackground () { +@@ -3659,9 +3649,23 @@ void setParentBackground () { } @Override @@ -173,7 +173,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tab index 6efb227..f904159 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java -@@ -433,9 +433,6 @@ Rectangle getBoundsInPixels (int index) { +@@ -403,9 +403,6 @@ Rectangle getBoundsInPixels (int index) { } int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0; Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1); @@ -187,7 +187,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tre index 58e0382..2428361 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -@@ -1244,9 +1244,6 @@ Rectangle getClientAreaInPixels () { +@@ -1203,9 +1203,6 @@ Rectangle getClientAreaInPixels () { int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width; int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height; Rectangle rect = new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height); @@ -197,7 +197,7 @@ index 58e0382..2428361 100644 return rect; } -@@ -1649,9 +1646,6 @@ TreeItem getItemInPixels (Point point) { +@@ -1610,9 +1607,6 @@ TreeItem getItemInPixels (Point point) { OS.gtk_widget_realize (handle); int x = point.x; int y = point.y; @@ -207,7 +207,7 @@ index 58e0382..2428361 100644 if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x; long /*int*/ [] columnHandle = new long /*int*/ [1]; if (!OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, columnHandle, null, null)) return null; -@@ -2635,10 +2629,6 @@ boolean mnemonicMatch (char key) { +@@ -2596,10 +2590,6 @@ boolean mnemonicMatch (char key) { @Override long /*int*/ paintWindow () { OS.gtk_widget_realize (handle); @@ -218,7 +218,7 @@ index 58e0382..2428361 100644 return OS.gtk_tree_view_get_bin_window (handle); } -@@ -3725,9 +3715,23 @@ void setParentBackground () { +@@ -3664,9 +3654,23 @@ void setParentBackground () { } @Override @@ -248,7 +248,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tre index 25bb96b..802a1f9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java -@@ -483,9 +483,6 @@ Rectangle getBoundsInPixels (int index) { +@@ -453,9 +453,6 @@ Rectangle getBoundsInPixels (int index) { } int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0; Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1); diff --git a/eclipse-bug-531928-2.patch b/eclipse-bug-531928-2.patch index edc54cd..85eb44a 100644 --- a/eclipse-bug-531928-2.patch +++ b/eclipse-bug-531928-2.patch @@ -43,7 +43,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/o index bf5de70..428d448 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -@@ -13853,7 +13853,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent) +@@ -16764,7 +16764,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { OS_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC); @@ -63,7 +63,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Com index 2619114..57bbf52 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java -@@ -487,6 +487,16 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De +@@ -506,6 +506,16 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De } @Override @@ -84,7 +84,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Con index e29d144..b0768d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java -@@ -2655,6 +2655,51 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De +@@ -2656,6 +2656,51 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De oldDecorations.fixDecorations (newDecorations, this, menus); } @@ -136,7 +136,7 @@ index e29d144..b0768d5 100644 @Override long /*int*/ fixedMapProc (long /*int*/ widget) { OS.gtk_widget_set_mapped (widget, true); -@@ -5323,7 +5368,7 @@ public boolean setParent (Composite parent) { +@@ -5254,7 +5299,7 @@ public boolean setParent (Composite parent) { oldDecorations.fixAccelGroup (); } long /*int*/ newParent = parent.parentingHandle(); @@ -145,7 +145,7 @@ index e29d144..b0768d5 100644 if (OS.GTK3) { OS.swt_fixed_move (newParent, topHandle, x, y); } else { -@@ -5361,7 +5406,7 @@ void setParentBackground () { +@@ -5287,7 +5332,7 @@ void setParentBackground () { if (fixedHandle != 0) setBackgroundColor (fixedHandle, null); } @@ -154,7 +154,7 @@ index e29d144..b0768d5 100644 } boolean setRadioSelection (boolean value) { -@@ -5777,7 +5822,7 @@ void showWidget () { +@@ -5697,7 +5742,7 @@ void showWidget () { state |= ZERO_WIDTH | ZERO_HEIGHT; long /*int*/ topHandle = topHandle (); long /*int*/ parentHandle = parent.parentingHandle (); @@ -167,7 +167,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Exp index fcfbd33..6e48823 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java -@@ -532,7 +532,7 @@ public void setControl (Control control) { +@@ -525,7 +525,7 @@ public void setControl (Control control) { //As ExpandItem's child can be created before the ExpandItem, our only //option is to reparent the child upon the setControl(..) call. //This is simmilar to TabFolder. @@ -195,7 +195,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tab index ccf01ec..c572e51 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java -@@ -3726,9 +3726,9 @@ void setParentBackground () { +@@ -3649,9 +3649,9 @@ void setParentBackground () { } @Override @@ -212,7 +212,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tre index 86b72a0..50de17c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -@@ -3717,9 +3717,9 @@ void setParentBackground () { +@@ -3654,9 +3654,9 @@ void setParentBackground () { } @Override @@ -229,7 +229,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Wid index 40fe88c..2da1da5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java -@@ -951,21 +951,6 @@ long /*int*/ gtk_value_changed (long /*int*/ adjustment) { +@@ -936,21 +936,6 @@ long /*int*/ gtk_value_changed (long /*int*/ adjustment) { return 0; } diff --git a/eclipse-bug-531928-3.patch b/eclipse-bug-531928-3.patch index 2eaec10..ed9174f 100644 --- a/eclipse-bug-531928-3.patch +++ b/eclipse-bug-531928-3.patch @@ -41,7 +41,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/o index cb6b841..5fc92d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -@@ -5532,6 +5532,24 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1container_1get_1children) +@@ -8497,6 +8497,24 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1container_1get_1children) } #endif @@ -70,7 +70,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bun index ebfe993..98f36e6 100644 --- a/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 -@@ -415,6 +415,7 @@ char * GTK_nativeFunctionNames[] = { +@@ -680,6 +680,7 @@ char * GTK_nativeFunctionNames[] = { "_1gtk_1container_1forall", "_1gtk_1container_1get_1border_1width", "_1gtk_1container_1get_1children", @@ -82,7 +82,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bun index f707a39..97f4d14 100644 --- a/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 -@@ -413,6 +413,7 @@ typedef enum { +@@ -690,6 +690,7 @@ typedef enum { _1gtk_1container_1forall_FUNC, _1gtk_1container_1get_1border_1width_FUNC, _1gtk_1container_1get_1children_FUNC, @@ -94,7 +94,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal index cc80140..78ba8d3 100644 --- a/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 -@@ -1676,6 +1676,21 @@ public class GTK extends OS { +@@ -6915,6 +6915,21 @@ public class GTK extends OS { lock.unlock(); } } @@ -120,7 +120,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Com index 57bbf52..bd253c4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java -@@ -1374,6 +1374,50 @@ void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { +@@ -1393,6 +1393,50 @@ void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) { newClip.dispose (); } @@ -175,7 +175,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Con index 7971ff6..f075de8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java -@@ -5662,13 +5662,6 @@ public void setVisible (boolean visible) { +@@ -5537,13 +5537,6 @@ public void setVisible (boolean visible) { state &= ~HIDDEN; if ((state & (ZERO_WIDTH | ZERO_HEIGHT)) == 0) { if (enableWindow != 0) OS.gdk_window_show_unraised (enableWindow); @@ -189,7 +189,7 @@ index 7971ff6..f075de8 100644 OS.gtk_widget_show (topHandle); } } else { -@@ -5705,13 +5698,6 @@ public void setVisible (boolean visible) { +@@ -5580,13 +5573,6 @@ public void setVisible (boolean visible) { OS.gtk_widget_hide (topHandle); if (isDisposed ()) return; if (enableWindow != 0) OS.gdk_window_hide (enableWindow); @@ -216,7 +216,7 @@ index a64bdfc..dff41bd 100644 int maxWidth = 0; int topIndex; double cachedAdjustment, currentAdjustment; -@@ -3739,18 +3739,18 @@ void setParentGdkWindow (Control child) { +@@ -3653,18 +3653,18 @@ void setParentGdkWindow (Control child) { long /*int*/ parentGdkWindow = eventWindow (); OS.gtk_widget_set_parent_window (child.topHandle(), parentGdkWindow); /* @@ -245,7 +245,7 @@ index a64bdfc..dff41bd 100644 } } -@@ -4166,6 +4166,16 @@ void updateScrollBarValue (ScrollBar bar) { +@@ -4080,6 +4080,16 @@ void updateScrollBarValue (ScrollBar bar) { @Override long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { switch ((int)/*64*/user_data) { @@ -266,7 +266,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tab index a1d3b89..c6031d2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java -@@ -361,9 +361,6 @@ Rectangle getBoundsinPixels () { +@@ -331,9 +331,6 @@ Rectangle getBoundsinPixels () { } int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0; Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1); @@ -289,7 +289,7 @@ index 6644346..1842b84 100644 int pixbufHeight, pixbufWidth; TreeItem topItem; double cachedAdjustment, currentAdjustment; -@@ -3725,18 +3725,18 @@ void setParentGdkWindow (Control child) { +@@ -3658,18 +3658,18 @@ void setParentGdkWindow (Control child) { long /*int*/ parentGdkWindow = eventWindow (); OS.gtk_widget_set_parent_window (child.topHandle(), parentGdkWindow); /* @@ -318,7 +318,7 @@ index 6644346..1842b84 100644 } } -@@ -4077,6 +4077,16 @@ void updateScrollBarValue (ScrollBar bar) { +@@ -4010,6 +4010,16 @@ void updateScrollBarValue (ScrollBar bar) { @Override long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { switch ((int)/*64*/user_data) { @@ -339,7 +339,7 @@ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tre index 03b847c..66307f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java -@@ -547,9 +547,6 @@ Rectangle getBoundsInPixels () { +@@ -517,9 +517,6 @@ Rectangle getBoundsInPixels () { } int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0; Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1); diff --git a/eclipse-support-symlink-bundles.patch b/eclipse-support-symlink-bundles.patch index 443092e..c829d9b 100644 --- a/eclipse-support-symlink-bundles.patch +++ b/eclipse-support-symlink-bundles.patch @@ -43,7 +43,7 @@ index ab69b88..d6bf121 100644 public class SimpleConfiguratorUtils { -@@ -283,6 +288,16 @@ public class SimpleConfiguratorUtils { +@@ -284,6 +288,16 @@ public class SimpleConfiguratorUtils { String symbolicName = tok.nextToken().trim(); String version = tok.nextToken().trim(); URI location = parseLocation(tok.nextToken().trim()); @@ -60,7 +60,7 @@ index ab69b88..d6bf121 100644 int startLevel = Integer.parseInt(tok.nextToken().trim()); boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken()); BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted); -@@ -421,4 +436,93 @@ public class SimpleConfiguratorUtils { +@@ -414,4 +428,93 @@ public class SimpleConfiguratorUtils { } return regularTimestamp; } diff --git a/eclipse.spec b/eclipse.spec index d01bc89..0e2b2c3 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -54,7 +54,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.7.3a -Release: 3%{?dist} +Release: 4%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -634,21 +634,17 @@ for f in rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.*/META-IN echo -e "Eclipse-BundleShape: dir\n\n" >> $f; done -# Java 9 API stubs must be available at build time +# Java API stubs must be available at build time mkdir java10api pushd java10api xmvn -B -o install:install-file -Dfile=../eclipse.jdt.core/org.eclipse.jdt.compiler.apt/lib/java10api.jar \ -Dpackaging=jar -DgroupId=org.eclipse -DartifactId=java10api -Dversion=10 popd -# Add dep on Java 9 API stubs when compiling with JDT +# Add dep on Java API stubs when compiling with JDT %pom_xpath_inject "pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='tycho-compiler-plugin']/pom:dependencies" \ "org.eclipsejava10api10" eclipse-platform-parent -# Make Java 10 API stubs available for other packages -%mvn_artifact "org.eclipse:java10api:jar:10" eclipse.jdt.core/org.eclipse.jdt.compiler.apt/lib/java10api.jar -%mvn_alias "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9" - # Build fake ant bundle that contains symlinks to system jars dependencies/fake_ant_dependency.sh @@ -709,7 +705,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. %mvn_package "org.eclipse.pde{,.ui,.feature}:" pde %mvn_package "org.eclipse.ui:org.eclipse.ui.{views.log,trace}" pde %mvn_package "org.eclipse.sdk{,.feature}:" sdk -%mvn_package "org.eclipse:java10api" jdt %mvn_package ":" __noinstall %build @@ -1136,6 +1131,10 @@ fi %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Tue Apr 10 2018 Mat Booth - 1:4.7.3a-4 +- Ensure patches apply cleanly +- Use java API stubs from ecj package + * Mon Apr 09 2018 Mat Booth - 1:4.7.3a-3 - Package java 10 API stubs jar