diff options
author | Jihoon Kim <jihoon48.kim@samsung.com> | 2017-01-24 10:24:20 +0900 |
---|---|---|
committer | Jihoon Kim <jihoon48.kim@samsung.com> | 2017-01-24 10:24:24 +0900 |
commit | 9b8f9ece606d187186c38c880b919d0e8a1acbfa (patch) | |
tree | ef752fed81089cfd8157da63dcec795ea772aae8 | |
parent | a3425f6b132ed4adc61e399a63280002a06062bb (diff) | |
parent | 08c65726f08ebec4efaf12cd049b3beb77e6e72d (diff) | |
download | ise-engine-default-accepted/tizen_3.0_common.tar.gz ise-engine-default-accepted/tizen_3.0_common.tar.bz2 ise-engine-default-accepted/tizen_3.0_common.zip |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20170124.013155accepted/tizen/3.0/wearable/20170124.043750accepted/tizen/3.0/tv/20170124.043740accepted/tizen/3.0/mobile/20170124.043726accepted/tizen/3.0/ivi/20170124.043800accepted/tizen/3.0/common/20170124.081425tizen_3.0_tvaccepted/tizen_3.0_iviaccepted/tizen_3.0_common
Change-Id: I23eb11196ef3d23d821dde0bcde11d41e53ff013
-rwxr-xr-x | ise-engine-default.xml | 2 | ||||
-rw-r--r-- | packaging/ise-engine-default.spec | 6 | ||||
-rw-r--r-- | src/isf_default_imengine.cpp | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/ise-engine-default.xml b/ise-engine-default.xml index c5828e4..fe647cc 100755 --- a/ise-engine-default.xml +++ b/ise-engine-default.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="2.3" package="ise-engine-default" version="1.0.6" install-location="internal-only"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="2.3" package="ise-engine-default" version="1.0.7" install-location="internal-only"> <author/> <description/> <label>Default keyboard</label> diff --git a/packaging/ise-engine-default.spec b/packaging/ise-engine-default.spec index d72780b..bf7981a 100644 --- a/packaging/ise-engine-default.spec +++ b/packaging/ise-engine-default.spec @@ -1,6 +1,6 @@ Name: ise-engine-default Summary: Multilingual Keyboard ISE -Version: 1.0.6 +Version: 1.0.7 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 @@ -15,8 +15,8 @@ it is based on Input Service Framework(ISF). %setup -q %build -export CFLAGS+=" -Werror" -export CXXFLAGS+=" -Werror" +export CFLAGS+=" -Werror -fvisibility=hidden" +export CXXFLAGS+=" -Werror -fvisibility=hidden -fvisibility-inlines-hidden" %autogen %configure --prefix=%{_prefix} --disable-static make %{?_smp_mflags} diff --git a/src/isf_default_imengine.cpp b/src/isf_default_imengine.cpp index f0445ab..db60ea5 100644 --- a/src/isf_default_imengine.cpp +++ b/src/isf_default_imengine.cpp @@ -29,6 +29,8 @@ #include <config.h> #endif +#define EXAPI __attribute__ ((visibility("default"))) + #include <scim.h> #include "kdb_resource.h" #include "isf_default_imengine.h" @@ -65,21 +67,21 @@ static ConfigPointer _scim_config(0); static int m_keypad_layout; extern "C" { - void scim_module_init(void) { + EXAPI void scim_module_init(void) { bindtextdomain(GETTEXT_PACKAGE, ISF_DEFAULT_LOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); } - void scim_module_exit(void) { + EXAPI void scim_module_exit(void) { _scim_config.reset(); } - uint32 scim_imengine_module_init(const ConfigPointer & config) { + EXAPI uint32 scim_imengine_module_init(const ConfigPointer & config) { _scim_config = config; return 1; } - IMEngineFactoryPointer scim_imengine_module_create_factory(uint32 + EXAPI IMEngineFactoryPointer scim_imengine_module_create_factory(uint32 engine) { DefaultFactory *factory = 0; |