Fix undeclared error and add ldconfig. TDIST-249.

Change-Id: I8b7f0bbfc34c934ac915f73e91042ce839c1963d
Signed-off-by: Junfeng Dong <junfeng.dong@intel.com>

diff --git a/packaging/wrt-setting.changes b/packaging/wrt-setting.changes
new file mode 100644 (file)
index 0000000..d6ff7df
--- /dev/null
+++ b/packaging/wrt-setting.changes
@@ -0,0 +1,2 @@
+* Mon Jul 22 2013 Junfeng Dong <junfeng.dong@intel.com> accepted/tizen/20130530.164339@69b9a41
+- Fix undeclared error and add ldconfig. TDIST-249.

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index 297f5f0..4192e7a 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -38,6 +38,10 @@ cp LICENSE.Flora %{buildroot}/usr/share/license/%{name}
 %clean
 rm -rf %{buildroot}
 
+%post -p /bin/ldconfig
+
+%postun -p /bin/ldconfig
+
 %files
 %manifest wrt-setting.manifest
 /etc/smack/accesses2.d/ug.webapp-common-efl.include

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index 46baa46..e37c15d 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -19,19 +19,11 @@ SET(TARGET_UG_EDJ "webapp-detail.edj")
 SET(UGDIR "${UG_INSTALL_PREFIX}/ug/lib")
 SET(EDJDIR "${UG_INSTALL_PREFIX}/ug/res/edje/${TARGET_UG_DETAIL_LIB}")
 
-# Compiler flags
-SET(CMAKE_BUILD_TYPE           "Release")
-SET(CMAKE_C_FLAGS_PROFILING    "-O0 -g -pg")
-SET(CMAKE_CXX_FLAGS_PROFILING  "-O0 -std=c++0x -g -pg")
-SET(CMAKE_C_FLAGS_DEBUG        "-O0 -g")
-SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++0x -g")
-SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
-SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
-
 PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
     ecore
     elementary
     ui-gadget-1
+    wrt-commons-custom-handler-dao-ro
     dpl-efl
     dpl-wrt-dao-rw
     dpl-utils-efl
@@ -39,6 +31,19 @@ PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
     wrt-commons-security-origin-dao
     REQUIRED)
 
+FOREACH(flag ${UG_WEB_APP_DETAIL_DEPS_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+# Compiler flags
+SET(CMAKE_BUILD_TYPE           "Release")
+SET(CMAKE_C_FLAGS_PROFILING    "${EXTRA_CFLAGS} -O0 -g -pg")
+SET(CMAKE_CXX_FLAGS_PROFILING  "${EXTRA_CFLAGS} -O0 -std=c++0x -g -pg")
+SET(CMAKE_C_FLAGS_DEBUG        "${EXTRA_CFLAGS} -O0 -g")
+SET(CMAKE_CXX_FLAGS_DEBUG      "${EXTRA_CFLAGS} -O0 -std=c++0x -g")
+SET(CMAKE_C_FLAGS_RELEASE      "${EXTRA_CFLAGS} -O2 -g")
+SET(CMAKE_CXX_FLAGS_RELEASE    "${EXTRA_CFLAGS} -O2 -std=c++0x -g")
+
 SET(UG_DETAIL_SOURCES
     ug.cpp
     view.cpp