[arch-commits] Commit in fontconfig/trunk (PKGBUILD bug62980.patch)

[Jan de Groot]

    Date: Monday, April 1, 2013 @ 11:51:18
  Author: jgc
Revision: 181142

upgpkg: fontconfig 2.10.92-1

Update to 2.11 RC2. Needed for Pango

Added:
  fontconfig/trunk/bug62980.patch
Modified:
  fontconfig/trunk/PKGBUILD

----------------+
 PKGBUILD       |   13 ++++++---
 bug62980.patch |   73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-01 08:12:16 UTC (rev 181141)
+++ PKGBUILD	2013-04-01 09:51:18 UTC (rev 181142)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.2
-pkgrel=2
+pkgver=2.10.92
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -12,12 +12,15 @@
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        29-replace-bitmap-fonts.conf)
-sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
-            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
+        29-replace-bitmap-fonts.conf
+        bug62980.patch)
+sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
+            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc'
+            'd0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../bug62980.patch
 
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
   libtoolize -f

Added: bug62980.patch
===================================================================
--- bug62980.patch	                        (rev 0)
+++ bug62980.patch	2013-04-01 09:51:18 UTC (rev 181142)
@@ -0,0 +1,73 @@
+From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Mon, 01 Apr 2013 09:16:28 +0000
+Subject: Bug 62980 - matching native fonts with even :lang=en
+
+Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc
+to deal with both strong and weak of FC_LANG as the same location in the score
+---
+diff --git a/src/fcmatch.c b/src/fcmatch.c
+index 68f39ae..2d7b798 100644
+--- a/src/fcmatch.c
++++ b/src/fcmatch.c
+@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy {
+ #undef FC_OBJECT
+ 
+ #undef PRI1
+-#define PRI1(n)			\
+-    PRI_ ## n ## _STRONG,	\
+-    PRI_ ## n ## _WEAK
++#define PRI1(n)					\
++    PRI_ ## n,					\
++    PRI_ ## n ## _STRONG = PRI_ ## n,		\
++    PRI_ ## n ## _WEAK = PRI_ ## n
+ 
+ typedef enum _FcMatcherPriority {
+     PRI1(HASH),
+@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority {
+     PRI1(FOUNDRY),
+     PRI1(CHARSET),
+     PRI_FAMILY_STRONG,
+-    PRI_LANG_STRONG,
+     PRI_POSTSCRIPT_NAME_STRONG,
+-    PRI_LANG_WEAK,
++    PRI1(LANG),
+     PRI_FAMILY_WEAK,
+     PRI_POSTSCRIPT_NAME_WEAK,
+     PRI1(SPACING),
+@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 	 * If this node matches any language, go check
+ 	 * which ones and satisfy those entries
+ 	 */
+-	if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 ||
+-	    nodeps[f]->score[PRI_LANG_WEAK] < 2000)
++	if (nodeps[f]->score[PRI_LANG] < 2000)
+ 	{
+ 	    for (i = 0; i < nPatternLang; i++)
+ 	    {
+@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 			}
+ 			patternLangSat[i] = FcTrue;
+ 			satisfies = FcTrue;
+-			/* adjust score to ensure it's not more than 10000.0
+-			 * which would means the lang didn't satisfy the requirements
+-			 */
+-			if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0)
+-			    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+-			if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0)
+-			    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
+ 			break;
+ 		    }
+ 		}
+@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 	}
+ 	if (!satisfies)
+ 	{
+-	    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+-	    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
++	    nodeps[f]->score[PRI_LANG] = 10000.0;
+ 	}
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe