From 894f350c13ee04e9ed21c01a674feb44c5e21c44 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 15 Jun 2006 12:24:12 +0000
Subject: Fix freetype2-2.2.1 breakage.

---
 games/wesnoth/distinfo         |  3 ++-
 games/wesnoth/patches/patch-ab | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 games/wesnoth/patches/patch-ab

(limited to 'games/wesnoth')

diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index c724bc3dcd4..906be295121 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2006/03/12 12:30:05 wiz Exp $
+$NetBSD: distinfo,v 1.18 2006/06/15 12:24:12 wiz Exp $
 
 SHA1 (wesnoth-1.0.2.tar.gz) = c2313242615b79249f26371bd7c410e8385adc0a
 RMD160 (wesnoth-1.0.2.tar.gz) = 20ba5be7078224f65a37d268eaf95be79e0e57c2
 Size (wesnoth-1.0.2.tar.gz) = 40034289 bytes
 SHA1 (patch-aa) = 28e6a2e8171336fb0f798b2f28ced9152e1678ae
+SHA1 (patch-ab) = 6e7414a0fcdb5b0b306e7cf4a62383bfdc0f1fa5
diff --git a/games/wesnoth/patches/patch-ab b/games/wesnoth/patches/patch-ab
new file mode 100644
index 00000000000..defcabd80a7
--- /dev/null
+++ b/games/wesnoth/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.3 2006/06/15 12:24:12 wiz Exp $
+
+From
+http://www.freetype.org/freetype2/patches/SDL_ttf-2.0.7-noftinternals.patch
+
+--- src/sdl_ttf/SDL_ttf.c.orig	2005-09-21 00:35:47.000000000 +0000
++++ src/sdl_ttf/SDL_ttf.c
+@@ -43,16 +43,6 @@
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+ #include FT_TRUETYPE_IDS_H
+-/*
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
+-*/
+-#include <freetype/internal/ftobjs.h>
+-
+-#ifndef FT_OPEN_STREAM
+-#define FT_OPEN_STREAM ft_open_stream
+-#endif
+ 
+ #include "SDL.h"
+ #include "SDL_endian.h"
+@@ -282,7 +272,7 @@ TTF_Font* TTF_OpenFontIndexRW( SDL_RWops
+ 	}
+ 	memset(stream, 0, sizeof(*stream));
+ 
+-	stream->memory = library->memory;
++	stream->memory = NULL;  /* set by FT_Open_Face */
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;
-- 
cgit v1.2.3