[arch-commits] Commit in freetype2/trunk (2 files)

[Jan de Groot]

    Date: Monday, July 11, 2011 @ 03:14:19
  Author: jgc
Revision: 131135

upgpkg: freetype2 2.4.5-1
Update to 2.4.5, remove patch that was included in the release

Modified:
  freetype2/trunk/PKGBUILD
Deleted:
  freetype2/trunk/allow-hlineto-vlineto-without-arguments.patch

-----------------------------------------------+
 PKGBUILD                                      |   14 +----
 allow-hlineto-vlineto-without-arguments.patch |   57 ------------------------
 2 files changed, 4 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-11 07:04:39 UTC (rev 131134)
+++ PKGBUILD	2011-07-11 07:14:19 UTC (rev 131135)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.4.5
+pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,9 +12,8 @@
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch
-        allow-hlineto-vlineto-without-arguments.patch)
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
+        freetype-2.2.1-enable-valid.patch)
+md5sums=('90428a6d8ec4876cd1eb94858c2a59b0'
          '816dc8619a6904a7385769433c0a8653'
          '214119610444c9b02766ccee5e220680')
 
@@ -22,13 +21,8 @@
   cd "${srcdir}/freetype-${pkgver}"
   patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-  patch -Np1 -i "${srcdir}/allow-hlineto-vlineto-without-arguments.patch"
 
   ./configure --prefix=/usr
   make
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
-         '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680'
-         'bb094e147b25892f1d04cfb5ff877bce')

Deleted: allow-hlineto-vlineto-without-arguments.patch
===================================================================
--- allow-hlineto-vlineto-without-arguments.patch	2011-07-11 07:04:39 UTC (rev 131134)
+++ allow-hlineto-vlineto-without-arguments.patch	2011-07-11 07:14:19 UTC (rev 131135)
@@ -1,57 +0,0 @@
-From 396b11b840f84e8bff62f3c361d0b592e77ee703 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl at gnu.org>
-Date: Thu, 09 Dec 2010 22:16:18 +0000
-Subject: [cff] Allow `hlineto' and `vlineto' without arguments.
-
-We simply ignore such instructions.  This is invalid, but it doesn't
-harm; and indeed, there exist such subsetted fonts in PDFs.
-
-Reported by Albert Astals Cid <aacid at kde.org>.
-
-* src/cff/cffgload.c (cff_decoder_parse_charstrings)
-[cff_op_hlineto]: Ignore instruction if there aren't any arguments
-on the stack.
----
-diff --git a/ChangeLog b/ChangeLog
-index b7aea52..579ae62 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,16 @@
-+2010-12-09  Werner Lemberg  <wl at gnu.org>
-+
-+	[cff] Allow `hlineto' and `vlineto' without arguments.
-+
-+	We simply ignore such instructions.  This is invalid, but it doesn't
-+	harm; and indeed, there exist such subsetted fonts in PDFs.
-+
-+	Reported by Albert Astals Cid <aacid at kde.org>.
-+
-+	* src/cff/cffgload.c (cff_decoder_parse_charstrings)
-+	[cff_op_hlineto]: Ignore instruction if there aren't any arguments
-+	on the stack.
-+
- 2010-11-28  Werner Lemberg  <wl at gnu.org>
- 
- 	* Version 2.4.4 released.
-diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
-index e99ee70..99c5b0c 100644
---- a/src/cff/cffgload.c
-+++ b/src/cff/cffgload.c
-@@ -1438,9 +1438,14 @@
-             FT_TRACE4(( op == cff_op_hlineto ? " hlineto\n"
-                                              : " vlineto\n" ));
- 
--            if ( num_args < 1 )
-+            if ( num_args < 0 )
-               goto Stack_Underflow;
- 
-+            /* there exist subsetted fonts (found in PDFs) */
-+            /* which call `hlineto' without arguments      */
-+            if ( num_args == 0 )
-+              break;
-+
-             if ( cff_builder_start_point ( builder, x, y ) ||
-                  check_points( builder, num_args )         )
-               goto Fail;
---
-cgit v0.8.3.2