X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-graphical%2Frecipes-graphics%2Fwayland%2Fweston%2F0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch;fp=meta-agl-profile-graphical%2Frecipes-graphics%2Fwayland%2Fweston%2F0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch;h=0000000000000000000000000000000000000000;hb=32521fe5ebaf54a7c78a81647cc0e248a4a03087;hp=f6256f782218dc0ddbeb520e9059275cae626489;hpb=8d55c30c7d8f2f2b66cd9d5f827cc1dd1856b23e;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch
deleted file mode 100644
index f6256f782..000000000
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0011-ivi-shell-create-weston-desktop-in_wet_shell_init.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
-index b0a2a2b9..a889afdb 100644
---- a/ivi-shell/ivi-shell.c
-+++ b/ivi-shell/ivi-shell.c
-@@ -664,10 +664,14 @@ wet_shell_init(struct weston_compositor *compositor,
- 	if (!shell->text_backend)
- 		goto err_shell;
- 
-+	shell->desktop = weston_desktop_create(compositor, &shell_desktop_api, shell);
-+	if (!shell->desktop)
-+		goto err_text_backend;
-+
- 	if (wl_global_create(compositor->wl_display,
- 			     &ivi_application_interface, 1,
- 			     shell, bind_ivi_application) == NULL)
--		goto err_text_backend;
-+		goto err_desktop;
- 
- 	ivi_layout_init_with_compositor(compositor);
- 	/* TODO ivi_layout_destroy should be implemented, since multiple lists
-@@ -676,6 +680,9 @@ wet_shell_init(struct weston_compositor *compositor,
- 
- 	return IVI_SUCCEEDED;
- 
-+err_desktop:
-+	weston_desktop_destroy(shell->desktop);
-+
- err_text_backend:
- 	text_backend_destroy(shell->text_backend);
-