From e5298d43f294f617953e8a37e6451418158eb162 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 25 Nov 2013 14:33:59 +0100 Subject: [PATCH] freetype: update to 2.5.1. --- .../patches/freetype-2.2.1-enable-valid.patch | 4 ++-- .../patches/freetype-2.4.11-enable-sph.patch | 13 ----------- ....patch => freetype-2.5.1-enable-spr.patch} | 6 ++--- srcpkgs/freetype/template | 22 +++++++++---------- 4 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/freetype/patches/freetype-2.4.11-enable-sph.patch rename srcpkgs/freetype/patches/{freetype-2.3.0-enable-spr.patch => freetype-2.5.1-enable-spr.patch} (67%) diff --git a/srcpkgs/freetype/patches/freetype-2.2.1-enable-valid.patch b/srcpkgs/freetype/patches/freetype-2.2.1-enable-valid.patch index c78b6b70f6..b61a792219 100644 --- a/srcpkgs/freetype/patches/freetype-2.2.1-enable-valid.patch +++ b/srcpkgs/freetype/patches/freetype-2.2.1-enable-valid.patch @@ -1,5 +1,5 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +--- modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ modules.cfg 2006-07-07 21:01:54.000000000 -0400 @@ -110,7 +110,7 @@ AUX_MODULES += cache diff --git a/srcpkgs/freetype/patches/freetype-2.4.11-enable-sph.patch b/srcpkgs/freetype/patches/freetype-2.4.11-enable-sph.patch deleted file mode 100644 index 7fb635cfe1..0000000000 --- a/srcpkgs/freetype/patches/freetype-2.4.11-enable-sph.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - - - /*************************************************************************/ diff --git a/srcpkgs/freetype/patches/freetype-2.3.0-enable-spr.patch b/srcpkgs/freetype/patches/freetype-2.5.1-enable-spr.patch similarity index 67% rename from srcpkgs/freetype/patches/freetype-2.3.0-enable-spr.patch rename to srcpkgs/freetype/patches/freetype-2.5.1-enable-spr.patch index 8432e28a41..b24273baf0 100644 --- a/srcpkgs/freetype/patches/freetype-2.3.0-enable-spr.patch +++ b/srcpkgs/freetype/patches/freetype-2.5.1-enable-spr.patch @@ -1,6 +1,6 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ +--- include/config/ftoption.h ++++ include/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index e3f28ad0e8..0f9d17526c 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -1,8 +1,7 @@ # Template build file 'freetype'. pkgname=freetype -version=2.5.0.1 +version=2.5.1 revision=1 -patch_args="-Np1" build_style=gnu-configure hostmakedepends="pkg-config which" makedepends="zlib-devel bzip2-devel libpng-devel" @@ -11,24 +10,25 @@ maintainer="Juan RP " homepage="http://www.freetype.org/" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5 +checksum=d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45 -if [ "$CROSS_BUILD" ]; then - # XXX needs libpng-config - hostmakedepends+=" libpng-devel" - pre_build() { - sed -e 's,-L/usr/lib,,g' -i builds/unix/unix-cc.mk - } -fi +do_configure() { + if [ "$CROSS_BUILD" ]; then + export LIBPNG_CFLAGS="$(pkg-config --cflags libpng)" + export LIBPNG_LDFLAGS="$(pkg-config --libs libpng)" + fi + ./configure ${configure_args} +} freetype-devel_package() { - depends="zlib-devel bzip2-devel freetype>=$version" + depends="zlib-devel bzip2-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { for f in bin include share; do vmove usr/${f} done vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } }