From 467ac9f507ef7f59602eecac9fa86deb0243852a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 12 Oct 2015 23:41:51 +0200 Subject: [PATCH] freetype: update to freetype-2.6.1 Signed-off-by: Stephan Raue --- packages/print/freetype/package.mk | 2 +- .../patches/freetype-01-fix-pkgconf.patch | 22 +++++-------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk index 297838d536..6cc9d9dd1d 100644 --- a/packages/print/freetype/package.mk +++ b/packages/print/freetype/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="freetype" -PKG_VERSION="2.6" +PKG_VERSION="2.6.1" 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 9828f2bb68..9bcca675e7 100644 --- a/packages/print/freetype/patches/freetype-01-fix-pkgconf.patch +++ b/packages/print/freetype/patches/freetype-01-fix-pkgconf.patch @@ -1,26 +1,14 @@ -From 7688dae788f3a3f8f5f0478f096904cc885a1a90 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 16 Aug 2014 14:57:02 +0300 -Subject: [PATCH] fix pkgconf - ---- - builds/unix/freetype2.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -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 +diff -Naur freetype-2.6.1/builds/unix/freetype2.in freetype-2.6.1.patch/builds/unix/freetype2.in +--- freetype-2.6.1/builds/unix/freetype2.in 2015-09-25 07:58:57.000000000 +0200 ++++ freetype-2.6.1.patch/builds/unix/freetype2.in 2015-10-12 21:58:50.736816464 +0200 @@ -1,7 +1,7 @@ prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% --includedir=%includedir%/freetype2 +-includedir=%includedir% +exec_prefix=${prefix} +libdir=${exec_prefix}/lib -+includedir=${prefix}/include/freetype2 ++includedir=${prefix}/include Name: FreeType 2 URL: http://freetype.org --- -1.7.2.5 -