From 1756c2671435de8d23cac12254ed8d92fc436938 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sep 23 2019 11:42:22 +0000 Subject: Add patch for ebz#550606 --- diff --git a/ebz550606.patch b/ebz550606.patch new file mode 100644 index 0000000..5e68ac8 --- /dev/null +++ b/ebz550606.patch @@ -0,0 +1,32 @@ +From 890b5826e457d87824a6c61a9fdda45bd407811a Mon Sep 17 00:00:00 2001 +From: Eric Williams +Date: Mon, 9 Sep 2019 15:20:17 -0400 +Subject: Bug 550606: [GTK] Right-click > Rename from Project Explorer + non-functional when starting with only hidden projects + +Adjust the conditions for gdk_window_ensure_native() to ensure it only +gets applied to the right cases. + +Change-Id: I3a57d8674d79bbdc123f11352ab7c7d6b0e807f5 +Signed-off-by: Eric Williams +--- + .../org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git 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 +index 95776fc898..411b8e0540 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 +@@ -2419,7 +2419,8 @@ long gtk_draw (long widget, long cairo) { + * if the Tree has no items. In such cases, the fix is to ensure that the Tree's GdkWindow + * is a native one. Only X11 is affected by this issue, see bug 541427 for more info. + */ +- if (firstDraw && OS.isX11() && getItemCount() == 0 && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { ++ if (firstDraw && OS.isX11() && getItemCount() == 0 && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ++ && !hasChildren && headerVisible) { + long binWindow = GTK.gtk_tree_view_get_bin_window(handle); + GDK.gdk_window_ensure_native(binWindow); + } +-- +cgit v1.2.1 + diff --git a/eclipse.spec b/eclipse.spec index 46e3dea..f79af20 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -42,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.13 -Release: 3%{?dist} +Release: 4%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -122,6 +122,9 @@ Patch25: eclipse-patch-out-fileupload-dep.patch # Fix regression in ant support Patch26: fix-ant-execution.patch +# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=550606 +Patch27: ebz550606.patch + # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -409,6 +412,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch24 %patch25 %patch26 -p1 +%patch27 -p1 # Optional (unused) multipart support (see patch 25) rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java @@ -1103,6 +1107,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Mon Sep 23 2019 Mat Booth - 1:4.13-4 +- Add patch for ebz#550606 + * Mon Sep 23 2019 Mat Booth - 1:4.13-3 - Fix explicit hamcrest reqs