packages: stone_soup/stone_soup-makefile.patch, stone_soup/stone_soup-syste...

[lisu]

Author: lisu                         Date: Sat Jul 24 13:09:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.7.0

---- Files affected:
packages/stone_soup:
   stone_soup-makefile.patch (1.5 -> 1.6) , stone_soup-systemlua.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/stone_soup/stone_soup-makefile.patch
diff -u packages/stone_soup/stone_soup-makefile.patch:1.5 packages/stone_soup/stone_soup-makefile.patch:1.6
--- packages/stone_soup/stone_soup-makefile.patch:1.5	Fri Apr  9 13:03:36 2010
+++ packages/stone_soup/stone_soup-makefile.patch	Sat Jul 24 15:09:03 2010
@@ -1,29 +1,24 @@
---- stone_soup-0.6.0/source/makefile~	2010-03-27 00:43:25.000000000 +0100
-+++ stone_soup-0.6.0/source/makefile	2010-04-09 12:21:00.676580838 +0200
-@@ -44,7 +44,7 @@
+--- stone_soup-0.7.0/source/makefile~	2010-07-24 14:16:48.204232436 +0200
++++ stone_soup-0.7.0/source/makefile	2010-07-24 14:19:27.494635214 +0200
+@@ -45,7 +45,7 @@
  #    ask for a package with convenience libraries instead -- we'll try to provide
  #    them somewhere in the near future.
  
 -GAME = crawl
 +GAME = stone_soup
  
- #
- # Compiler Flags
-@@ -78,11 +78,11 @@
+ ASSERTS = yes
+ 
+@@ -86,7 +86,7 @@
  
  else
  
 -CFOPTIMIZE := -O2
-+CFOPTIMIZE := 
++CFOPTIMIZE :=
  
  endif # USE_ICC
  
--CFOTHERS := -fno-strict-aliasing -pipe $(EXTERNAL_FLAGS)
-+CFOTHERS := -pipe $(EXTERNAL_FLAGS)
- CFOTHERS_L := -fsigned-char
- CFWARN := -Wall
- 
-@@ -659,7 +659,7 @@
+@@ -727,7 +727,7 @@
  
  CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
  CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L)

================================================================
Index: packages/stone_soup/stone_soup-systemlua.patch
diff -u packages/stone_soup/stone_soup-systemlua.patch:1.5 packages/stone_soup/stone_soup-systemlua.patch:1.6
--- packages/stone_soup/stone_soup-systemlua.patch:1.5	Fri Apr  9 13:42:15 2010
+++ packages/stone_soup/stone_soup-systemlua.patch	Sat Jul 24 15:09:03 2010
@@ -1,15 +1,13 @@
---- stone_soup-0.6.0/source/makefile~	2010-04-09 13:32:53.939477805 +0200
-+++ stone_soup-0.6.0/source/makefile	2010-04-09 13:33:39.472831138 +0200
-@@ -387,9 +385,9 @@
+--- stone_soup-0.7.0/source/makefile~	2010-07-24 05:31:49.000000000 +0200
++++ stone_soup-0.7.0/source/makefile	2010-07-24 14:15:22.987589375 +0200
+@@ -135,8 +135,8 @@
  endif
+ LIBZ := contrib/install/lib/libz.a
+ 
+-LUA_INCLUDE_DIR := /usr/include/lua5.1
+-LUA_LIB := -llua5.1
++LUA_INCLUDE_DIR := /usr/include/lua51
++LUA_LIB := -llua51
+ SQLITE_INCLUDE_DIR := /usr/include
+ SQLITE_LIB := -lsqlite3
  
- ifndef BUILD_LUA
--  ifneq (,$(wildcard /usr/include/lua5.1))
--    INCLUDES_L += -I/usr/include/lua5.1
--    LIBS += -llua5.1
-+  ifneq (,$(wildcard /usr/include/lua51))
-+    INCLUDES_L += -I/usr/include/lua51
-+    LIBS += -llua51
-   else
-     ifneq (,$(wildcard /usr/include/lua.h))
-       LIBS += -llua
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-makefile.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-systemlua.patch?r1=1.5&r2=1.6&f=u