tizen 2.3.1 release

diff --git a/.gitignore b/.gitignore
new file mode 100755 (executable)
index 0000000..6c53821
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+build_log
+*.log
+*.pyc
+usr
+opt
+*.o
+*.os
+*.exe
+packages
+binaries
+*.ipk
+*~

diff --git a/COPYING b/COPYING
index 2a5d777..825c425 100755 (executable)
--- a/COPYING
+++ b/COPYING
@@ -5,6 +5,7 @@ Copyright © 2005 Patrick Lam
 Copyright © 2009 Roozbeh Pournader
 Copyright © 2008,2009 Red Hat, Inc.
 Copyright © 2008 Danilo Šegan
 Copyright © 2009 Roozbeh Pournader
 Copyright © 2008,2009 Red Hat, Inc.
 Copyright © 2008 Danilo Šegan

+Copyright © 2010,2011,2012,2013,2014 Samsung Electronics Co., Ltd.

 
 
 Permission to use, copy, modify, distribute, and sell this software and its
 
 
 Permission to use, copy, modify, distribute, and sell this software and its

diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf
index d6e18a3..931384c 100755 (executable)
--- a/conf.d/60-latin.conf
+++ b/conf.d/60-latin.conf
@@ -11,6 +11,7 @@
                        <family>Luxi Serif</family>
                        <family>Nimbus Roman No9 L</family>
                        <family>Times</family>
                        <family>Luxi Serif</family>
                        <family>Nimbus Roman No9 L</family>
                        <family>Times</family>

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
        <alias>
                </prefer>
        </alias>
        <alias>


@@ -28,6 +29,7 @@
                        <family>Lucida Sans Unicode</family>
                        <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
                        <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
                        <family>Lucida Sans Unicode</family>
                        <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
                        <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
        <alias>
                </prefer>
        </alias>
        <alias>


@@ -42,6 +44,7 @@
                        <family>Luxi Mono</family>
                        <family>Nimbus Mono L</family>
                        <family>Courier</family>
                        <family>Luxi Mono</family>
                        <family>Nimbus Mono L</family>
                        <family>Courier</family>

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
 <!--
                </prefer>
        </alias>
 <!--


@@ -54,6 +57,7 @@
                        <family>Copperplate Gothic Std</family>
                        <family>Cooper Std</family>
                        <family>Bauhaus Std</family>
                        <family>Copperplate Gothic Std</family>
                        <family>Cooper Std</family>
                        <family>Bauhaus Std</family>

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
 <!--
                </prefer>
        </alias>
 <!--


@@ -65,6 +69,7 @@
                        <family>ITC Zapf Chancery Std</family>
                        <family>Zapfino</family>
                        <family>Comic Sans MS</family>
                        <family>ITC Zapf Chancery Std</family>
                        <family>Zapfino</family>
                        <family>Comic Sans MS</family>

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
 
                </prefer>
        </alias>
 

diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index 6f114d3..da8d3bd 100755 (executable)
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -64,28 +64,28 @@
                        <family>Lohit Telugu</family>
                        <family>Lohit Oriya</family>
                        <family>LKLUG</family>
                        <family>Lohit Telugu</family>
                        <family>Lohit Oriya</family>
                        <family>LKLUG</family>

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
        <alias>
                <family>sans-serif</family>
                <prefer>
                </prefer>
        </alias>
        <alias>
                <family>sans-serif</family>
                <prefer>

-                       <family>SLPSans</family>
+                       <family>Samsung Sans</family>

                        <family>UDGothic</family>
                        <family>UDGothic</family>

-                       <family>SLPSansKorean</family>
-                       <family>SLPSansFallback</family>
-                       <family>SLPSansSinhala</family>
-                       <family>SLPSansPunjabi</family>
-                       <family>SLPSansKannada</family>
-                       <family>SLPSansBengal</family>
-                       <family>SLPSansGujarati</family>
-                       <family>SLPSansMalayalam</family>
-                       <family>SLPSansTamil</family>
-                       <family>SLPSansTelugu</family>
-                       <family>SLPSansHindi</family>
-                       <family>SLPSansOriya</family>
-                       <family>SLPSansThai</family>
-                       <family>SLPSansHebrew</family>
-                       <family>SLPSansArabic</family>
+                       <family>TizenSansKorean</family>
+                        <family>FZLTH_YS</family>
+                       <family>Samsung Sans Fallback</family>
+                       <family>TizenSansSinhala</family>
+                       <family>TizenSansPunjabi</family>
+                       <family>TizenSansKannada</family>
+                       <family>TizenSansBengal</family>
+                       <family>TizenSansGujarati</family>
+                       <family>TizenSansMalayalam</family>
+                       <family>TizenSansTamil</family>
+                       <family>TizenSansTelugu</family>
+                       <family>TizenSansHindi</family>
+                       <family>TizenSansOriya</family>
+                       <family>TizenSansArabic</family>

                        <family>Nachlieli</family> <!-- hebrew -->
                        <family>Lucida Sans Unicode</family>
                        <family>Yudit Unicode</family>
                        <family>Nachlieli</family> <!-- hebrew -->
                        <family>Lucida Sans Unicode</family>
                        <family>Yudit Unicode</family>


