From 057d08cb293dfd45f79e97e8e12b04eccfcbcf47 Mon Sep 17 00:00:00 2001 From: spz Date: Sat, 22 Mar 2014 20:15:20 +0000 Subject: build fix following the freetype2 update --- graphics/evas/Makefile | 4 ++-- graphics/evas/distinfo | 3 ++- .../patch-src_lib_engines_common_evas__font__load.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 graphics/evas/patches/patch-src_lib_engines_common_evas__font__load.c (limited to 'graphics') diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile index 3db6d3d50d6..3db0d35e913 100644 --- a/graphics/evas/Makefile +++ b/graphics/evas/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2014/02/20 09:46:32 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2014/03/22 20:15:20 spz Exp $ -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Enlightened Canvas Library diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo index 1ab42729586..1a71be27490 100644 --- a/graphics/evas/distinfo +++ b/graphics/evas/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.14 2013/08/30 22:35:53 joerg Exp $ +$NetBSD: distinfo,v 1.15 2014/03/22 20:15:20 spz Exp $ SHA1 (evas-1.7.7.tar.bz2) = 680e85a60363df84b81298138cc19629f9f139bc RMD160 (evas-1.7.7.tar.bz2) = 306b36018c5ab07712553a554e4a2deac13854ed Size (evas-1.7.7.tar.bz2) = 9408256 bytes SHA1 (patch-configure) = b7bda6085449a0fdcc51d58371101bb2f8bbc232 SHA1 (patch-configure.ac) = d9330c131859794beb29414c9afe66a08b6fe55d +SHA1 (patch-src_lib_engines_common_evas__font__load.c) = b6a0cb75692efc95e81b000f48216f6dd0f1ea27 SHA1 (patch-src_modules_loaders_gif_evas__image__load__gif.c) = c0f386bde5bbe43aee54d1864377d2d0dad08103 SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 386f375a68eb4d49b05cc69c041641d11c306082 diff --git a/graphics/evas/patches/patch-src_lib_engines_common_evas__font__load.c b/graphics/evas/patches/patch-src_lib_engines_common_evas__font__load.c new file mode 100644 index 00000000000..812653ecfdb --- /dev/null +++ b/graphics/evas/patches/patch-src_lib_engines_common_evas__font__load.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_lib_engines_common_evas__font__load.c,v 1.1 2014/03/22 20:15:20 spz Exp $ + +make it deal gracefully with both freetype 2.4.* and 2.5.* + +--- src/lib/engines/common/evas_font_load.c.orig 2013-04-04 18:00:09.000000000 +0000 ++++ src/lib/engines/common/evas_font_load.c +@@ -5,7 +5,8 @@ + + #include "evas_font_private.h" /* for Frame-Queuing support */ + #include "evas_font_ot.h" +-#include /* Freetype2 OS/2 font table. */ ++#include ++#include FT_TRUETYPE_TABLES_H /* Freetype2 OS/2 font table. */ + + #ifdef EVAS_CSERVE2 + # include "../../cserve2/evas_cs2_private.h" -- cgit v1.2.3