rpms/wesnoth/devel wesnoth-1.0.2-sdl_ttf.patch, NONE, 1.1 wesnoth.spec, 1.26, 1.27

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12562

Modified Files:
	wesnoth.spec 
Added Files:
	wesnoth-1.0.2-sdl_ttf.patch 
Log Message:
* Tue Jul 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-3
- remove BR SDL_ttf-devel, an included/patched copy is used since 0.8.7
- patch included SDL_ttf to build with freetype 2.x and not access
  an old freetype 1.x internal


wesnoth-1.0.2-sdl_ttf.patch:

--- NEW FILE wesnoth-1.0.2-sdl_ttf.patch ---
diff -Nur wesnoth-1.0.2-orig/src/sdl_ttf/SDL_ttf.c wesnoth-1.0.2/src/sdl_ttf/SDL_ttf.c
--- wesnoth-1.0.2-orig/src/sdl_ttf/SDL_ttf.c	2005-09-21 02:35:47.000000000 +0200
+++ wesnoth-1.0.2/src/sdl_ttf/SDL_ttf.c	2006-07-18 10:31:53.000000000 +0200
@@ -48,7 +48,6 @@
 #include <freetype/ftoutln.h>
 #include <freetype/ttnameid.h>
 */
-#include <freetype/internal/ftobjs.h>
 
 #ifndef FT_OPEN_STREAM
 #define FT_OPEN_STREAM ft_open_stream
@@ -282,7 +281,6 @@
 	}
 	memset(stream, 0, sizeof(*stream));
 
-	stream->memory = library->memory;
 	stream->read = RWread;
 	stream->descriptor.pointer = src;
 	stream->pos = (unsigned long)position;


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wesnoth.spec	15 Feb 2006 02:24:28 -0000	1.26
+++ wesnoth.spec	18 Jul 2006 09:36:36 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -10,10 +10,11 @@
 Source1:        wesnothd.init
 Source2:        wesnoth.sysconfig
 #Source3:        README.fedora
+Patch0:         wesnoth-1.0.2-sdl_ttf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
-BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
+BuildRequires:  SDL_net-devel, freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils, gettext
 
@@ -60,6 +61,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .sdl_ttf
 #cp %{SOURCE3} .
 chmod -x MANUAL*
 
@@ -158,6 +160,11 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Tue Jul 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-3
+- remove BR SDL_ttf-devel, an included/patched copy is used since 0.8.7
+- patch included SDL_ttf to build with freetype 2.x and not access
+  an old freetype 1.x internal
+
 * Wed Feb 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-2
 - rebuilt for FC5