From effa094f292c0a7c2069592d99cb7e5f40aab420 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Thu, 5 Mar 2015 21:35:44 +0900
Subject: [PATCH] Fix build error in X environment

Change-Id: I617a1011454c64d2bfc54e694e16cf0805909762
---
 CMakeLists.txt             | 21 ++++++++++++++-------
 packaging/ise-default.spec |  7 +++----
 src/option.cpp             |  2 ++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3bb010..ad93a0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(ise-default)
 
-SET(ISE_SRCS
+SET(BASIC_ISE_SRCS
     src/main.cpp
     src/common.cpp
     src/ise.cpp
@@ -12,14 +12,18 @@ SET(ISE_SRCS
     src/sdk/ise_lang_table.cpp
     src/sdk/sdk.cpp
     src/sdk/sdk_option.cpp
-    src/input-method-protocol.c
-
     src/candidate/candidate-factory.cpp
     src/candidate/candidate.cpp
     src/candidate/efl/candidate-efl.cpp
     src/candidate/efl/candidate-multiline-efl.cpp
 )
 
+IF (with_wayland)
+    SET(ISE_SRCS ${BASIC_ISE_SRCS} src/input-method-protocol.c)
+ELSE (with_wayland)
+    SET(ISE_SRCS ${BASIC_ISE_SRCS})
+ENDIF (with_wayland)
+
 SET(ISE_PACKAGE ${PROJECT_NAME})
 SET(ISE_PKGNAME ${PACKAGE})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -40,7 +44,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/include
 )
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(ISE_PKGS REQUIRED
+SET(PKGS_CHECK_MODULES
         elementary
         efl-extension
         dlog
@@ -49,10 +53,14 @@ pkg_check_modules(ISE_PKGS REQUIRED
         isf
         vconf
         libxml-2.0
-        ecore-wayland
-        wayland-client
         )
 
+IF (with_wayland)
+    pkg_check_modules(ISE_PKGS REQUIRED ${PKGS_CHECK_MODULES} ecore-wayland wayland-client)
+ELSE (with_wayland)
+    pkg_check_modules(ISE_PKGS REQUIRED ${PKGS_CHECK_MODULES})
+ENDIF (with_wayland)
+
 FOREACH(flag ${ISE_PKGS_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
@@ -65,7 +73,6 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g")
 ADD_DEFINITIONS("-DPACKAGE=\"${ISE_PACKAGE}\"")
 ADD_DEFINITIONS("-DPACKAGE_NAME=\"${ISE_PKGNAME}\"")
 
-#ADD_EXECUTABLE(${PROJECT_NAME} ${ISE_SRCS})
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${ISE_SRCS})
 
 # For edc File
diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index 22a09cf..7df752c 100644
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -41,6 +41,9 @@ Description: Tizen keyboard
 
 
 %build
+rm -rf CMakeFiles
+rm -rf CMakeCache.txt
+
 export CFLAGS+=" -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS+=" -DTIZEN_DEBUG_ENABLE"
 export FFLAGS+=" -DTIZEN_DEBUG_ENABLE"
@@ -75,10 +78,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 %make_install
 
-%post
-
-%postun
-
 %files 
 %defattr(-,root,root,-)
 %{_libdir}/scim-1.0/1.4.0/Helper/ise-default.so
diff --git a/src/option.cpp b/src/option.cpp
index 562301e..c359ecc 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -833,7 +833,9 @@ set_transient_for_app_window(Evas_Object *window)
 void
 open_option_window(Evas_Object *parent, sclint degree)
 {
+#ifdef WAYLAND
     ise_pause();
+#endif
     read_ise_config_values();
 
     /* To make sure there is no temporary language in the enabled language list */
-- 
2.7.4