diff --git a/eclipse.spec b/eclipse.spec index dd89786..fbfc3d8 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -40,7 +40,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.9.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -1069,6 +1069,9 @@ fi %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Wed Aug 22 2018 Mat Booth - 1:4.9.0-0.3 +- Fix prefer x11 patch used on RHEL + * Mon Aug 20 2018 Mat Booth - 1:4.9.0-0.2 - Fix secondary arch build diff --git a/prefer_x11_backend.patch b/prefer_x11_backend.patch index 695ba5d..a69aa31 100644 --- a/prefer_x11_backend.patch +++ b/prefer_x11_backend.patch @@ -1,14 +1,14 @@ ---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2016-10-13 16:53:39.092748697 +0100 -+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c 2016-10-13 17:01:12.350231281 +0100 -@@ -119,6 +119,11 @@ - setenv("OXYGEN_DISABLE_INNER_SHADOWS_HACK", "1", 0); - } - +--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2018-08-22 15:19:04.602623018 +0100 ++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c 2018-08-22 15:20:03.453348722 +0100 +@@ -111,6 +111,11 @@ + #define DLFLAGS RTLD_LAZY + #endif + + char *gdkBackend = getenv("GDK_BACKEND"); + if (gdkBackend == NULL) { + setenv("GDK_BACKEND", "x11", 0); + } + - /* Disable GTK scaling*/ - setenv("GDK_SCALE", "1", 1); - + void *gioLib = NULL, *glibLib = NULL, *gdkLib = NULL, *gtkLib = NULL, *objLib = NULL, *pixLib = NULL; + + char *gtk3 = getenv("SWT_GTK3");