Removed remaining references to glyph cache

Change-Id: I460099b1ea492139fd8cdc7581ac4eba97cf2ecb

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 8d8cffb..20ffdde 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -227,8 +227,6 @@ libdali_adaptor_la_includes += \
                       -I../../../adaptors/tizen
 endif
 
-daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/
-daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/
 daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
 daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
 

diff --git a/dali-adaptor.manifest-mobile b/dali-adaptor.manifest-mobile
index 4acf930..08561d6 100644 (file)
--- a/dali-adaptor.manifest-mobile
+++ b/dali-adaptor.manifest-mobile
@@ -1,7 +1,6 @@
 <manifest>
        <assign>
                <filesystem path="/usr/lib/*" label="_" />
-               <filesystem path="/opt/usr/share/dali/glyphcache" label="dali" type="transmutable" />
        </assign>
        <request>
                <domain name="dali"/>

diff --git a/dali-adaptor.manifest-tv b/dali-adaptor.manifest-tv
index 4acf930..08561d6 100644 (file)
--- a/dali-adaptor.manifest-tv
+++ b/dali-adaptor.manifest-tv
@@ -1,7 +1,6 @@
 <manifest>
        <assign>
                <filesystem path="/usr/lib/*" label="_" />
-               <filesystem path="/opt/usr/share/dali/glyphcache" label="dali" type="transmutable" />
        </assign>
        <request>
                <domain name="dali"/>

diff --git a/packaging/dali-adaptor-common.spec b/packaging/dali-adaptor-common.spec
index 1cfd5d3..ede9ecf 100644 (file)
--- a/packaging/dali-adaptor-common.spec
+++ b/packaging/dali-adaptor-common.spec
@@ -108,7 +108,6 @@ Dynamics plugin to wrap the libBulletDynamics libraries
 %setup -q
 %define dali_data_rw_dir         /usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
-%define user_font_cache_dir      %{dali_data_rw_dir}/glyphcache/
 %define user_shader_cache_dir    %{dali_data_rw_dir}/core/shaderbin/
 %define font_preloaded_path      /usr/share/fonts/
 %define font_downloaded_path     /opt/share/fonts/
