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

[Jan Steffens]

    Date: Thursday, June 20, 2013 @ 00:47:10
  Author: heftig
Revision: 188770

2.5.0.1

Modified:
  freetype2/trunk/PKGBUILD
Deleted:
  freetype2/trunk/freetype-2.4.13-disable-old-cff-engine.patch

----------------------------------------------+
 PKGBUILD                                     |   20 ++++++++++++--------
 freetype-2.4.13-disable-old-cff-engine.patch |   13 -------------
 2 files changed, 12 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-19 21:40:53 UTC (rev 188769)
+++ PKGBUILD	2013-06-19 22:47:10 UTC (rev 188770)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=freetype2
-pkgver=2.5.0
+pkgver=2.5.0.1
 pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
@@ -13,26 +13,30 @@
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.2.1-enable-valid.patch
         freetype-2.3.0-enable-spr.patch
-        freetype-2.4.11-enable-sph.patch
-        freetype-2.4.13-disable-old-cff-engine.patch)
-md5sums=('07b7f54bc32d3a0f8a44ec4586c73d81'
+        freetype-2.4.11-enable-sph.patch)
+md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a'
          '214119610444c9b02766ccee5e220680'
          '816dc8619a6904a7385769433c0a8653'
-         '2422f8902224fedb46ae9eec08c8ceac'
-         '65f1c3e7a461e202bc10765b65f4f6d3')
+         '2422f8902224fedb46ae9eec08c8ceac')
 
 prepare() {
   cd "${srcdir}/freetype-${pkgver}"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
   patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
-  #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" # Disabled for now due to resistance
-  patch -Np1 -i "${srcdir}/freetype-2.4.13-disable-old-cff-engine.patch"
+
+  # Disabled for now due to resistance
+  # Kept here for easier rebuilds via ABS
+  # https://bugs.archlinux.org/task/35274
+  #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch"
 }
 
 build() {
   cd "${srcdir}/freetype-${pkgver}"
+
+  # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled
   ./configure --prefix=/usr --disable-static \
     --without-png
+
   make
 }
 

Deleted: freetype-2.4.13-disable-old-cff-engine.patch
===================================================================
--- freetype-2.4.13-disable-old-cff-engine.patch	2013-06-19 21:40:53 UTC (rev 188769)
+++ freetype-2.4.13-disable-old-cff-engine.patch	2013-06-19 22:47:10 UTC (rev 188770)
@@ -1,13 +0,0 @@
-diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h
-index d162780..0883c69 100644
---- i/include/freetype/config/ftoption.h
-+++ w/include/freetype/config/ftoption.h
-@@ -765,7 +765,7 @@ FT_BEGIN_HEADER
-   /* switch between the two engines using the `hinting-engine' property of */
-   /* the cff driver module.                                                */
-   /*                                                                       */
--#define CFF_CONFIG_OPTION_OLD_ENGINE
-+/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
- 
- 
-   /*************************************************************************/