Support GBS build

Change-Id: I5655229e5b9e51de6ffb626baa03cff951f562c4
Signed-off-by: Amritanshu <a.pandia1@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1f5f30b39dba38f271b9d8193801b89c1fe9b85..a1f70e4f8c5bb3c105566e2a2e671fa6560dbc7f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,13 +132,14 @@ pkg_check_modules(pkgs REQUIRED
        dpm
        efl-extension
        appcore-efl
+       voice-control
 )
 
 FOREACH(flag ${pkgs_CFLAGS} ${x11_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -g -O2 -fpie -Werror")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -g -O2 -fpie")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
@@ -159,6 +160,12 @@ ADD_DEFINITIONS("-DQP_ANIMATED_IMAGE_ENABLE")
 ADD_DEFINITIONS("-DQP_REMINDER_ENABLE")
 #ADD_DEFINITIONS("-DQP_EMERGENCY_MODE_ENABLE")
 ADD_DEFINITIONS("-DQP_VOICE_CONTROL_ENABLE")
+ADD_DEFINITIONS("-DENABLE_QUICK_BUTTON_WIFI")
+ADD_DEFINITIONS("-DENABLE_QUICK_BUTTON_BLUETOOTH")
+ADD_DEFINITIONS("-DENABLE_QUICK_BUTTON_SOUND")
+ADD_DEFINITIONS("-DENABLE_QUICK_BUTTON_DND")
+ADD_DEFINITIONS("-DENABLE_QUICK_BUTTON_VC")
+ADD_DEFINITIONS("-DENABLE_QUICK_BUTTON_SOFTKEY")
 
 ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
 ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"")
@@ -218,12 +225,24 @@ ADD_CUSTOM_TARGET(quickpanel_theme.edj
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} quickpanel_theme.edj)
 
+ADD_CUSTOM_TARGET(color_classes.edj
+               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/res/images_icon -id ${CMAKE_CURRENT_SOURCE_DIR}/res/images "${EDJEFLAGS}"
+               ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/color_classes.edc
+               ${CMAKE_CURRENT_BINARY_DIR}/color_classes.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/color_classes.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} color_classes.edj)
+
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/quickpanel.edj DESTINATION ${EDJ_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/quickpanel_activenoti.edj DESTINATION ${EDJ_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/quickpanel_voice_control.edj DESTINATION ${EDJ_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/quickpanel_theme.edj DESTINATION ${EDJ_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/color_classes.edj DESTINATION ${EDJ_DIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/icons DESTINATION ${RES_DIR} FILES_MATCHING PATTERN "*.png")
 
+# install images
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images DESTINATION ${RES_DIR} FILES_MATCHING PATTERN "*.png")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images_icon DESTINATION ${RES_DIR} FILES_MATCHING PATTERN "*.png")
 
 CONFIGURE_FILE(${PROJECT_NAME}.xml ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.${PROJECT_NAME}.xml)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.${PROJECT_NAME}.xml DESTINATION ${MANIFESTXMLDIR})

diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec
index 43b439229b7815229140dab5d66501e655825055..3f92e71b8520cce0997d96a0525e8af1529db47e 100755 (executable)
--- a/packaging/org.tizen.quickpanel.spec
+++ b/packaging/org.tizen.quickpanel.spec
@@ -2,9 +2,9 @@
 %define __usrdir /usr/lib/systemd/user
 %define alias org.tizen.quickpanel
 
-Name: org.tizen.quickpanel-profile_mobile
+Name: org.tizen.quickpanel_common
 Summary: Quick access panel for the notifications and various kinds of services.
-Version: 0.8.0
+Version: 1.0.0
 Release: 1
 Group: Applications/Core Applications
 License: Apache-2.0 
@@ -54,6 +54,7 @@ BuildRequires: pkgconfig(capi-appfw-preference)
 BuildRequires: pkgconfig(dpm)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(voice-control)
 BuildRequires: gettext-tools
 BuildRequires: cmake
 BuildRequires: edje-tools

diff --git a/src/device/volume.c b/src/device/volume.c
index db316b4f8d6c3c40e5ef47174a51dcf3f0c0f384..81557e7d6f9d9c18774a437104e149b716ba44bf 100755 (executable)
--- a/src/device/volume.c
+++ b/src/device/volume.c
@@ -594,7 +594,7 @@ static Evas_Object *_volume_view_create(Evas_Object *list)
 static void _volume_set_image(double level)
 {
        int mapped_level;
-       DBG("******_volume_set_image level = %d *********",level);
+       DBG("******_volume_set_image level = %lf *********",level);
        if (!g_ctrl_obj) {
                ERR("Ctrl Obj is not defined");
                return;

diff --git a/src/minictrl/minictrl.c b/src/minictrl/minictrl.c
index ef6017701c0e11efeb228f2cc321c52078016b14..1eeae8129a4dea8b52261f4dce6bd2810ae1d915 100755 (executable)
--- a/src/minictrl/minictrl.c
+++ b/src/minictrl/minictrl.c
@@ -704,7 +704,7 @@ static void _mctrl_viewer_event_cb(minicontrol_event_e event, const char *name,
                case MINICONTROL_EVENT_START:
                        ret = bundle_get_byte(event_arg, MINICONTROL_BUNDLE_KEY_WIDTH, (void **)&width, &bundle_size);
                        if (ret != BUNDLE_ERROR_NONE || bundle_size != sizeof(int)) {
-                               ERR("Failed to get bundle value(width) %d : %d", ret, bundle_size);
+                               ERR("Failed to get bundle value(width) %d : %zu", ret, bundle_size);
                                _width = 0;
                        }