@@ -178,7 +177,6 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{
 ##############################
 
 %pre
-rm -f %{user_font_cache_dir}/*
 rm -f %{user_shader_cache_dir}/*
 exit 0
 
@@ -187,7 +185,6 @@ exit 0
 ##############################
 %post
 /sbin/ldconfig
-chown 5000:5000 %{user_font_cache_dir}
 chown 5000:5000 %{user_shader_cache_dir}
 exit 0
 
@@ -207,7 +204,6 @@ exit 0
 #   Pre Uninstall old package
 ##############################
 %preun
-rm -f %{user_font_cache_dir}/*
 rm -f %{user_shader_cache_dir}/*
 exit 0
 
@@ -239,7 +235,6 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libdali-adap*.so*
 %defattr(-,app,app,-)
-%dir %{user_font_cache_dir}
 %dir %{user_shader_cache_dir}
 %{_bindir}/*
 %{_datadir}/license/%{name}

diff --git a/packaging/dali-adaptor-mobile.spec b/packaging/dali-adaptor-mobile.spec
index cdd69e9..481f455 100644 (file)
--- a/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@ -124,7 +124,6 @@ Dynamics plugin to wrap the libBulletDynamics libraries
 %setup -q
 %define dali_data_rw_dir         /opt/usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
-%define user_font_cache_dir      %{dali_data_rw_dir}/glyphcache/
 %define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define font_preloaded_path      /usr/share/fonts/
 %define font_downloaded_path     /opt/share/fonts/
@@ -202,7 +201,6 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{
 ##############################
 
 %pre
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -210,7 +208,6 @@ exit 0
 ##############################
 %post
 /sbin/ldconfig
-chown 5000:5000 %{user_font_cache_dir}
 exit 0
 
 %if 0%{?dali_feedback_plugin}
@@ -229,7 +226,6 @@ exit 0
 #   Pre Uninstall old package
 ##############################
 %preun
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -260,7 +256,6 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libdali-adap*.so*
 %defattr(-,app,app,-)
-%dir %{user_font_cache_dir}
 %dir %{user_shader_cache_dir}
 %{_bindir}/*
 %{_datadir}/license/%{name}

diff --git a/packaging/dali-adaptor-tv.spec b/packaging/dali-adaptor-tv.spec
index f945e55..19c5906 100644 (file)
--- a/packaging/dali-adaptor-tv.spec
+++ b/packaging/dali-adaptor-tv.spec
@@ -100,7 +100,6 @@ Dynamics plugin to wrap the libBulletDynamics libraries
 %setup -q
 %define dali_data_rw_dir         /usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
-%define user_font_cache_dir      %{dali_data_rw_dir}/glyphcache/
 %define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define font_preloaded_path      /usr/share/fonts/
 %define font_downloaded_path     /opt/share/fonts/
@@ -170,7 +169,6 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{
 ##############################
 
 %pre
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -178,7 +176,6 @@ exit 0
 ##############################
 %post
 /sbin/ldconfig
-chown 5000:5000 %{user_font_cache_dir}
 exit 0
 
 %if 0%{?dali_feedback_plugin}
@@ -197,7 +194,6 @@ exit 0
 #   Pre Uninstall old package
 ##############################
 %preun
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -229,7 +225,6 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libdali-adap*.so*
 %defattr(-,app,app,-)
-%dir %{user_font_cache_dir}
 %dir %{user_shader_cache_dir}
 %{_bindir}/*
 %{_datadir}/license/%{name}

diff --git a/packaging/dali-adaptor-wearable.spec b/packaging/dali-adaptor-wearable.spec
index e60d5fb..141dd39 100644 (file)
--- a/packaging/dali-adaptor-wearable.spec
+++ b/packaging/dali-adaptor-wearable.spec
@@ -89,7 +89,6 @@ Feedback plugin to play haptic and audio feedback for Dali
 %setup -q
 %define dali_data_rw_dir         /opt/usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
-%define user_font_cache_dir      %{dali_data_rw_dir}/glyphcache/
 %define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define font_preloaded_path      /usr/share/fonts/
 %define font_downloaded_path     /opt/share/fonts/
@@ -156,7 +155,6 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{
 ##############################
 
 %pre
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -164,7 +162,6 @@ exit 0
 ##############################
 %post
 /sbin/ldconfig
-chown 5000:5000 %{user_font_cache_dir}
 exit 0
 
 %if 0%{?dali_feedback_plugin}
@@ -177,7 +174,6 @@ exit 0
 #   Pre Uninstall old package
 ##############################
 %preun
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -202,7 +198,6 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libdali-adap*.so*
 %defattr(-,app,app,-)
-%dir %{user_font_cache_dir}
 %dir %{user_shader_cache_dir}
 %{_bindir}/*
 %{_datadir}/license/%{name}

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index e9ce478..4438446 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -162,7 +162,6 @@ Dynamics plugin to wrap the libBulletDynamics libraries
 %setup -q
 %define dali_data_rw_dir         /usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
-%define user_font_cache_dir      %{dali_data_rw_dir}/glyphcache/
 %define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define font_preloaded_path      /usr/share/fonts/
 %define font_downloaded_path     /opt/share/fonts/
@@ -240,7 +239,6 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{
 ##############################
 
 %pre
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -248,7 +246,6 @@ exit 0
 ##############################
 %post
 /sbin/ldconfig
-chown 5000:5000 %{user_font_cache_dir}
 exit 0
 
 %if 0%{?dali_feedback_plugin}
@@ -267,7 +264,6 @@ exit 0
 #   Pre Uninstall old package
 ##############################
 %preun
-rm -f %{user_font_cache_dir}/*
 exit 0
 
 ##############################
@@ -298,7 +294,6 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libdali-adap*.so*
 %defattr(-,app,app,-)
-%dir %{user_font_cache_dir}
 %dir %{user_shader_cache_dir}
 %{_bindir}/*
 %{_datadir}/license/%{name}