mutter/files/patch-src_core_main.c

$OpenBSD: patch-src_core_main_c,v 1.6 2018/04/26 09:19:27 jasper Exp $

extend HAVE_WAYLAND block to include opt_nested and META_TYPE_BACKEND_X11_NESTED.

Index: src/core/main.c
--- src/core/main.c.orig
+++ src/core/main.c
@@ -456,7 +456,6 @@ calculate_compositor_configuration (MetaCompositorType
   if (run_as_wayland_compositor)
     *compositor_type = META_COMPOSITOR_TYPE_WAYLAND;
   else
-#endif /* HAVE_WAYLAND */
     *compositor_type = META_COMPOSITOR_TYPE_X11;
 
 #ifdef HAVE_WAYLAND
@@ -473,6 +472,7 @@ calculate_compositor_configuration (MetaCompositorType
       *backend_gtype = META_TYPE_BACKEND_NATIVE;
       return;
     }
+#endif /* HAVE_WAYLAND */
 
 #ifdef HAVE_WAYLAND
   if (run_as_wayland_compositor)
Revision:	24610
Committed:	Wed Oct 31 23:54:38 2018 UTC (5 years, 6 months ago) by laffer1
Content type:	text/plain
File size:	725 byte(s)
Log Message:	mutter 3.28.2
#	Content
1	$OpenBSD: patch-src_core_main_c,v 1.6 2018/04/26 09:19:27 jasper Exp $
2
3	extend HAVE_WAYLAND block to include opt_nested and META_TYPE_BACKEND_X11_NESTED.
4
5	Index: src/core/main.c
6	--- src/core/main.c.orig
7	+++ src/core/main.c
8	@@ -456,7 +456,6 @@ calculate_compositor_configuration (MetaCompositorType
9	if (run_as_wayland_compositor)
10	*compositor_type = META_COMPOSITOR_TYPE_WAYLAND;
11	else
12	-#endif /* HAVE_WAYLAND */
13	*compositor_type = META_COMPOSITOR_TYPE_X11;
14
15	#ifdef HAVE_WAYLAND
16	@@ -473,6 +472,7 @@ calculate_compositor_configuration (MetaCompositorType
17	*backend_gtype = META_TYPE_BACKEND_NATIVE;
18	return;
19	}
20	+#endif /* HAVE_WAYLAND */
21
22	#ifdef HAVE_WAYLAND
23	if (run_as_wayland_compositor)