[maemo-commits] [maemo-commits] r18588 - in projects/haf/trunk/fontconfig: . debian

Wed Jun 3 16:47:39 EEST 2009

Author: risun
Date: 2009-06-03 16:47:22 +0300 (Wed, 03 Jun 2009)
New Revision: 18588

Added:
   projects/haf/trunk/fontconfig/fontconfig-2.6.0.tar.gz
Removed:
   projects/haf/trunk/fontconfig/fontconfig-2.4.1.tar.gz
Modified:
   projects/haf/trunk/fontconfig/debian/changelog
   projects/haf/trunk/fontconfig/debian/control
   projects/haf/trunk/fontconfig/debian/rules
   projects/haf/trunk/fontconfig/fontconfig-lessfloat.patch
   projects/haf/trunk/fontconfig/fontconfig-monotype-nohint.patch
   projects/haf/trunk/fontconfig/fontconfig-optimize_config.patch
Log:
sync with upstream 2.6.0

Modified: projects/haf/trunk/fontconfig/debian/changelog
===================================================================

--- projects/haf/trunk/fontconfig/debian/changelog	2009-06-03 13:34:58 UTC (rev 18587)
+++ projects/haf/trunk/fontconfig/debian/changelog	2009-06-03 13:47:22 UTC (rev 18588)
@@ -1,3 +1,9 @@
+fontconfig (2.6.0-1osso1) unstable; urgency=low
+
+  * Updated: sync with upstream 2.6.0
+
+ -- Richard Sun <richard.sun at nokia.com>  Wed,  3 Jun 2009 15:53:31 +0300
+
 fontconfig (2.4.1-1osso5) unstable; urgency=low
 
   * Fixes: NB#70068

Modified: projects/haf/trunk/fontconfig/debian/control
===================================================================
--- projects/haf/trunk/fontconfig/debian/control	2009-06-03 13:34:58 UTC (rev 18587)
+++ projects/haf/trunk/fontconfig/debian/control	2009-06-03 13:47:22 UTC (rev 18588)
@@ -1,7 +1,7 @@
 Source: fontconfig
 Section: devel
 Priority: optional
-Maintainer:  Jakub Pavelek <jakub.pavelek at nokia.com>
+Maintainer:  Richard Sun <richard.sun at nokia.com>
 Build-Depends: zlib1g-dev, libfreetype6-dev, libexpat1-dev, tar (>= 0.1), gzip (>=0.1)
 Standards-Version: 3.5.9
 

Modified: projects/haf/trunk/fontconfig/debian/rules
===================================================================
--- projects/haf/trunk/fontconfig/debian/rules	2009-06-03 13:34:58 UTC (rev 18587)
+++ projects/haf/trunk/fontconfig/debian/rules	2009-06-03 13:47:22 UTC (rev 18588)
@@ -2,7 +2,7 @@
 
 
 export DH_COMPAT=4
-PV = 2.4.1
+PV = 2.6.0
 
 SHELL = /bin/bash
 
@@ -38,7 +38,8 @@
 	patch -p0 < fontconfig-monotype-nohint.patch
 	#patch -p0 < fontconfig-newtimes-nohint.patch 28.9.06: Merged to optimize-config - patch would fail otherwise :(
 	cd fontconfig && patch -p0 < ../fontconfig-remove-i18n.patch
-	cd fontconfig && ./configure --prefix=/usr --sysconfdir=/etc
+	cd fontconfig && ./autogen.sh --prefix=/usr --sysconfdir=/etc
+	#./configure --prefix=/usr --sysconfdir=/etc
 	touch configure-stamp
 
 

Deleted: projects/haf/trunk/fontconfig/fontconfig-2.4.1.tar.gz
===================================================================
(Binary files differ)

Added: projects/haf/trunk/fontconfig/fontconfig-2.6.0.tar.gz
===================================================================
(Binary files differ)


Property changes on: projects/haf/trunk/fontconfig/fontconfig-2.6.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: projects/haf/trunk/fontconfig/fontconfig-lessfloat.patch
===================================================================
--- projects/haf/trunk/fontconfig/fontconfig-lessfloat.patch	2009-06-03 13:34:58 UTC (rev 18587)
+++ projects/haf/trunk/fontconfig/fontconfig-lessfloat.patch	2009-06-03 13:47:22 UTC (rev 18588)
@@ -20,19 +20,21 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 #
-diff -Naur fontconfig/src/fcmatch.c fontconfig-2.4.1-lessfloat/src/fcmatch.c
---- fontconfig/src/fcmatch.c	2006-09-28 14:51:45.000000000 +0300
-+++ fontconfig-2.4.1-lessfloat/src/fcmatch.c	2006-09-28 14:58:34.000000000 +0300
-@@ -27,30 +27,30 @@
+diff -Naur fontconfig/src/fcmatch.c fontconfig-2.6.0-lessfloat/src/fcmatch.c
+--- fontconfig/src/fcmatch.c	2008-06-01 05:24:35.000000000 +0300
++++ fontconfig-2.6.0-lessfloat/src/fcmatch.c	2009-06-03 16:32:33.000000000 +0300
+@@ -26,31 +26,32 @@
+ #include <string.h>
  #include <ctype.h>
  #include <stdio.h>
