*fix compile error regarding pkgconfig.
authorjungmin76.park <jungmin76.park@samsung.com>
Tue, 15 Oct 2013 10:52:51 +0000 (19:52 +0900)
committerjungmin76.park <jungmin76.park@samsung.com>
Tue, 15 Oct 2013 12:27:04 +0000 (21:27 +0900)
*Revert "remove useless include from spec file."
This reverts commit 79be505051e0b6af37568fb983f9155a6c78dbb4.

Change-Id: I2581b23414edc5e782d6b495281184cae21dfe88
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>
CMakeLists.txt
packaging/osp-appwidget-service.spec
src/FShell_AppContext.cpp

index 7344b42f56fdf571859bf8fe73008a11132f1806..366f8872e7c6e3ac6a1e8fc843442093fa25d8ff 100644 (file)
@@ -9,6 +9,8 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/output")
 INCLUDE(FindPkgConfig)
        pkg_check_modules(${this_target} REQUIRED
        glib-2.0
+       chromium
+       capi-appfw-application
        provider
        osp-appfw
        osp-appfw-server
@@ -17,6 +19,7 @@ INCLUDE(FindPkgConfig)
 
 
 INCLUDE_DIRECTORIES (
+       ${${this_target}_INCLUDE_DIRS}
        inc
        )
 
index 8c47f014b123b2ef75997da39a3f84ad6a5a0fcf..000f800fc8c618238be9672c0d136ed9eafd4a5c 100755 (executable)
@@ -6,15 +6,12 @@ Group:                System/Libraries
 License:       Flora
 Source0:       %{name}-%{version}.tar.gz
 BuildRequires:  cmake
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(chromium)
 BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(provider)
 BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  pkgconfig(osp-appfw-server)
-BuildRequires:  pkgconfig(osp-uifw)
-BuildRequires:  pkgconfig(osp-image)
 BuildRequires:  pkgconfig(osp-shell)
 BuildRequires:  hash-signer
 
index a8a66508eda2256a991466bee8a25c96991b9797..e30e2e035c21477e8ee8cd0dfa0b70c7361ad991 100644 (file)
@@ -286,7 +286,7 @@ result
 _AppContext::SendPendingEvent(void)
 {
        SetWaitingStatus(false);
-       TryReturn(__pPendingEventList->GetCount() > 0, E_DATA_NOT_FOUND, "No pending event.");
+       TryReturn(__pPendingEventList->GetCount() > 0, E_DATA_NOT_FOUND, "This context has no pending event. Please find next pending event context.");
 
        PendingEvent* pEvent = null;
        __pPendingEventList->GetAt(0, pEvent);