From: Soo-Hyun Choi <s.choi@hackerslab.eu>
Date: Sun, 29 Sep 2013 07:51:25 +0000 (+0900)
Subject: Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen
X-Git-Tag: accepted/tizen/20131002.084327^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d93c2d41a0aa2e0778ee0815ad2f013a6784bd3b;p=platform%2Fframework%2Fweb%2Fwrt-plugins-common.git

Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

[Note] Rebase wrt-plugins-common

Conflicts:
	CMakeLists.txt
	packaging/wrt-plugins-common.spec
	src/dispatch-event/dispatch_event_support.cpp
	src/dispatch-event/dispatch_event_support.h
	src/js-overlay/js_function_manager.cpp
	src/plugin-loading/explorer.cpp
	src/plugin-loading/plugin_container_support.cpp
	src/plugin-loading/plugin_logic.cpp
	src/plugins-ipc-message/ipc_message_support.cpp
	src/plugins-ipc-message/ipc_message_support.h
	src/standards/W3C/Widget/JSPreferences.cpp
	src/standards/W3C/Widget/JSWidget.cpp
	src/standards/W3C/Widget/plugin_initializer.cpp

Change-Id: I3bdd5d14c3e48bee7431523c93048a31d4244139
---

d93c2d41a0aa2e0778ee0815ad2f013a6784bd3b
diff --cc packaging/wrt-plugins-common.spec
index 89ef703,2346b85..0ccceb3
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@@ -1,12 -1,12 +1,12 @@@
 -#git:framework/web/wrt-plugins-common
  Name:       wrt-plugins-common
 -Summary:    wrt-plugins common library
 +Summary:    WebRuntime common library
- Version:    0.3.86.2
+ Version:    0.3.112
  Release:    1
  Group:      Development/Libraries
 -License:    Apache License, Version 2.0
 +License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
 -
 +Source1001: 	wrt-plugins-common.manifest
 +URL:        https://review.tizen.org/git/?p=platform/framework/web/wrt-plugins-common.git;a=summary
  BuildRequires: cmake
  BuildRequires: pkgconfig(dpl-efl)
  BuildRequires: pkgconfig(wrt-plugins-types)
@@@ -20,8 -19,8 +19,9 @@@ BuildRequires: pkgconfig(libpcrecpp
  BuildRequires: pkgconfig(icu-i18n)
  BuildRequires: pkgconfig(libxml-2.0)
  BuildRequires: pkgconfig(cert-svc-vcore)
 +Requires(post):  /sbin/ldconfig
 +Requires(postun):  /sbin/ldconfig
+ BuildRequires: pkgconfig(wrt-commons-widget-interface-dao)
 -Requires:  ldconfig
  
  %description
  JavaScript plugins for WebRuntime
@@@ -44,12 -42,19 +44,17 @@@ cp %{SOURCE1001} 
  %endif
  
  %build
 +export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--hash-style=both"
+ %if 0%{?tizen_build_binary_release_type_eng}
+ export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
+ export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
+ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
+ %endif
  
 -export LDFLAGS+="-Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--hash-style=both"
 -
 -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}  \
 -        -DDPL_LOG="ON"                     \
 +%cmake . -DDPL_LOG="ON"                     \
          -DCMAKE_PROJECT_VERSION=%{version} \
          -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
 -        %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS}
 +	    %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS}
  make %{?jobs:-j%jobs}
  
  %install