Merge branch 'gdk-backend-wayland'

Conflicts:
	Makefile.am
	configure.ac
	gdk/Makefile.am
	gtk/gtksettings.c
	gtk/gtkwindow.c

diff --cc Makefile.am
index df52bcc6b0d00674501bff4ac569d6f3c29107e0,2c6e77be6f9d3defbeeecf986a26c4c7f767d438..050202dd5174267c8e520430867285c933fa527a
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -55,11 -55,11 +55,11 @@@ MAINTAINERCLEANFILES = 
  
  
  ## Copy .pc files to target-specific names
- gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc: gtk+-3.0.pc
 -gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
++gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
        rm -f $@ && \
        cp gtk+-3.0.pc $@
  
- gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc: gdk-3.0.pc
 -gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
++gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
        rm -f $@ && \
        cp gdk-3.0.pc $@
  

diff --cc configure.ac
index 61084e1eaa3bf83dd8f043fce3433d5e74901b58,a37651a29f42e28ed177af1e1e76c1c9a79554a0..fc6df9b833bab54444ee9fb5184cdba233f09538
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -297,10 -297,10 +297,14 @@@ AC_ARG_ENABLE(quartz-backend
                [AS_HELP_STRING([--enable-quartz-backend],
                                [enable the quartz gdk backend])],
                              [backend_set=yes])
 +AC_ARG_ENABLE(broadway-backend,
 +              [AC_HELP_STRING([--enable-broadway-backend],
 +                              [enable the broadway (HTML5) gdk backend])],
 +                            [backend_set=yes])
+ AC_ARG_ENABLE(wayland-backend,
+               [AC_HELP_STRING([--enable-wayland-backend],
+                               [enable the wayland gdk backend])],
+                             [backend_set=yes])
  
  if test -z "$backend_set"; then
    if test "$platform_win32" = yes; then
@@@ -356,19 -356,21 +360,33 @@@ els
    AM_CONDITIONAL(USE_QUARTZ, false)
  fi
  
++
 +if test "x$enable_broadway_backend" == xyes; then
 +  GDK_BACKENDS="$GDK_BACKENDS broadway"
 +  cairo_backends="$cairo_backends cairo"
 +  GDK_WINDOWING="$GDK_WINDOWING
 +#define GDK_WINDOWING_BROADWAY"
 +  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
 +  AM_CONDITIONAL(USE_BROADWAY, true)
 +else
 +  AM_CONDITIONAL(USE_BROADWAY, false)
 +fi
 +
+ if test "x$enable_wayland_backend" == "xyes"; then
+   # Wayland uses cairo-gl
+   cairo_backends="$cairo_backends cairo-gl"
+   GDK_BACKENDS="$GDK_BACKENDS wayland"
+   GIO_PACKAGE=gio-unix-2.0
+   GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_WINDOWING_WAYLAND"
+   WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
+   AM_CONDITIONAL(USE_WAYLAND, true)
+ else
+   AM_CONDITIONAL(USE_WAYLAND, false)
+ fi
+ 
  # strip leading space
 -GDK_BACKENDS=${GDK_BACKENDS/# }
 +GDK_BACKENDS=${GDK_BACKENDS#* }
  
  AC_SUBST(GDK_BACKENDS)
  

diff --cc gdk/Makefile.am
index cc5346b0f878a1975380d346b7dd31a7ce8c9012,cfacc2a3d8a066c65e5a362c9543f1689f65ace2..cb1fd545aa764b6fadce288d1cd0e1bd1a540df8
--- 1/gdk/Makefile.am
--- 2/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@@ -11,7 -11,7 +11,7 @@@ INTROSPECTION_COMPILER_ARGS = 
  
  SUBDIRS = $(GDK_BACKENDS) . tests
  
- DIST_SUBDIRS = win32 x11 quartz broadway tests
 -DIST_SUBDIRS = win32 x11 quartz wayland tests
++DIST_SUBDIRS = win32 x11 quartz broadway wayland tests
  
  CLEANFILES =
  
@@@ -173,10 -176,10 +173,14 @@@ libgdk_3_la_DEPENDENCIES = win32/libgdk
  libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
  endif # USE_WIN32
  
 +if USE_BROADWAY
 +libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
 +endif # USE_BROADWAY
 +
+ if USE_WAYLAND
+ libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+ endif
+ 
  if HAVE_INTROSPECTION
  
  introspection_files =                 \

diff --cc gdk/gdkdisplaymanager.c
Simple merge

diff --cc gtk/gtkwindow.c
Simple merge