diff --git a/scummvm-0.12.0-gcc44.patch b/scummvm-0.12.0-gcc44.patch new file mode 100644 index 0000000..6faa9f1 --- /dev/null +++ b/scummvm-0.12.0-gcc44.patch @@ -0,0 +1,12 @@ +--- scummvm-0.12.0/backends/midi/alsa.cpp 2008-08-26 02:41:06.000000000 +0300 ++++ scummvm-0.12.0-mod/backends/midi/alsa.cpp 2009-02-26 19:16:54.000000000 +0200 +@@ -215,7 +215,8 @@ + char *p; + + if (isdigit(*arg)) { +- if ((p = strpbrk(arg, ADDR_DELIM)) == NULL) ++ if ((p = ++ strpbrk((char *)arg, ADDR_DELIM)) == NULL) + return -1; + *client = atoi(arg); + *port = atoi(p + 1); diff --git a/scummvm.spec b/scummvm.spec index 61ba86c..49b116c 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -1,6 +1,6 @@ Name: scummvm Version: 0.12.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators License: GPLv2+ @@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. ####### Icons extracted from icons/scummvm.ico with the gimp Source1: scummvm-icons.tar.gz Patch0: scummvm-0.11.0-nostrip.patch +Patch1: scummvm-0.12.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel BuildRequires: fluidsynth-devel desktop-file-utils @@ -31,6 +32,7 @@ Also ScummVM is capable of playing several non-SCUMM games. %prep %setup -q -a 1 %patch0 -p1 -b .nostrip +%patch1 -p1 -b .gcc44 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \ dists/%{name}.desktop @@ -102,6 +104,9 @@ fi %changelog +* Thu Feb 26 2009 Lucian Langa - 0.12.0-3 +- add patch1 for gcc44 fixes + * Wed Feb 25 2009 Fedora Release Engineering - 0.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild