[arch-commits] Commit in freetype2/trunk (PKGBUILD fix-clipping.patch)

[Jan de Groot]

    Date: Thursday, September 10, 2015 @ 09:22:09
  Author: jgc
Revision: 245697

upgpkg: freetype2 2.6-2

Added:
  freetype2/trunk/fix-clipping.patch
Modified:
  freetype2/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   11 ++++++++---
 fix-clipping.patch |   25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-10 07:08:43 UTC (rev 245696)
+++ PKGBUILD	2015-09-10 07:22:09 UTC (rev 245697)
@@ -3,7 +3,7 @@
 
 pkgname=freetype2
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,13 +16,15 @@
         freetype-2.2.1-enable-valid.patch
         freetype-2.5.1-enable-spr.patch
         freetype-2.5.1-enable-sph.patch
-        env_FT2_SUBPIXEL_HINTING.diff)
+        env_FT2_SUBPIXEL_HINTING.diff
+        fix-clipping.patch)
 sha1sums=('cd2b144205dd2c61693e2d861069367aa3dde1bc'
           'SKIP'
           'f279d922a873d62a8af50bfc873051839d194dca'
           '13ee8d558593db991ad29fa090b461f914536104'
           'c31fa3d342ead56f3acfa1f267b474a7686d0014'
-          '78322bee05f013cd76487439ddac0cae50596db4')
+          '78322bee05f013cd76487439ddac0cae50596db4'
+          '55eaf96bd1b68b27ca4278352171f4ae82292744')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 prepare() {
@@ -36,6 +38,9 @@
   # Hopefully just a temporary measure until fontconfig picks up
   # the necessary configurables.
   patch -Np1 -i "${srcdir}/env_FT2_SUBPIXEL_HINTING.diff"
+
+  # FS#45584
+  patch -Np1 -i ../fix-clipping.patch
 }
 
 build() {

Added: fix-clipping.patch
===================================================================
--- fix-clipping.patch	                        (rev 0)
+++ fix-clipping.patch	2015-09-10 07:22:09 UTC (rev 245697)
@@ -0,0 +1,25 @@
+From b650dfbb0b0700440cc88da31f97cec45b4140de Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <matthias.clasen at gmail.com>
+Date: Sun, 26 Jul 2015 19:08:34 +0000
+Subject: [cff] Don't use `hmtx' table for LSB (#45520).
+
+* src/cff/cffgload.c (cff_slot_load): Use `htmx' table for advance
+width only.  Bug introduced 2015-04-10.
+---
+diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
+index 43054f8..a075ddc 100644
+--- a/src/cff/cffgload.c
++++ b/src/cff/cffgload.c
+@@ -3064,9 +3064,7 @@
+         metrics->width  = cbox.xMax - cbox.xMin;
+         metrics->height = cbox.yMax - cbox.yMin;
+ 
+-        if ( !face->horizontal.number_Of_HMetrics )
+-          metrics->horiBearingX = cbox.xMin;
+-
++        metrics->horiBearingX = cbox.xMin;
+         metrics->horiBearingY = cbox.yMax;
+ 
+         if ( has_vertical_info )
+--
+cgit v0.9.0.2