From: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Date: Thu, 28 Aug 2014 13:54:44 +0000 (+0200)
Subject: meta-tizen: weston-ivi-shell: remove hack
X-Git-Tag: rev_ivi_2015_02_04~327
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff83da526f97c508820e64636dc8d7f52906eb87;p=scm%2Fbb%2Ftizen-distro.git

meta-tizen: weston-ivi-shell: remove hack

Change-Id: I75cebbfd4e8e9aa9051d2ca336c09d6f734cc649
(From meta-tizen rev: 514d7e5b512131250f6cd676963ecab6b332caf1)

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc b/meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
index 9bc9bb7..17994b7 100644
--- a/meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
+++ b/meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
@@ -1,15 +1,6 @@
 do_configure_prepend() {
     # pkg-config check for wayland scanner even though it is present and wayland-scanner.pc seems ok.
-    # Workaround: remove pkg-config check for wayland-scanner.
-    # Bug-Tizen: BTY-31 (https://bugs.tizen.org/jira/browse/BTY-31)
     sed -i 's/PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)//' configure.ac
-
-    # Replaces "#include <weston/compositor.h>" with "#include <compositor.h>" since compositor.h is located in src/ not in weston/
-    sed -i 's@#include <weston/compositor.h>@#include <compositor.h>@g' ivi-shell/ivi-layout.h
-    sed -i 's@#include <weston/compositor.h>@#include <compositor.h>@g' ivi-shell/ivi-layout-export.h
-    sed -i 's@#include <weston/compositor.h>@#include <compositor.h>@g' ivi-shell/ivi-layout-private.h
-    sed -i 's@#include <weston/compositor.h>@#include <compositor.h>@g' ivi-shell/ivi-layout.c
-    sed -i 's@#include <weston/compositor.h>@#include <compositor.h>@g' ivi-shell/ivi-shell.h
 }
 
 PACKAGES += " weston-ivi-shell-clients-dbg "