[gentoo-commits] gentoo-x86 commit in games-simulation/simutrans/files: simutrans-0.112.3-Makefile.patch simutrans-0.112.3-overflow.patch simutrans-0.112.2-overflow.patch simutrans-0.112.2-Makefile.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    13/05/28 23:20:05

  Added:                simutrans-0.112.3-Makefile.patch
                        simutrans-0.112.3-overflow.patch
  Removed:              simutrans-0.112.2-overflow.patch
                        simutrans-0.112.2-Makefile.patch
  Log:
  version bump
  
  (Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch?rev=1.1&content-type=text/plain

Index: simutrans-0.112.3-Makefile.patch
===================================================================
--- Makefile.orig	2013-05-28 17:58:03.379228527 -0400
+++ Makefile	2013-05-28 17:58:24.768491369 -0400
@@ -88,8 +88,6 @@
       endif
     endif
   endif
-else
-  CFLAGS += -O
 endif
 
 ifdef DEBUG
@@ -108,6 +106,7 @@
   endif
 else
   CFLAGS += -DNDEBUG
+  CXXFLAGS += -DNDEBUG
 endif
 
 ifneq ($(PROFILE),)
@@ -120,6 +119,7 @@
 
 ifneq  ($(MULTI_THREAD),)
   CFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
+  CXXFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
   ifneq  ($(MULTI_THREAD),1)
     ifeq ($(OSTYPE),mingw)
 #use lpthreadGC2d for debug alternatively
@@ -134,10 +134,12 @@
   REV = $(shell svnversion)
   ifneq ($(REV),)
     CFLAGS  += -DREVISION="$(REV)"
+    CXXFLAGS  += -DREVISION="$(REV)"
   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
 
 
@@ -456,6 +458,7 @@
 ifeq ($(BACKEND),sdl)
   SOURCES += simsys_s.cc
   CFLAGS  += -DUSE_16BIT_DIB
+  CXXFLAGS  += -DUSE_16BIT_DIB
   ifeq ($(OSTYPE),mac)
     # Core Audio (Quicktime) base sound system routines
     SOURCES += sound/core-audio_sound.mm
@@ -488,6 +491,7 @@
     endif
   endif
   CFLAGS += $(SDL_CFLAGS)
+  CXXFLAGS += $(SDL_CFLAGS)
   LIBS   += $(SDL_LDFLAGS)
 endif
 
@@ -497,6 +501,7 @@
   SOURCES += sound/sdl_mixer_sound.cc
   SOURCES += music/sdl_midi.cc
   CFLAGS  += -DUSE_16BIT_DIB
+  CXXFLAGS  += -DUSE_16BIT_DIB
   ifeq ($(SDL_CONFIG),)
     SDL_CFLAGS  := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
     SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
@@ -511,6 +516,7 @@
     endif
   endif
   CFLAGS += $(SDL_CFLAGS)
+  CXXFLAGS += $(SDL_CFLAGS)
   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer
 endif
 
@@ -544,6 +550,7 @@
     endif
   endif
   CFLAGS += $(SDL_CFLAGS)
+  CXXFLAGS += $(SDL_CFLAGS)
   LIBS   += $(SDL_LDFLAGS) -lglew32
   ifeq ($(OSTYPE),mingw)
     LIBS += -lopengl32
@@ -559,6 +566,7 @@
 endif
 
 CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
 
 ifneq ($(findstring $(OSTYPE), cygwin mingw),)
   SOURCES += simres.rc
@@ -566,7 +574,6 @@
 endif
 
 CCFLAGS  += $(CFLAGS)
-CXXFLAGS += $(CFLAGS)
 
 BUILDDIR ?= build/$(CFG)
 PROGDIR  ?= $(BUILDDIR)



1.1                  games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch?rev=1.1&content-type=text/plain

Index: simutrans-0.112.3-overflow.patch
===================================================================
--- besch/reader/obj_reader.cc.orig	2013-01-22 17:22:02.509818038 -0500
+++ besch/reader/obj_reader.cc	2013-01-22 17:22:58.650846577 -0500
@@ -308,7 +308,7 @@
 void obj_reader_t::skip_nodes(FILE *fp,uint32 version)
 {
 	obj_node_info_t node;
-	char load_dummy[OBJ_NODE_INFO_SIZE], *p;
+	char load_dummy[OBJ_NODE_INFO_SIZE + 4], *p; // extra 4 for LARGE_RECORD_SIZE
 
 	p = load_dummy;
 	if(  version==COMPILER_VERSION_CODE_11  ) {