@@ -210,6 +210,7 @@
                        <family>Lohit Telugu</family>
                        <family>Lohit Oriya</family>
                        <family>LKLUG</family>
                        <family>Lohit Telugu</family>
                        <family>Lohit Oriya</family>
                        <family>LKLUG</family>

+                        <family>keitaiemoji</family>

                </prefer>
        </alias>
 </fontconfig>
                </prefer>
        </alias>
 </fontconfig>

diff --git a/debian/changelog b/debian/changelog
index 9a45f68..68664dc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+fontconfig (2.9.0-slp2+8) unstable; urgency=low
+
+  * Fix  dependency of freetype version
+  * Git: framework/graphics/fontconfig
+  * Tag: fontconfig_2.9.0-slp2+8
+
+ -- Seongwon Cho <seongwon1.cho@samsung.com>  Mon, 15 Oct 2012 13:31:21 +0900
+
+fontconfig (2.9.0-slp2+7) unstable; urgency=low
+
+  * install license file
+  * Git: framework/graphics/fontconfig
+  * Tag: fontconfig_2.9.0-slp2+7
+
+ -- Seongwon Cho <seongwon1.cho@samsung.com>  Thu, 11 Oct 2012 11:30:51 +0900
+

 fontconfig (2.9.0-slp2+1) unstable; urgency=low
 
   * fontconfig version upgrade from 2.6.0 to 2.9.0
 fontconfig (2.9.0-slp2+1) unstable; urgency=low
 
   * fontconfig version upgrade from 2.6.0 to 2.9.0

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index b647c3f..7c5d99e 100755 (executable)
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -49,6 +49,9 @@ endif
 EXTRA_DIST=fc-cache.sgml $(BUILT_MANS)
 
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-cache.sgml $(BUILT_MANS)
 
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_cache_LDFLAGS = -pie
+fc_cache_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 6bc6168..5dc6c3f 100755 (executable)
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -40,6 +40,9 @@ endif
 EXTRA_DIST=fc-cat.sgml ${BUILT_MANS}
 
 fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-cat.sgml ${BUILT_MANS}
 
 fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_cat_LDFLAGS = -pie
+fc_cat_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index fb87b50..9dca651 100755 (executable)
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -40,6 +40,9 @@ endif
 EXTRA_DIST=fc-list.sgml $(BUILT_MANS)
 
 fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-list.sgml $(BUILT_MANS)
 
 fc_list_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_list_LDFLAGS = -pie
+fc_list_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
index 3bdff6d..8477dea 100755 (executable)
--- a/fc-match/Makefile.am
+++ b/fc-match/Makefile.am
@@ -40,6 +40,9 @@ endif
 EXTRA_DIST=fc-match.sgml $(BUILT_MANS)
 
 fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-match.sgml $(BUILT_MANS)
 
 fc_match_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_match_LDFLAGS = -pie
+fc_match_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am
index 085c1da..4f708f4 100644 (file)
--- a/fc-pattern/Makefile.am
+++ b/fc-pattern/Makefile.am
@@ -40,6 +40,9 @@ endif
 EXTRA_DIST=fc-pattern.sgml $(BUILT_MANS)
 
 fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-pattern.sgml $(BUILT_MANS)
 
 fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_pattern_LDFLAGS = -pie
+fc_pattern_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
index 31fced9..65365fe 100644 (file)
--- a/fc-query/Makefile.am
+++ b/fc-query/Makefile.am
@@ -40,6 +40,9 @@ endif
 EXTRA_DIST=fc-query.sgml $(BUILT_MANS)
 
 fc_query_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-query.sgml $(BUILT_MANS)
 
 fc_query_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_query_LDFLAGS = -pie
+fc_query_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am
index f36e8f4..05e4aac 100644 (file)
--- a/fc-scan/Makefile.am
+++ b/fc-scan/Makefile.am
@@ -40,6 +40,9 @@ endif
 EXTRA_DIST=fc-scan.sgml $(BUILT_MANS)
 
 fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la
 EXTRA_DIST=fc-scan.sgml $(BUILT_MANS)
 
 fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la

+### TIZEN_ONLY(20150404): Apply ASLR to executable files.
+fc_scan_LDFLAGS = -pie
+fc_scan_CFLAGS = -fPIE

 
 if USEDOCBOOK
 
 
 if USEDOCBOOK
 

diff --git a/packaging/fontconfig.manifest b/packaging/fontconfig.manifest
new file mode 100755 (executable)
index 0000000..3e5a688
--- /dev/null
+++ b/packaging/fontconfig.manifest
@@ -0,0 +1,14 @@
+<manifest>
+        <request>
+                <domain name="_"/>
+        </request>
+        <assign>
+                <filesystem path="/usr/bin/fc-cache" label="_" exec_label="none"/>
+                <filesystem path="/usr/bin/fc-list" label="_" exec_label="none"/>
+                <filesystem path="/usr/bin/fc-pattern" label="_" exec_label="none"/>
+                <filesystem path="/usr/bin/fc-scan" label="_" exec_label="none"/>
+                <filesystem path="/usr/bin/fc-cat" label="_" exec_label="none"/>
+                <filesystem path="/usr/bin/fc-match" label="_" exec_label="none"/>
+                <filesystem path="/usr/bin/fc-query" label="_" exec_label="none"/>
+        </assign>
+</manifest>

