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

[Jan Steffens]

    Date: Wednesday, June 19, 2013 @ 21:45:21
  Author: heftig
Revision: 188761

2.5.0

Added:
  freetype2/trunk/freetype-2.4.11-enable-sph.patch
  freetype2/trunk/freetype-2.4.13-disable-old-cff-engine.patch
Modified:
  freetype2/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   24 +++++++++++++++++-------
 freetype-2.4.11-enable-sph.patch             |   13 +++++++++++++
 freetype-2.4.13-disable-old-cff-engine.patch |   13 +++++++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-19 19:35:08 UTC (rev 188760)
+++ PKGBUILD	2013-06-19 19:45:21 UTC (rev 188761)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.12
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
@@ -11,18 +11,28 @@
 depends=('zlib' 'bzip2' 'sh')
 options=('!libtool')
 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.2.1-enable-valid.patch)
-md5sums=('3463102764315eb86c0d3c2e1f3ffb7d'
+        freetype-2.4.11-enable-sph.patch
+        freetype-2.4.13-disable-old-cff-engine.patch)
+md5sums=('07b7f54bc32d3a0f8a44ec4586c73d81'
+         '214119610444c9b02766ccee5e220680'
          '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680')
+         '2422f8902224fedb46ae9eec08c8ceac'
+         '65f1c3e7a461e202bc10765b65f4f6d3')
 
-build() {
+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.2.1-enable-valid.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"
+}
 
-  ./configure --prefix=/usr
+build() {
+  cd "${srcdir}/freetype-${pkgver}"
+  ./configure --prefix=/usr --disable-static \
+    --without-png
   make
 }
 

Added: freetype-2.4.11-enable-sph.patch
===================================================================
--- freetype-2.4.11-enable-sph.patch	                        (rev 0)
+++ freetype-2.4.11-enable-sph.patch	2013-06-19 19:45:21 UTC (rev 188761)
@@ -0,0 +1,13 @@
+diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h
+index a73fff4..0a081bf 100644
+--- i/include/freetype/config/ftoption.h
++++ w/include/freetype/config/ftoption.h
+@@ -577,7 +577,7 @@ FT_BEGIN_HEADER
+   /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
+   /*   defined.                                                            */
+   /*                                                                       */
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+ 
+ 
+   /*************************************************************************/

Added: freetype-2.4.13-disable-old-cff-engine.patch
===================================================================
--- freetype-2.4.13-disable-old-cff-engine.patch	                        (rev 0)
+++ freetype-2.4.13-disable-old-cff-engine.patch	2013-06-19 19:45:21 UTC (rev 188761)
@@ -0,0 +1,13 @@
+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 */
+ 
+ 
+   /*************************************************************************/