From 32b74bf1ee29c722d3a566a7c7f188df02e698f37c271df6b48c3d9589bc6e73 Mon Sep 17 00:00:00 2001 From: Claes Backstrom Date: Thu, 5 Jun 2008 21:48:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=3 --- widelands.changes | 5 ++++ widelands.flagfix.patch | 58 +++++++++++++++-------------------------- widelands.spec | 29 ++------------------- 3 files changed, 28 insertions(+), 64 deletions(-) diff --git a/widelands.changes b/widelands.changes index ae34b0e..7bdce94 100644 --- a/widelands.changes +++ b/widelands.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 5 23:32:19 CEST 2008 - claes.backstrom@fsfe.org + +- New upstream build-12 + ------------------------------------------------------------------- Fri Apr 11 23:02:49 CEST 2008 - claes.backstrom@fsfe.org diff --git a/widelands.flagfix.patch b/widelands.flagfix.patch index 7d9224f..4bb6f3e 100644 --- a/widelands.flagfix.patch +++ b/widelands.flagfix.patch @@ -1,42 +1,13 @@ diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py ---- ./build/scons-tools/scons_configure.py.flagfix 2007-06-03 17:17:45.000000000 +0200 -+++ ./build/scons-tools/scons_configure.py 2007-09-08 00:03:37.000000000 +0200 -@@ -263,58 +263,4 @@ def do_configure(config_h_file, conf, en - print 'Could not find efence, so doing a debug-efence build is impossible !' - env.Exit(1) +--- ./build/scons-tools/scons_configure.py.flagfix 2008-04-06 20:39:50.000000000 +0200 ++++ ./build/scons-tools/scons_configure.py 2008-04-06 20:40:32.000000000 +0200 +@@ -440,35 +440,7 @@ def do_configure_compiler_warnings(confi + #conf.CheckCompilerFlag('-Werror', env) + def do_configure_compiler_features(config_h_file, conf, env): - conf.CheckCompilerFlag('-fstack-protector-all', env) - conf.CheckCompilerFlag('-fbounds-check', env) - conf.CheckCompilerFlag('-pipe', env) -- conf.CheckCompilerFlag('-Wall', env) -- conf.CheckCompilerFlag('-Wcast-align', env) -- conf.CheckCompilerFlag('-Wcast-qual', env) -- conf.CheckCompilerFlag('-Wconversion', env) -- conf.CheckCompilerFlag('-Wdisabled-optimization', env) -- conf.CheckCompilerFlag('-Wextra', env) -- #conf.CheckCompilerFlag('-Wfloat-equal', env) -- #conf.CheckCompilerFlag('-Wformat=2', env) -- conf.CheckCompilerFlag('-Winline', env) -- conf.CheckCompilerFlag('-Winvalid-pch', env) -- conf.CheckCompilerFlag('-Wmissing-format-attribute', env) -- conf.CheckCompilerFlag('-Wmissing-include-dirs', env) -- conf.CheckCompilerFlag('-Wmissing-noreturn', env) -- conf.CheckCompilerFlag('-Wno-comment', env) -- conf.CheckCompilerFlag('-Wnormalized=nfc', env) -- #conf.CheckCompilerFlag('-Wold-style-cast', env) -- #conf.CheckCompilerFlag('-Wpadded', env) -- conf.CheckCompilerFlag('-Wpointer-arith', env) -- conf.CheckCompilerFlag('-Wunsafe-loop-optimizations', env) -- conf.CheckCompilerFlag('-Wshadow', env) -- conf.CheckCompilerFlag('-Wstack-protector', env) -- conf.CheckCompilerFlag('-Wstrict-aliasing=2', env) -- #conf.CheckCompilerFlag('-Wunreachable-code', env) -- conf.CheckCompilerFlag('-Wwrite-strings', env) -- -- #conf.CheckCompilerFlag('-Wno-deprecated-declarations', env) -- #conf.CheckCompilerFlag('-Wno-unused-variable', env) -- #conf.CheckCompilerFlag('-Wno-unused-parameter', env) -- #conf.CheckCompilerFlag('-Werror', env) - - if env.optimize: - # !!!! -fomit-frame-pointer breaks execeptions !!!! @@ -51,14 +22,27 @@ diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scon - if env.profile: - conf.CheckCompilerFlag('-pg', env) - conf.CheckCompilerFlag('-fprofile-arcs', env) -- conf.CheckLinkerFlag('-pg', env) -- conf.CheckLinkerFlag('-fprofile-arcs', env) - - if env.debug: - conf.CheckCompilerFlag('-g', env) - conf.CheckCompilerFlag('-fmessage-length=0', env) - +-def do_configure_linker_features(config_h_file, conf, env): +- if env.profile: +- conf.CheckLinkerFlag('-pg', env) +- conf.CheckLinkerFlag('-fprofile-arcs', env) +- - if env.strip: - conf.CheckLinkerFlag('-s', env) + conf.CheckCompilerFlag('flagi', env) - + + def do_configure(conf, env): + config_h_file=write_configh_header() +@@ -480,7 +452,6 @@ def do_configure(conf, env): + + do_configure_compiler_warnings(config_h_file, conf, env) + do_configure_compiler_features(config_h_file, conf, env) +- do_configure_linker_features(config_h_file, conf, env) + + write_configh(config_h_file, env) + write_configh_footer(config_h_file) diff --git a/widelands.spec b/widelands.spec index fb84125..75f52bc 100644 --- a/widelands.spec +++ b/widelands.spec @@ -1,9 +1,9 @@ # norootforbuild -%define build_id build-11 +%define build_id build-12 Name: widelands -Version: 11 +Version: 12 Release: 1 Summary: Open source realtime-strategy game @@ -36,19 +36,6 @@ perhaps will have a thought, what Widelands is all about. %setup -q -n %{name} %patch0 -p0 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py -#begin porting to gcc43 -find src -type f -exec sed -i 's/#include /#include \n#include /' {} \; ; -sed -i 's/#include /#include \n#include /' src/main.cc -sed -i 's/#include /#include \n#include /' src/network.cc -sed -i 's/#include /#include \n#include /' src/text_parser.cc -sed -i 's/user_info(std::string name, std::string name, std::string room)/user_info(std::string user, std::string game, std::string room)/' src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.h -sed -i 's/#include /#include \n#include /' src/transport.cc -sed -i 's/#include /#include \n#include /' src/editor_game_base.cc -sed -i 's/std::abs/abs/' src/ui/ui_basic/ui_window.cc -sed -i 's/#include /#include \n#include \n#include /' src/editor/tools/multi_select.h -sed -i 's/#include /#include \n#include \n#include /' src/filesystem/filesystem.cc -sed -i 's/#include /#include \n#include /' src/filesystem/zip_filesystem.cc -#end %build scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id} @@ -95,18 +82,6 @@ Two frontiers War of the Valleys EOF -%post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - %files -f %{name}.files %defattr(-,root,root,-) %doc ChangeLog COPYING CREDITS