From e651d993c5bffb2e819c382e90d2f19a4cbb018f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 8 Dec 2014 20:31:27 +0100 Subject: [PATCH] freetype: update to freetype-2.5.4 Signed-off-by: Stephan Raue --- packages/print/freetype/package.mk | 2 +- .../patches/freetype-01-fix-pkgconf.patch | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk index 82da0a1ae9..d446a28d29 100644 --- a/packages/print/freetype/package.mk +++ b/packages/print/freetype/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="freetype" -PKG_VERSION="2.5.3" +PKG_VERSION="2.5.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/print/freetype/patches/freetype-01-fix-pkgconf.patch b/packages/print/freetype/patches/freetype-01-fix-pkgconf.patch index c47ac5c294..9828f2bb68 100644 --- a/packages/print/freetype/patches/freetype-01-fix-pkgconf.patch +++ b/packages/print/freetype/patches/freetype-01-fix-pkgconf.patch @@ -7,15 +7,14 @@ Subject: [PATCH] fix pkgconf builds/unix/freetype2.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in -index 6e7fb10..653732d 100644 ---- a/builds/unix/freetype2.in -+++ b/builds/unix/freetype2.in +diff -Naur freetype-2.5.4/builds/unix/freetype2.in freetype-2.5.4.patch/builds/unix/freetype2.in +--- freetype-2.5.4/builds/unix/freetype2.in 2014-11-19 22:36:25.000000000 +0100 ++++ freetype-2.5.4.patch/builds/unix/freetype2.in 2014-12-08 20:29:05.594849395 +0100 @@ -1,7 +1,7 @@ - prefix="%prefix%" --exec_prefix="%exec_prefix%" --libdir="%libdir%" --includedir="%includedir%/freetype2" + prefix=%prefix% +-exec_prefix=%exec_prefix% +-libdir=%libdir% +-includedir=%includedir%/freetype2 +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include/freetype2