From bcd54391e61a4dc57638731c1ede556a037baae6 Mon Sep 17 00:00:00 2001 From: Michal Szczecinski Date: Tue, 8 Dec 2015 13:27:53 +0100 Subject: [PATCH] Adjust the code to the TM-1 device. Change-Id: I36775e38ab117cbe9db61aefb6568cb84aa1266c --- CMakeLists.txt | 3 ++- org.tizen.homescreen-efl.efl | 23 ----------------------- org.tizen.homescreen-efl.manifest | 22 +++++++++++----------- org.tizen.homescreen-efl.xml | 5 +++-- packaging/org.tizen.homescreen-efl.spec | 28 +++++++++++++--------------- res/edje/home.edc | 4 ++-- 6 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 org.tizen.homescreen-efl.efl diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f97c4a..8c1d276 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,8 @@ ADD_SUBDIRECTORY(res) CONFIGURE_FILE(${PACKAGE_NAME}.xml ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml) INSTALL(FILES ${CMAKE_BINARY_DIR}/org.tizen.homescreen-efl.xml DESTINATION ${MANIFESTDIR}) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.efl DESTINATION /etc/smack/accesses.d) INSTALL(DIRECTORY DESTINATION ${PREFIX}/data) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/shared/res/homescreen-efl.png DESTINATION /usr/share/icons/default/small) + # End of a file diff --git a/org.tizen.homescreen-efl.efl b/org.tizen.homescreen-efl.efl deleted file mode 100644 index 4a189dd..0000000 --- a/org.tizen.homescreen-efl.efl +++ /dev/null @@ -1,23 +0,0 @@ -org.tizen.homescreen-efl data-provider-master::db rwx--l ------ -org.tizen.homescreen-efl data-provider-master::share rwxat- ------ -org.tizen.homescreen-efl data-provider-master::data rwx--- ------ -org.tizen.homescreen-efl tizen::vconf::system rwxatl ------ -org.tizen.homescreen-efl syspopup::db r-----l ------ -org.tizen.homescreen-efl device::app_logging rw---- ------ -org.tizen.homescreen-efl rua::db rw---- ------ -org.tizen.homescreen-efl badge::db rw---- ------ -org.tizen.homescreen-efl e17 rwx--- ------ -org.tizen.homescreen-efl dlogutil r-x--- ------ -org.tizen.homescreen-efl data-provider-master::shortcut rw---- ------ -org.tizen.homescreen-efl data-provider-master::shortcut.shortcut -w---- ------ -org.tizen.homescreen-efl data-provider-master::shortcut.widget -w---- ------ -org.tizen.homescreen-efl data-provider-master::client rw---- ------ -org.tizen.homescreen-efl data-provider-master rw---- ------ -org.tizen.homescreen-efl shortcut-service::db r----l ------ -org.tizen.homescreen-efl org.tizen.setting::default-resources r-x--- ------ -org.tizen.homescreen-efl xorg rw---- ------ -org.tizen.homescreen-efl tizen::vconf::display r----l ------ -org.tizen.homescreen-efl data-provider-master::fd rw---- ------ -org.tizen.homescreen-efl org.tizen.contacts rwx--- ------ -org.tizen.homescreen-efl org.tizen.wallpaper-ui-service r----- ------ - diff --git a/org.tizen.homescreen-efl.manifest b/org.tizen.homescreen-efl.manifest index 45de7db..2396a37 100644 --- a/org.tizen.homescreen-efl.manifest +++ b/org.tizen.homescreen-efl.manifest @@ -1,12 +1,12 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/org.tizen.homescreen-efl.xml b/org.tizen.homescreen-efl.xml index 9788be4..3e69be1 100644 --- a/org.tizen.homescreen-efl.xml +++ b/org.tizen.homescreen-efl.xml @@ -1,12 +1,13 @@ - + Michal Szczecinski Homescreen Application - /usr/share/icons/default/small/org.tizen.menu-screen.png + /usr/share/icons/default/small/homescreen-efl.png + http://tizen.org/privilege/shortcut diff --git a/packaging/org.tizen.homescreen-efl.spec b/packaging/org.tizen.homescreen-efl.spec index e170de9..2e3e7ea 100644 --- a/packaging/org.tizen.homescreen-efl.spec +++ b/packaging/org.tizen.homescreen-efl.spec @@ -1,10 +1,8 @@ -%define _optdir /opt - -%define _appdir /opt/usr/apps +%define _appdir /usr/apps %define _packagedir %{_appdir}/%{_package_name} Name: org.tizen.homescreen-efl -Summary: Homescreen +Summary: Homescreen-Efl Version: 0.0.1 Release: 0.1 Group: TO_BE/FILLED_IN @@ -52,10 +50,14 @@ Tizen Homescreen %setup -q %build -%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" +%if 0%{?sec_build_binary_debug_enable} +export CFLAGS="${CFLAGS} -DTIZEN_DEBUG_ENABLE" +export CXXFLAGS="${CXXFLAGS} -DTIZEN_DEBUG_ENABLE" +export FFLAGS="${FFLAGS} -DTIZEN_DEBUG_ENABLE" +%endif + +%ifarch %{arm} +CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon" %endif %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} @@ -66,7 +68,7 @@ make %{?jobs:-j%jobs} %make_install %define tizen_sign 1 %define tizen_sign_base %{_packagedir} -%define tizen_sign_level platform +%define tizen_sign_level public %define tizen_author_sign 1 %define tizen_dist_sign 1 mkdir -p %{buildroot}%{_datadir} @@ -74,21 +76,17 @@ mkdir -p %{buildroot}/usr/share/license cp LICENSE %{buildroot}/usr/share/license/homescreen-efl %post -killall -9 homescreen-efl -dlogutil -c -#/usr/bin/signing-client/hash-signer-client.sh -a -d -p platform %{_packagedir} %files %manifest %{name}.manifest %defattr(-,root,root,-) - /usr/apps/%{name}/bin/homescreen-efl /usr/apps/%{name}/res/edje/*.edj /usr/apps/%{name}/res/images/*.png /usr/apps/%{name}/res/images/livebox/*.png /usr/apps/%{name}/res/locale/*/*/*.mo +/usr/share/icons/default/small/homescreen-efl.png %{_datadir}/packages/%{name}.xml -%{_sysconfdir}/smack/accesses.d/*.efl %dir /usr/apps/%{name}/data %attr(777, root, root) /usr/apps/%{name}/data -/usr/share/license/homescreen-efl \ No newline at end of file +/usr/share/license/homescreen-efl diff --git a/res/edje/home.edc b/res/edje/home.edc index 551c58c..02acd2d 100644 --- a/res/edje/home.edc +++ b/res/edje/home.edc @@ -40,8 +40,8 @@ collections { * This is temporary fix due to strange elm_box bechaviour in the index swallow. * Box has dynamic size which affects whole layout. */ - min: 1440 2560; - max: 1440 2560; + min: 720 1280; + max: 720 1280; } } part { -- 2.7.4