[redeclipse] 371/494: refresh patches

[Martin Werner]

This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 0c6337f61f810c86d52f61f4aa6ac629ca342911
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Jul 3 11:55:59 2012 +0200

    refresh patches
---
 patches/build-with-ldflags.patch     | 20 ++++++++++----------
 patches/build-with-system-enet.patch | 22 +++++++++++-----------
 patches/windowed-by-default.patch    |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/patches/build-with-ldflags.patch b/patches/build-with-ldflags.patch
index f244263..eb2b280 100644
--- a/patches/build-with-ldflags.patch
+++ b/patches/build-with-ldflags.patch
@@ -7,28 +7,28 @@ Last-Update: 2012-06-07
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -159,13 +159,13 @@
+@@ -170,13 +170,13 @@
  endif
  else
  client: $(CLIENT_OBJS)
--	$(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS)
+-	$(CXX) $(CXXFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
  ifneq (,$(STRIP))
- 	$(STRIP) reclient
+ 	$(STRIP) $(APPCLIENT)
  endif
  
  server: $(SERVER_OBJS)
--	$(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS)
+-	$(CXX) $(CXXFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
  ifneq (,$(STRIP))
- 	$(STRIP) reserver
+ 	$(STRIP) $(APPSERVER)
  endif
-@@ -182,7 +182,7 @@
+@@ -193,7 +193,7 @@
  	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
  
  cube2font: shared/cube2font.o
--	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz -lpng
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz -lpng
+-	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
  
  install-cube2font: cube2font
  	install -d ../bin
diff --git a/patches/build-with-system-enet.patch b/patches/build-with-system-enet.patch
index 947aa16..d9bf240 100644
--- a/patches/build-with-system-enet.patch
+++ b/patches/build-with-system-enet.patch
@@ -6,7 +6,7 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -5,7 +5,7 @@
+@@ -9,7 +9,7 @@
  PLATFORM= $(shell uname -s)
  PLATFORM_SUFFIX=_native
  
@@ -15,8 +15,8 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  
  STRIP=
  ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -22,7 +22,7 @@
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
+@@ -33,7 +33,7 @@
+ CLIENT_LIBS= -mwindows -static-libgcc -static-libstdc++ -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
  else
  CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
 -CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
@@ -24,8 +24,8 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  endif
  ifeq ($(PLATFORM),Linux)
  CLIENT_LIBS+= -lrt
-@@ -93,7 +93,7 @@
- SERVER_LIBS= -mwindows -Llib -lzdll -lenet -lws2_32 -lwinmm
+@@ -104,7 +104,7 @@
+ SERVER_LIBS= -mwindows -static-libgcc -static-libstdc++ -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
  else
  SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
 -SERVER_LIBS= -Lenet/.libs -lenet -lz
@@ -33,19 +33,19 @@ Author: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
  endif
  SERVER_OBJS= \
  	shared/crypto-standalone.o \
-@@ -158,13 +158,13 @@
- 	$(STRIP) ../bin/reserver.exe
+@@ -169,13 +169,13 @@
+ 	$(STRIP) ../bin/$(APPSERVER).exe
  endif
  else
 -client: libenet $(CLIENT_OBJS)
 +client: $(CLIENT_OBJS)
- 	$(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 	$(CXX) $(CXXFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
  ifneq (,$(STRIP))
- 	$(STRIP) reclient
+ 	$(STRIP) $(APPCLIENT)
  endif
  
 -server: libenet $(SERVER_OBJS)
 +server: $(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS)
+ 	$(CXX) $(CXXFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
  ifneq (,$(STRIP))
- 	$(STRIP) reserver
+ 	$(STRIP) $(APPSERVER)
diff --git a/patches/windowed-by-default.patch b/patches/windowed-by-default.patch
index 38e1c7e..e9eb4f8 100644
--- a/patches/windowed-by-default.patch
+++ b/patches/windowed-by-default.patch
@@ -9,7 +9,7 @@ Last-Update: 2011-12-13
 
 --- a/src/engine/main.cpp
 +++ b/src/engine/main.cpp
-@@ -246,7 +246,7 @@
+@@ -256,7 +256,7 @@
  #endif
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git