diff --git a/packaging/fontconfig.spec b/packaging/fontconfig.spec
old mode 100644 (file)
new mode 100755 (executable)
index 7882a99..74ae794
--- a/packaging/fontconfig.spec
+++ b/packaging/fontconfig.spec
@@ -4,14 +4,16 @@
 Name:       fontconfig
 Summary:    Font configuration and customization library
 Version:    2.9.0
 Name:       fontconfig
 Summary:    Font configuration and customization library
 Version:    2.9.0

-Release:    2
+Release:    8

 Group:      System/Libraries
 License:    MIT
 URL:        http://fontconfig.org
 Source0:    http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 Group:      System/Libraries
 License:    MIT
 URL:        http://fontconfig.org
 Source0:    http://fontconfig.org/release/fontconfig-%{version}.tar.gz

+Source1001: packaging/fontconfig.manifest

 Requires(pre): /usr/bin/fc-cache, /bin/mkdir /bin/rm, /bin/grep
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(pre): /usr/bin/fc-cache, /bin/mkdir /bin/rm, /bin/grep
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig

+Requires:    smack-utils

 BuildRequires:  pkgconfig(freetype2) >= %{freetype_version}
 BuildRequires:  gawk
 BuildRequires:  expat-devel
 BuildRequires:  pkgconfig(freetype2) >= %{freetype_version}
 BuildRequires:  gawk
 BuildRequires:  expat-devel


@@ -41,6 +43,7 @@ will use fontconfig.
 %setup -q -n %{name}-%{version}
 
 %build
 %setup -q -n %{name}-%{version}
 
 %build

+cp %{SOURCE1001} .

 # We don't want to rebuild the docs, but we want to install the included ones.
 export HASDOCBOOK=no
 
 # We don't want to rebuild the docs, but we want to install the included ones.
 export HASDOCBOOK=no
 


@@ -78,6 +81,8 @@ rm -rf %{buildroot}
 # All font packages depend on this package, so we create
 # and own /usr/share/fonts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts
 # All font packages depend on this package, so we create
 # and own /usr/share/fonts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts

+mkdir -p %{buildroot}/usr/share/license
+cat COPYING > %{buildroot}/usr/share/license/%{name}

 
 # Remove unpackaged files. no need when configure --disable-static
 #rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Remove unpackaged files. no need when configure --disable-static
 #rm $RPM_BUILD_ROOT%{_libdir}/*.la


@@ -92,6 +97,13 @@ mkdir -p /var/cache/fontconfig
 # Remove stale caches
 rm -f /var/cache/fontconfig/????????????????????????????????.cache-2
 rm -f /var/cache/fontconfig/stamp
 # Remove stale caches
 rm -f /var/cache/fontconfig/????????????????????????????????.cache-2
 rm -f /var/cache/fontconfig/stamp

+mkdir -p /opt/var/cache/fontconfig
+mkdir -p /usr/share/fonts
+mkdir -p /usr/share/fallback_fonts
+mkdir -p /usr/share/app_fonts
+chsmack -t /opt/var/cache/fontconfig
+chsmack -a "system::homedir" /opt/var/cache/fontconfig/*
+chsmack -a "system::homedir" /opt/var/cache/fontconfig

 
 # remove 49-sansserif.conf to fix bmc #9024
 #rm -rf /usr/%{_sysconfdir}/fonts/conf.d/49-sansserif.conf
 
 # remove 49-sansserif.conf to fix bmc #9024
 #rm -rf /usr/%{_sysconfdir}/fonts/conf.d/49-sansserif.conf


@@ -107,6 +119,7 @@ fi
 %postun -p /sbin/ldconfig
 
 %files
 %postun -p /sbin/ldconfig
 
 %files

+%manifest fontconfig.manifest

 %defattr(-,root,root,-)
 %defattr(-, root, root)
 %doc README AUTHORS COPYING
 %defattr(-,root,root,-)
 %defattr(-, root, root)
 %doc README AUTHORS COPYING


@@ -119,8 +132,10 @@ fi
 %config /usr/%{_sysconfdir}/fonts/conf.avail/*.conf
 %config(noreplace) /usr/%{_sysconfdir}/fonts/conf.d/*.conf
 %dir /var/cache/fontconfig
 %config /usr/%{_sysconfdir}/fonts/conf.avail/*.conf
 %config(noreplace) /usr/%{_sysconfdir}/fonts/conf.d/*.conf
 %dir /var/cache/fontconfig

+/usr/share/license/%{name}

 
 %files devel
 
 %files devel

+%manifest fontconfig.manifest

 %defattr(-,root,root,-)
 %defattr(-, root, root)
 %{_libdir}/libfontconfig.so
 %defattr(-,root,root,-)
 %defattr(-, root, root)
 %{_libdir}/libfontconfig.so