++#include <limits.h>
  
 -static double
-+static int 
++static int
  FcCompareNumber (FcValue *value1, FcValue *value2)
  {
 -    double  v1, v2, v;
-+    int v1, v2, v;
++    int  v1, v2, v;
      
      switch (value1->type) {
      case FcTypeInteger:
@@ -62,7 +64,7 @@
      }
      v = v2 - v1;
      if (v < 0)
-@@ -58,13 +58,13 @@
+@@ -58,13 +59,13 @@
      return v;
  }
  
@@ -79,7 +81,7 @@
  FcCompareFamily (FcValue *v1, FcValue *v2)
  {
      /* rely on the guarantee in FcPatternAddWithBinding that
-@@ -73,12 +73,12 @@
+@@ -73,12 +74,12 @@
      const FcChar8* v2_string = fc_value_string(v2);
  
      if (FcToLower(*v1_string) != FcToLower(*v2_string))
@@ -95,7 +97,7 @@
  FcCompareLang (FcValue *v1, FcValue *v2)
  {
      FcLangResult    result;
-@@ -95,7 +95,7 @@
+@@ -95,7 +96,7 @@
  				       value2.u.s);
  	    break;
  	default:
@@ -104,7 +106,7 @@
  	}
  	break;
      case FcTypeString:
-@@ -108,11 +108,11 @@
+@@ -108,11 +109,11 @@
  				    value2.u.s);
  	    break;
  	default:
@@ -118,7 +120,7 @@
      }
      switch (result) {
      case FcLangEqual:
-@@ -125,31 +125,31 @@
+@@ -125,31 +126,31 @@
      }
  }
  
@@ -158,7 +160,7 @@
  	break;
      default:
  	return -1;
-@@ -159,7 +159,7 @@
+@@ -159,7 +160,7 @@
  	v2 = value2->u.i;
  	break;
      case FcTypeDouble:
@@ -167,7 +169,7 @@
  	break;
      default:
  	return -1;
-@@ -174,7 +174,7 @@
+@@ -174,7 +175,7 @@
  
  typedef struct _FcMatcher {
      FcObject	    object;
@@ -176,16 +178,16 @@
      int		    strong, weak;
  } FcMatcher;
  
-@@ -303,7 +303,7 @@
+@@ -302,7 +303,7 @@
  		    FcResult	*result)
  {
      FcValueListPtr  v1, v2;
 -    double    	    v, best, bestStrong, bestWeak;
-+    int    	    v, best, bestStrong, bestWeak;
++    int   	    v, best, bestStrong, bestWeak;
      int		    j;
      FcMatcher       *match = FcObjectToMatcher(object);
  
-@@ -314,9 +314,9 @@
+@@ -313,9 +314,9 @@
  	return FcTrue;
      }
  
@@ -198,7 +200,7 @@
      j = 0;
      for (v1 = v1orig; v1; v1 = FcValueListNext(v1))
      {
-@@ -350,7 +350,7 @@
+@@ -349,7 +350,7 @@
      }
      if (FcDebug () & FC_DBG_MATCHV)
      {

Modified: projects/haf/trunk/fontconfig/fontconfig-monotype-nohint.patch
===================================================================
--- projects/haf/trunk/fontconfig/fontconfig-monotype-nohint.patch	2009-06-03 13:34:58 UTC (rev 18587)
+++ projects/haf/trunk/fontconfig/fontconfig-monotype-nohint.patch	2009-06-03 13:47:22 UTC (rev 18588)
@@ -1,17 +1,16 @@
-diff -Naur fontconfig/conf.d/65-nonlatin.conf fontconfig-2.4.1-monotype-nohint/conf.d/65-nonlatin.conf
---- fontconfig/conf.d/65-nonlatin.conf	2006-09-10 06:31:22.000000000 +0300
-+++ fontconfig-2.4.1-monotype-nohint/conf.d/65-nonlatin.conf	2008-02-12 13:48:55.000000000 +0200
-@@ -35,4 +35,13 @@
- 			<family>Baekmuk Dotum</family>
+--- fontconfig/conf.d/65-nonlatin.conf	2008-06-01 05:24:35.000000000 +0300
++++ fontconfig-2.6.0-monotype-nohint/conf.d/65-nonlatin.conf	2009-06-03 15:17:24.000000000 +0300
+@@ -162,4 +162,13 @@
+  			<family>LKLUG</family>
  		</prefer>
  	</alias>
-+
-+	<!-- Disable the hinting for monotype font -->
-+	<match target="font">
++	
++        <!-- Disable the hinting for monotype font -->
++        <match target="font">
 +		<test name="family">
 +			<string>MHeiGB18030C-Medium</string>
 +		</test>
 +		<edit name="hinting"><bool>false</bool></edit>
 +	</match>
-+		
++								
  </fontconfig>

Modified: projects/haf/trunk/fontconfig/fontconfig-optimize_config.patch
===================================================================
--- projects/haf/trunk/fontconfig/fontconfig-optimize_config.patch	2009-06-03 13:34:58 UTC (rev 18587)
+++ projects/haf/trunk/fontconfig/fontconfig-optimize_config.patch	2009-06-03 13:47:22 UTC (rev 18588)
@@ -1,35 +1,6 @@
-diff -Naur fontconfig/conf.d/40-generic.conf fontconfig-2.4.1-optimize-config/conf.d/40-generic.conf
---- fontconfig/conf.d/40-generic.conf	2006-09-10 06:33:43.000000000 +0300
-+++ fontconfig-2.4.1-optimize-config/conf.d/40-generic.conf	2006-09-28 16:44:39.000000000 +0300
-@@ -10,6 +10,7 @@
-   Serif faces
-  -->
- 	<alias>
-+	 	<family>NewTimes</family>
- 		<family>Bitstream Vera Serif</family>
- 		<family>DejaVu Serif</family>
- 		<family>Times New Roman</family>
-@@ -29,6 +30,8 @@
-   Sans-serif faces
-  -->
- 	<alias>
-+	 	<family>SwissA</family>
-+		<family>Nokia Sans</family>
- 		<family>Bitstream Vera Sans</family>
- 		<family>DejaVu Sans</family>
- 		<family>Helvetica</family>
-@@ -50,7 +53,8 @@
- <!--
-   Monospace faces
-  -->
-- 	<alias>
-+	<alias>
-+		<family>NewCourier</family> 
- 		<family>Bitstream Vera Sans Mono</family>
- 		<family>DejaVu Sans Mono</family>
- 		<family>Courier</family>
---- fontconfig/conf.d/20-newtimes-nohint.conf   1970-01-01 02:00:00.000000000 +0200
-+++ fontconfig-2.4.1-newtimes-nohint/conf.d/20-newtimes-nohint.conf     2006-09-28 16:38:32.000000000 +0300
+diff -Naur fontconfig/conf.d/21-newtimes-nohint.conf fontconfig-2.6.0-optimize-config/conf.d/21-newtimes-nohint.conf
+--- fontconfig/conf.d/21-newtimes-nohint.conf	1970-01-01 02:00:00.000000000 +0200
++++ fontconfig-2.6.0-optimize-config/conf.d/21-newtimes-nohint.conf	2009-06-03 15:36:40.000000000 +0300
 @@ -0,0 +1,18 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
@@ -49,9 +20,43 @@
 +       </match>
 +
 +</fontconfig>
-diff -Naur fontconfig/conf.d/60-latin.conf fontconfig-2.4.1-optimize-config/conf.d/60-latin.conf
---- fontconfig/conf.d/60-latin.conf	2006-09-10 06:30:00.000000000 +0300
-+++ fontconfig-2.4.1-optimize-config/conf.d/60-latin.conf	2006-09-28 16:44:39.000000000 +0300
+diff -Naur fontconfig/conf.d/45-latin.conf fontconfig-2.6.0-optimize-config/conf.d/45-latin.conf
+--- fontconfig/conf.d/45-latin.conf	2008-06-01 05:24:35.000000000 +0300
++++ fontconfig-2.6.0-optimize-config/conf.d/45-latin.conf	2009-06-03 15:48:35.000000000 +0300
+@@ -9,7 +9,8 @@
+ <!--
+   Serif faces
+  -->
+-	<alias>
++ 	<alias>
++		<family>NewTimes</family> 
+ 		<family>Bitstream Vera Serif</family>
+ 		<family>DejaVu Serif</family>
+ 		<family>Liberation Serif</family>
+@@ -24,7 +25,9 @@
+ <!--
+   Sans-serif faces
+  -->
+-	<alias>
++ 	<alias>
++		<family>SwissA</family>
++	        <family>Nokia Sans</family>	
+ 		<family>Bitstream Vera Sans</family>
+ 		<family>DejaVu Sans</family>
+ 		<family>Liberation Sans</family>
+@@ -40,7 +43,8 @@
+ <!--
+   Monospace faces
+  -->
+- 	<alias>
++	<alias>
++		<family>NewCourier</family> 
+ 		<family>Bitstream Vera Sans Mono</family>
+ 		<family>DejaVu Sans Mono</family>
+ 		<family>Liberation Mono</family>
+diff -Naur fontconfig/conf.d/60-latin.conf fontconfig-2.6.0-optimize-config/conf.d/60-latin.conf
+--- fontconfig/conf.d/60-latin.conf	2008-06-01 05:24:35.000000000 +0300
++++ fontconfig-2.6.0-optimize-config/conf.d/60-latin.conf	2009-06-03 15:39:11.000000000 +0300
 @@ -4,6 +4,7 @@
  	<alias>
  		<family>serif</family>
@@ -69,7 +74,7 @@
  			<family>Bitstream Vera Sans</family>
  			<family>DejaVu Sans</family>
  			<family>Verdana</family>
-@@ -29,6 +32,7 @@
+@@ -32,6 +35,7 @@
  	<alias>
  		<family>monospace</family>
  		<prefer>
@@ -77,25 +82,26 @@
  			<family>Bitstream Vera Sans Mono</family>
  			<family>DejaVu Sans Mono</family>
  			<family>Andale Mono</family>
-diff -Naur fontconfig/conf.d/Makefile.am fontconfig-2.4.1-optimize-config/conf.d/Makefile.am
---- fontconfig/conf.d/Makefile.am	2006-09-10 07:07:07.000000000 +0300
-+++ fontconfig-2.4.1-optimize-config/conf.d/Makefile.am	2006-09-28 16:46:34.000000000 +0300
-@@ -33,6 +33,7 @@
+diff -Naur fontconfig/conf.d/Makefile.am fontconfig-2.6.0-optimize-config/conf.d/Makefile.am
+--- fontconfig/conf.d/Makefile.am	2008-06-01 05:24:35.000000000 +0300
++++ fontconfig-2.6.0-optimize-config/conf.d/Makefile.am	2009-06-03 15:46:29.000000000 +0300
+@@ -34,6 +34,7 @@
+ 	10-unhinted.conf \
  	20-fix-globaladvance.conf \
- 	20-lohit-gujarati.conf \
  	20-unhint-small-vera.conf \
-+	20-newtimes-nohint.conf \
- 	30-amt-aliases.conf \
++	21-newtimes-nohint.conf \
+ 	25-unhint-nonlatin.conf \
  	30-urw-aliases.conf \
- 	40-generic.conf \
-@@ -52,17 +53,14 @@
+ 	30-metric-aliases.conf \
+@@ -55,18 +56,15 @@
+ CONF_LINKS = \
  	20-fix-globaladvance.conf \
- 	20-lohit-gujarati.conf \
  	20-unhint-small-vera.conf \
--	30-amt-aliases.conf \
 -	30-urw-aliases.conf \
-+	20-newtimes-nohint.conf \
- 	40-generic.conf \
+-	30-metric-aliases.conf \
++	21-newtimes-nohint.conf \
+ 	40-nonlatin.conf \
+ 	45-latin.conf \
  	49-sansserif.conf \
  	50-user.conf \
  	51-local.conf \
@@ -106,34 +112,4 @@
 -	80-delicious.conf \
  	90-synthetic.conf
  
- EXTRA_DIST = $(CONF_FILES)
-diff -Naur fontconfig/conf.d/Makefile.in fontconfig-2.4.1-optimize-config/conf.d/Makefile.in
---- fontconfig/conf.d/Makefile.in	2006-09-15 20:12:37.000000000 +0300
-+++ fontconfig-2.4.1-optimize-config/conf.d/Makefile.in	2006-09-28 16:46:49.000000000 +0300
-@@ -242,6 +242,7 @@
- 	20-fix-globaladvance.conf \
- 	20-lohit-gujarati.conf \
- 	20-unhint-small-vera.conf \
-+	20-newtimes-nohint.conf \
- 	30-amt-aliases.conf \
- 	30-urw-aliases.conf \
- 	40-generic.conf \
-@@ -261,17 +262,14 @@
- 	20-fix-globaladvance.conf \
- 	20-lohit-gujarati.conf \
- 	20-unhint-small-vera.conf \
--	30-amt-aliases.conf \
--	30-urw-aliases.conf \
-+	20-newtimes-nohint.conf \
- 	40-generic.conf \
- 	49-sansserif.conf \
- 	50-user.conf \
- 	51-local.conf \
- 	60-latin.conf \
--	65-fonts-persian.conf \
- 	65-nonlatin.conf \
- 	69-unifont.conf \
--	80-delicious.conf \
- 	90-synthetic.conf
- 
- EXTRA_DIST = $(CONF_FILES)
+ EXTRA_DIST = $(CONF_FILES) $(DOC_FILES)


