Hello community, here is the log from the commit of package wesnoth for openSUSE:Factory checked in at Thu Mar 5 16:55:37 CET 2009. -------- --- wesnoth/wesnoth.changes 2008-11-20 17:50:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/wesnoth/wesnoth.changes 2009-03-05 10:59:56.099647000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 5 10:59:50 CET 2009 - coolo@suse.de + +- fix build (with gcc 4.4) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- wesnoth-1.4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wesnoth.spec ++++++ --- /var/tmp/diff_new_pack.VDd818/_old 2009-03-05 16:54:57.000000000 +0100 +++ /var/tmp/diff_new_pack.VDd818/_new 2009-03-05 16:54:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wesnoth (Version 1.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: wesnoth -BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net SDL_net-devel SDL_ttf boost-devel freetype2-devel gcc-c++ libvorbis-devel python-devel sazanami-fonts ttf-arphic-gkai00mp update-desktop-files +BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net SDL_net-devel SDL_ttf boost-devel freetype2-devel gcc-c++ libpng-devel libvorbis-devel python-devel sazanami-fonts ttf-arphic-gkai00mp update-desktop-files %if %suse_version > 1020 BuildRequires: SDL_net-devel %endif @@ -27,11 +27,12 @@ Url: http://www.wesnoth.org Group: Amusements/Games/Strategy/Turn Based Version: 1.4 -Release: 82 +Release: 83 Requires: wesnoth-data-set wesnoth-data = 1.4 Summary: Fantasy Turn-Based Strategy Game BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}.diff Patch3: wesnoth-desktop-files.diff %description @@ -121,6 +122,7 @@ %prep rm -rf %{buildroot} %setup -q -n wesnoth-1.4 +%patch0 -p1 %patch3 -p1 %build @@ -205,6 +207,8 @@ /usr/bin/campaignd %changelog +* Thu Mar 05 2009 coolo@suse.de +- fix build (with gcc 4.4) * Thu Nov 20 2008 ro@suse.de - buildrequire only boost-devel not boost * Thu Jul 10 2008 crrodriguez@suse.de ++++++ wesnoth-1.4.diff ++++++ Index: wesnoth-1.4/src/network_worker.cpp =================================================================== --- wesnoth-1.4.orig/src/network_worker.cpp +++ wesnoth-1.4/src/network_worker.cpp @@ -216,7 +216,7 @@ bool receive_with_timeout(TCPsocket s, c retval = select(((_TCPsocket*)s)->channel + 1, &readfds, NULL, NULL, &tv); } while(retval == -1 && errno == EINTR); -#elif +#else SDL_Delay(5); #endif } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org