diff --git a/graphic/libsdl_ttf/libsdl_ttf.desc b/graphic/libsdl_ttf/libsdl_ttf.desc index 168975e20..2181ff1fd 100644 --- a/graphic/libsdl_ttf/libsdl_ttf.desc +++ b/graphic/libsdl_ttf/libsdl_ttf.desc @@ -3,7 +3,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../libsdl_ttf/libsdl_ttf.desc -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -34,4 +34,3 @@ [P] X -----5---9 146.000 [D] 716343315 SDL_ttf-2.0.8.tar.gz http://www.libsdl.org/projects/SDL_ttf/release/ - diff --git a/graphic/libsdl_ttf/noftinternals.patch b/graphic/libsdl_ttf/noftinternals.patch new file mode 100644 index 000000000..a4b1b547b --- /dev/null +++ b/graphic/libsdl_ttf/noftinternals.patch @@ -0,0 +1,47 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../libsdl_ttf/noftinternals.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Patch redone. Original taken from http://freetype.fis.uniroma2.it/freetype2/patches/SDL_ttf-2.0.7-noftinternals.patch + +diff -u SDL_ttf-2.0.8.orig/SDL_ttf.c SDL_ttf-2.0.8/SDL_ttf.c +--- SDL_ttf-2.0.8.orig/SDL_ttf.c 2006-05-01 11:26:17.000000000 +0200 ++++ SDL_ttf-2.0.8/SDL_ttf.c 2007-06-23 16:49:18.000000000 +0200 +@@ -43,16 +43,6 @@ + #include FT_FREETYPE_H + #include FT_OUTLINE_H + #include FT_TRUETYPE_IDS_H +-/* +-#include +-#include +-#include +-*/ +-#include +- +-#ifndef FT_OPEN_STREAM +-#define FT_OPEN_STREAM ft_open_stream +-#endif + + #include "SDL.h" + #include "SDL_endian.h" +@@ -278,7 +268,7 @@ + } + 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;