Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Ufimtsev2018-01-17 20:45:53 -0500
committerAlexander Kurtakov2018-01-18 05:00:34 -0500
commit5282e51a49c640f347e112faa9b2305ff5ed4111 (patch)
tree94269df599f1c3a7989ed232128095ecf2684fa9 /features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
parent0f594b4f96e383e0f8802a000fe4bfabfead093e (diff)
downloadrt.equinox.framework-5282e51a49c640f347e112faa9b2305ff5ed4111.tar.gz
rt.equinox.framework-5282e51a49c640f347e112faa9b2305ff5ed4111.tar.xz
rt.equinox.framework-5282e51a49c640f347e112faa9b2305ff5ed4111.zip
Bug 528414 (swtWaylandLauncher) Part 2: Replace x11 with gdbus
eclipseGtk.c overhaul replacing x11 machinery with gio's gdbus for wayland support. Results: - Launcher works on wayland - All x11 is gone (at least for gtk3). - Files no longer separated via colons. - Verified on Wayland (and x11). - Also added a makefile to accelerate future development efforts and make it more obvious on how to test launcher. Technical notes: - Old machinery used to set windowProperty via x11 atoms, files were separated via colons ':'. This had issues with local urls'. - New machinery checks if there is a session on: org.eclipse.swt and if so, it passes files via a gdbus array with each file being a separate item. (I.e, colons not used anymore). - The mutex/launcher window stuff was all related to x11. gdbus doesn't use that anymore, locks are internall to gtk/glib. - A few additional minor fixes/patches (code style etc...). Test Strategy: - Below were done on both Wayland and X11: - Fedora 27, Gtk3.22. (Probably works on gtk2, but not tested). 1) Open eclipse with file(s) : ./eclipse /tmp/myfile1 [OK] ./eclipse /tmp/myfile1 /tmp/myfile2 [OK] 2) Open multiple eclipses at the same time: [OK] ./eclipse /tmp/myfile1 /tmp/myfile2 & ./eclipse /tmp/myfile3 /tmp/myfile3 3) Open eclipse. Once opened, run launcher again to pass files. [OK] ./eclipse ... ./eclipse /tmp/myfile 4) Open eclipse with launcher flag: ./eclipse --launcher.openFile /tmp/myfile1 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=528414 Change-Id: I73ab1e8b603deee803693f022f0c4c90ea3c43c9 Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak')
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak7
1 files changed, 4 insertions, 3 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
index a1f0dc14a..1167a6329 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2018 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -41,12 +41,13 @@ DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseShm.o eclips
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
-#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
+#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
LIBS = -lpthread -ldl
GTK_LIBS = \
-DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
- -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
+ -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
-fpic \

Back to the top