r6367 - in packages/trunk/simutrans/debian: . patches

[Ansgar Burchardt]

Author: ansgar-guest
Date: 2008-03-29 17:42:58 +0000 (Sat, 29 Mar 2008)
New Revision: 6367

Added:
   packages/trunk/simutrans/debian/patches/fix-makeobj-dump-crash
Modified:
   packages/trunk/simutrans/debian/changelog
   packages/trunk/simutrans/debian/patches/config.diff
   packages/trunk/simutrans/debian/patches/makeobj-endianness
   packages/trunk/simutrans/debian/patches/series
Log:
* Add debuging symbols to makeobj
* Link makeobj with g++ instead of ld (should fix build on mipsel)
* fix crash when calling 'makeobj dump' (Closes: #473245)
  + new patch: fix-makeobj-dump-crash

Modified: packages/trunk/simutrans/debian/changelog
===================================================================
--- packages/trunk/simutrans/debian/changelog	2008-03-29 14:45:29 UTC (rev 6366)
+++ packages/trunk/simutrans/debian/changelog	2008-03-29 17:42:58 UTC (rev 6367)
@@ -3,6 +3,10 @@
   * makeobj should work on big-endian archs (Closes: #472326)
     + new patch: makeobj-endianness
     + NOT FINISHED YET
+  * Add debuging symbols to makeobj
+  * Link makeobj with g++ instead of ld (should fix build on mipsel)
+  * fix crash when calling 'makeobj dump' (Closes: #473245)
+    + new patch: fix-makeobj-dump-crash
 
  -- Ansgar Burchardt <ansgar at 43-1.org>  Sun, 23 Mar 2008 21:15:39 +0100
 

Modified: packages/trunk/simutrans/debian/patches/config.diff
===================================================================
--- packages/trunk/simutrans/debian/patches/config.diff	2008-03-29 14:45:29 UTC (rev 6366)
+++ packages/trunk/simutrans/debian/patches/config.diff	2008-03-29 17:42:58 UTC (rev 6367)
@@ -2,10 +2,10 @@
 
 @DPATCH@
 
-Index: simutrans-svn/makeobj/Makefile
+Index: simutrans-99.18~0.svn1664/makeobj/Makefile
 ===================================================================
---- simutrans-svn.orig/makeobj/Makefile
-+++ simutrans-svn/makeobj/Makefile
+--- simutrans-99.18~0.svn1664.orig/makeobj/Makefile
++++ simutrans-99.18~0.svn1664/makeobj/Makefile
 @@ -2,8 +2,8 @@
  #OSTYPE = beos
  #OSTYPE = cygwin
@@ -17,19 +17,32 @@
  
  LN= $(CC)
  
-@@ -14,7 +14,7 @@
+@@ -14,9 +14,9 @@
  endif
  
  ifeq ($(OSTYPE),linux)
 -LDLIBS=-lpng -lz -lstdc++ -lm
-+LDLIBS=-lpng -lstdc++ -lm
- CFLAGS   = -O
- CXXFLAGS = -O
+-CFLAGS   = -O
+-CXXFLAGS = -O
++LDLIBS=-lpng -lm
++CFLAGS   = -O -g -W -Wall
++CXXFLAGS = -O -g -W -Wall
  endif
-Index: simutrans-svn/config.default
+ 
+ ifeq ($(OSTYPE),beos)
+@@ -54,7 +54,7 @@
+ all: makeobj
+ 
+ makeobj: $(OBJECTS)
+-	$(LN) $(CXXFLAGS) $(LDFLAGS) -o makeobj $(OBJECTS) $(LDLIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o makeobj $(OBJECTS) $(LDLIBS)
+ 
+ clean:
+ 	rm -f $(OBJECTS)
+Index: simutrans-99.18~0.svn1664/config.default
 ===================================================================
 --- /dev/null
-+++ simutrans-svn/config.default
++++ simutrans-99.18~0.svn1664/config.default
 @@ -0,0 +1,57 @@
 +#
 +# to compile:

Added: packages/trunk/simutrans/debian/patches/fix-makeobj-dump-crash
===================================================================
--- packages/trunk/simutrans/debian/patches/fix-makeobj-dump-crash	                        (rev 0)
+++ packages/trunk/simutrans/debian/patches/fix-makeobj-dump-crash	2008-03-29 17:42:58 UTC (rev 6367)
@@ -0,0 +1,12 @@
+Index: simutrans-99.18~0.svn1664/besch/writer/root_writer.cc
+===================================================================
+--- simutrans-99.18~0.svn1664.orig/besch/writer/root_writer.cc
++++ simutrans-99.18~0.svn1664/besch/writer/root_writer.cc
+@@ -126,7 +126,6 @@
+ 
+ 		dump_nodes(infp, 1);
+ 		fclose(infp);
+-		fclose(infp);
+ 	}
+ 	return true;
+ }

Modified: packages/trunk/simutrans/debian/patches/makeobj-endianness
===================================================================
--- packages/trunk/simutrans/debian/patches/makeobj-endianness	2008-03-29 14:45:29 UTC (rev 6366)
+++ packages/trunk/simutrans/debian/patches/makeobj-endianness	2008-03-29 17:42:58 UTC (rev 6367)
@@ -956,17 +956,6 @@
 ===================================================================
 --- simutrans-99.18~0.svn1664.orig/makeobj/Makefile
 +++ simutrans-99.18~0.svn1664/makeobj/Makefile
-@@ -15,8 +15,8 @@
- 
- ifeq ($(OSTYPE),linux)
- LDLIBS=-lpng -lstdc++ -lm
--CFLAGS   = -O
--CXXFLAGS = -O
-+CFLAGS   = -O -W -Wall
-+CXXFLAGS = -O -W -Wall
- endif
- 
- ifeq ($(OSTYPE),beos)
 @@ -26,6 +26,10 @@
  
  endif

Modified: packages/trunk/simutrans/debian/patches/series
===================================================================
--- packages/trunk/simutrans/debian/patches/series	2008-03-29 14:45:29 UTC (rev 6366)
+++ packages/trunk/simutrans/debian/patches/series	2008-03-29 17:42:58 UTC (rev 6367)
@@ -4,3 +4,4 @@
 gcc-4.3-fixes
 fix-stdarg-calls
 makeobj-endianness
+fix-makeobj-dump-crash