From: Michael Mair-Keimberger Date: Fri, 22 Dec 2017 15:28:09 +0000 (+0100) Subject: games-simulation/simutrans: remove unused patches X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f791bd876f08d64d41f0d95c3b66f4b3f6982934;p=gentoo.git games-simulation/simutrans: remove unused patches --- diff --git a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch deleted file mode 100644 index d1ff41f33feb..000000000000 --- a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- Makefile.orig -+++ Makefile -@@ -81,8 +81,6 @@ - ifeq ($(findstring $(OSTYPE), amiga haiku mac),) - CFLAGS += -minline-all-stringops - endif --else -- CFLAGS += -O - endif - - ifdef DEBUG -@@ -101,6 +99,7 @@ - endif - else - CFLAGS += -DNDEBUG -+ CXXFLAGS += -DNDEBUG - endif - - ifneq ($(PROFILE),) -@@ -114,6 +113,7 @@ - ifneq ($(MULTI_THREAD),) - ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1) - CFLAGS += -DMULTI_THREAD -+ CXXFLAGS += -DMULTI_THREAD - ifeq ($(OSTYPE),mingw) - #use lpthreadGC2d for debug alternatively - LDFLAGS += -lpthreadGC2 -@@ -132,11 +132,13 @@ - endif - ifneq ($(REV),) - CFLAGS += -DREVISION="$(REV)" -+ CXXFLAGS += -DREVISION="$(REV)" - endif - endif - endif - - CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS) -+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS) - CCFLAGS += -Wstrict-prototypes - - -@@ -492,6 +494,7 @@ - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) - endif - -@@ -523,6 +526,7 @@ - SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) - endif - -@@ -538,6 +542,7 @@ - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) -lSDL_mixer - endif - -@@ -564,6 +569,7 @@ - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) -lglew32 - ifeq ($(OSTYPE),mingw) - LIBS += -lopengl32 -@@ -579,6 +585,7 @@ - endif - - CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH) -+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH) - - ifneq ($(findstring $(OSTYPE), cygwin mingw),) - SOURCES += simres.rc -@@ -586,7 +593,6 @@ - endif - - CCFLAGS += $(CFLAGS) --CXXFLAGS += $(CFLAGS) - - BUILDDIR ?= build/$(CFG) - PROGDIR ?= $(BUILDDIR) diff --git a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch deleted file mode 100644 index d3d9aae5b4e1..000000000000 --- a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -81,8 +81,6 @@ - ifeq ($(findstring $(OSTYPE), amiga haiku mac),) - CFLAGS += -minline-all-stringops - endif --else -- CFLAGS += -O - endif - - ifdef DEBUG -@@ -101,6 +99,7 @@ - endif - else - CFLAGS += -DNDEBUG -+ CXXFLAGS += -DNDEBUG - endif - - ifneq ($(PROFILE),) -@@ -114,6 +113,7 @@ - ifneq ($(MULTI_THREAD),) - ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1) - CFLAGS += -DMULTI_THREAD -+ CXXFLAGS += -DMULTI_THREAD - ifeq ($(OSTYPE),mingw) - #use lpthreadGC2d for debug alternatively - LDFLAGS += -lpthreadGC2 -@@ -132,11 +132,13 @@ - endif - ifneq ($(REV),) - CFLAGS += -DREVISION="$(REV)" -+ CXXFLAGS += -DREVISION="$(REV)" - endif - endif - endif - - CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS) -+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS) - CCFLAGS += -Wstrict-prototypes - - -@@ -492,6 +494,7 @@ - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) - endif - -@@ -523,6 +526,7 @@ - SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) - endif - -@@ -538,6 +542,7 @@ - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) -lSDL_mixer - endif - -@@ -564,6 +569,7 @@ - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) - endif - CFLAGS += $(SDL_CFLAGS) -+ CXXFLAGS += $(SDL_CFLAGS) - LIBS += $(SDL_LDFLAGS) -lglew32 - ifeq ($(OSTYPE),mingw) - LIBS += -lopengl32 -@@ -579,6 +585,7 @@ - endif - - CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH) -+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH) - - ifneq ($(findstring $(OSTYPE), cygwin mingw),) - SOURCES += simres.rc -@@ -586,7 +593,6 @@ - endif - - CCFLAGS += $(CFLAGS) --CXXFLAGS += $(CFLAGS) - - BUILDDIR ?= build/$(CFG) - PROGDIR ?= $(BUILDDIR)