Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Fedora Release Engineering
c8a1a2694a dist-git conversion 2010-07-29 15:25:28 +00:00
Bill Nottingham
74b8932883 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:18:38 +00:00
Michael Thomas
e956ea7fe1 Remove obsolete patches 2008-11-08 00:35:11 +00:00
Jesse Keating
d9c55415d7 Initialize branch F-9 for wormux 2008-04-22 01:28:57 +00:00
4 changed files with 0 additions and 147 deletions

View file

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: wormux
# $Id$
NAME := wormux
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View file

@ -1,51 +0,0 @@
--- wormux-0.7.9/configure.ac~ 2007-01-28 16:06:11.000000000 +0200
+++ wormux-0.7.9/configure.ac 2007-03-24 12:59:34.000000000 +0200
@@ -150,11 +150,8 @@
GCC_FLAGS="$GCC_FLAGS -O2"
fi
- dnl Ignore default options set by autoconf
- dnl CFLAGS="$CFLAGS $GCC_FLAGS"
- CFLAGS="$GCC_FLAGS"
- dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS"
- CXXFLAGS="$GCC_FLAGS"
+ CFLAGS="$GCC_FLAGS $CFLAGS"
+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS"
else
if test "x${debug}" = "xyes"; then
--- wormux-0.7.9/configure~ 2007-01-28 16:06:58.000000000 +0200
+++ wormux-0.7.9/configure 2007-03-24 12:59:57.000000000 +0200
@@ -7319,8 +7319,8 @@
GCC_FLAGS="$GCC_FLAGS -O2"
fi
- CFLAGS="$GCC_FLAGS"
- CXXFLAGS="$GCC_FLAGS"
+ CFLAGS="$GCC_FLAGS $CFLAGS"
+ CXXFLAGS="$GCC_FLAGS $CXXFLAGS"
else
if test "x${debug}" = "xyes"; then
--- wormux-0.7.9/src/Makefile.am~ 2007-01-28 16:03:48.000000000 +0200
+++ wormux-0.7.9/src/Makefile.am 2007-03-24 13:03:12.000000000 +0200
@@ -176,7 +176,7 @@
weapon/blowtorch.cpp weapon/blowtorch.h \
weapon/syringe.cpp weapon/syringe.h
-AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
if WIN32
--- wormux-0.7.9/src/Makefile.in~ 2007-01-28 16:06:57.000000000 +0200
+++ wormux-0.7.9/src/Makefile.in 2007-03-24 13:03:28.000000000 +0200
@@ -518,7 +518,7 @@
weapon/submachine_gun.h weapon/polecat.cpp weapon/polecat.h \
weapon/blowtorch.cpp weapon/blowtorch.h weapon/syringe.cpp \
weapon/syringe.h $(am__append_1)
-AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

View file

@ -1,75 +0,0 @@
--- wormux-0.7.9/src/network/distant_cpu.cpp.orig 2008-02-10 11:52:30.000000000 -0800
+++ wormux-0.7.9/src/network/distant_cpu.cpp 2008-02-10 11:52:43.000000000 -0800
@@ -30,6 +30,7 @@
#include "../team/teams_list.h"
#include "../tool/debug.h"
#include "../tool/i18n.h"
+#include <bits/stl_algo.h>
//-----------------------------------------------------------------------------
DistantComputer::DistantComputer(TCPsocket new_sock)
--- wormux-0.7.9/src/weapon/launcher.cpp.orig 2008-02-10 12:10:59.000000000 -0800
+++ wormux-0.7.9/src/weapon/launcher.cpp 2008-02-10 12:11:11.000000000 -0800
@@ -22,6 +22,7 @@
#include "launcher.h"
#include <sstream>
+#include <typeinfo>
#include "explosion.h"
#include "../game/config.h"
--- wormux-0.7.9/src/weapon/anvil.cpp.orig 2008-02-10 12:14:32.000000000 -0800
+++ wormux-0.7.9/src/weapon/anvil.cpp 2008-02-10 12:14:45.000000000 -0800
@@ -22,6 +22,7 @@
#include "anvil.h"
//-----------------------------------------------------------------------------
#include <sstream>
+#include <typeinfo>
#include "../game/time.h"
#include "../team/teams_list.h"
#include "../graphic/video.h"
--- wormux-0.7.9/src/menu/map_selection_box.cpp.orig 2008-02-09 15:00:36.000000000 -0800
+++ wormux-0.7.9/src/menu/map_selection_box.cpp 2008-02-09 15:20:34.000000000 -0800
@@ -19,6 +19,8 @@
* Map selection box
*****************************************************************************/
+#include <algorithm>
+#include <functional>
#include "map_selection_box.h"
#include "../include/action_handler.h"
#include "../map/maps_list.h"
--- wormux-0.7.9/src/menu/credits_menu.cpp.orig 2008-02-09 15:03:55.000000000 -0800
+++ wormux-0.7.9/src/menu/credits_menu.cpp 2008-02-09 15:12:24.000000000 -0800
@@ -23,6 +23,8 @@
//-----------------------------------------------------------------------------
#include <sstream>
#include <iostream>
+#include <algorithm>
+#include <functional>
#include "../game/config.h"
#include "../include/app.h"
//-----------------------------------------------------------------------------
--- wormux-0.7.9/src/game/config.cpp.orig 2008-02-09 14:49:55.000000000 -0800
+++ wormux-0.7.9/src/game/config.cpp 2008-02-09 14:51:19.000000000 -0800
@@ -373,7 +373,7 @@
*/
std::string Config::GetEnv(const std::string & name, const std::string &default_value)
{
- const char *env = std::getenv(name.c_str());
+ const char *env = ::getenv(name.c_str());
if (env != NULL) {
return env;
} else {
--- wormux-0.7.9/src/map/maps_list.cpp.orig 2008-02-09 15:31:53.000000000 -0800
+++ wormux-0.7.9/src/map/maps_list.cpp 2008-02-09 15:32:07.000000000 -0800
@@ -18,7 +18,8 @@
******************************************************************************
* Maps list
*****************************************************************************/
-
+#include <algorithm>
+#include <functional>
#include "maps_list.h"
#include "map.h"
#include "../game/config.h"