[149841] trunk/dports/graphics/fontconfig

[ryandesign at macports.org]

Revision: 149841
          https://trac.macports.org/changeset/149841
Author:   ryandesign at macports.org
Date:     2016-07-01 22:31:59 -0700 (Fri, 01 Jul 2016)
Log Message:
-----------
fontconfig: revert a change in 2.12 that caused an assertion failure in winecfg (#51674)

Modified Paths:
--------------
    trunk/dports/graphics/fontconfig/Portfile

Added Paths:
-----------
    trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff

Modified: trunk/dports/graphics/fontconfig/Portfile
===================================================================
--- trunk/dports/graphics/fontconfig/Portfile	2016-07-02 05:26:30 UTC (rev 149840)
+++ trunk/dports/graphics/fontconfig/Portfile	2016-07-02 05:31:59 UTC (rev 149841)
@@ -6,6 +6,7 @@
 
 name                        fontconfig
 version                     2.12.0
+revision                    1
 categories                  graphics
 maintainers                 ryandesign
 license                     fontconfig
@@ -40,6 +41,9 @@
 
 patchfiles                  patch-docbook-4.2.diff
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=96609
+patchfiles-append           patch-src-fcweight.c.diff
+
 configure.args              --disable-silent-rules HASDOCBOOK=no
 
 # We put this into a pre-configure block so it can be evaluated _after_ platform selection.

Added: trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff
===================================================================
--- trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff	                        (rev 0)
+++ trunk/dports/graphics/fontconfig/files/patch-src-fcweight.c.diff	2016-07-02 05:31:59 UTC (rev 149841)
@@ -0,0 +1,13 @@
+Revert a 2.12 change in fcweight.c that introduced a bug
+--- src/fcweight.c.orig	2016-07-01 14:58:33.000000000 -0400
++++ src/fcweight.c	2016-07-01 14:58:56.000000000 -0400
+@@ -56,7 +56,7 @@
+ 
+ 	/* Loosely based on WPF Font Selection Model's advice. */
+ 
+-	if (ot_weight < 0)
++	if (ot_weight < 0 || ot_weight >1000)
+ 	    return -1;
+ 	else if (1 <= ot_weight && ot_weight <= 9)
+ 	{
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160701/263bbebe/attachment.html>