From 699b4426844c0aa16a11dee5c98cc23fa624b611 Mon Sep 17 00:00:00 2001 From: spz Date: Sun, 23 Mar 2014 08:14:23 +0000 Subject: build fix following the freetype2 update --- games/openmortal/distinfo | 4 ++-- games/openmortal/patches/patch-ae | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'games') diff --git a/games/openmortal/distinfo b/games/openmortal/distinfo index 315588e3ca2..3b7922b002c 100644 --- a/games/openmortal/distinfo +++ b/games/openmortal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2010/07/02 16:48:54 joerg Exp $ +$NetBSD: distinfo,v 1.12 2014/03/23 08:21:11 spz Exp $ SHA1 (openmortal-0.7.tar.bz2) = a7177012e1c0eb04f357aa9ff013e53c8f7b835c RMD160 (openmortal-0.7.tar.bz2) = 6a0fdd46445ed243db261227a93526b97c6f9d79 @@ -7,4 +7,4 @@ SHA1 (patch-aa) = 8f9438695de1dd8fcb0e68f6cee9ee8efd2229c3 SHA1 (patch-ab) = 1f7f9075975994e76262df4d3153f1162cb40dd3 SHA1 (patch-ac) = 807cfb849a4a3408c5877b61690bf0cf37da59b6 SHA1 (patch-ad) = ad0fbd55c11a6076e9e5212b717a4b220820b206 -SHA1 (patch-ae) = d0434959250bad25932963efafe34bb7fe948cee +SHA1 (patch-ae) = 3f9c3fbfda30aae5cbf3fd8bc4e5100879cf825f diff --git a/games/openmortal/patches/patch-ae b/games/openmortal/patches/patch-ae index d9cf42a4159..10559e9dbfc 100644 --- a/games/openmortal/patches/patch-ae +++ b/games/openmortal/patches/patch-ae @@ -1,6 +1,9 @@ -$NetBSD: patch-ae,v 1.1 2007/08/08 20:53:47 joerg Exp $ +$NetBSD: patch-ae,v 1.2 2014/03/23 08:21:11 spz Exp $ ---- src/sge_tt_text.cpp.orig 2007-08-08 20:28:55.000000000 +0000 +add malloc.h +make it deal gracefully with both freetype 2.4.* and 2.5.* + +--- src/sge_tt_text.cpp.orig 2004-03-03 20:17:48.000000000 +0000 +++ src/sge_tt_text.cpp @@ -26,7 +26,6 @@ @@ -10,3 +13,16 @@ $NetBSD: patch-ae,v 1.1 2007/08/08 20:53:47 joerg Exp $ #include #include #include +@@ -37,9 +36,9 @@ + + #ifndef _SGE_NOTTF + #include +-#include +-#include +-#include ++#include FT_FREETYPE_H ++#include FT_OUTLINE_H ++#include FT_TRUETYPE_IDS_H + + /* The structure used to hold glyph information (cached) */ + struct glyph { -- cgit v1.2.3