This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit 9700544146185ec647e60107e32eadd55d44fc2b Author: Martin Erik Werner <martinerikwer...@gmail.com> Date: Tue Mar 31 11:53:47 2015 +0200 Drop upstreamed patches & refresh remaining --- changelog | 5 +- patches/build-with-system-enet.patch | 58 +++++++++------------- ...-t-check-for-keymap-when-using-standalone.patch | 23 --------- patches/gnu-link-rt.patch | 29 ----------- patches/series | 3 -- patches/windowed-by-default.patch | 12 +++-- 6 files changed, 35 insertions(+), 95 deletions(-) diff --git a/changelog b/changelog index 423dede..827db18 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,9 @@ redeclipse (1.5.0-1) UNRELEASED; urgency=medium - * New upstream release + * New upstream release 1.5.0 + * Drop upstreamed patches + - Delete don-t-check-for-keymap-when-using-standalone.patch + - Delete gnu-link-rt.patch -- Martin Erik Werner <martinerikwer...@gmail.com> Sun, 29 Mar 2015 16:02:22 +0200 diff --git a/patches/build-with-system-enet.patch b/patches/build-with-system-enet.patch index 55a5b88..7169242 100644 --- a/patches/build-with-system-enet.patch +++ b/patches/build-with-system-enet.patch @@ -4,48 +4,38 @@ Description: Use system Enet instead of bundled version Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf Author: Adrián Chaves Fernández (Gallaecio) <adriyeticha...@gmail.com> ---- a/src/core.mk -+++ b/src/core.mk -@@ -28,7 +28,7 @@ +Index: redeclipse-debian/src/Makefile +=================================================================== +--- redeclipse-debian.orig/src/Makefile ++++ redeclipse-debian/src/Makefile +@@ -37,7 +37,7 @@ endif CXX_TEMP:=$(CXX) override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP) --INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS) -+INCLUDES= -Ishared -Iengine -Igame $(APPFLAGS) +-INCLUDES= -I. -Ishared -Iengine -Igame -Ienet/include ++INCLUDES= -I. -Ishared -Iengine -Igame STRIP= -@@ -66,7 +66,7 @@ - CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm - else +@@ -81,7 +81,7 @@ BIN_SUFFIX=_native + endif + endif CLIENT_INCLUDES= $(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 +-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL +CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL endif - ifeq ($(PLATFORM),Linux) + ifneq (,$(findstring linux,$(PLATFORM))) CLIENT_LIBS+= -lrt -@@ -137,7 +137,7 @@ - SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm - else - SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) --SERVER_LIBS= -Lenet/.libs -lenet -lz -+SERVER_LIBS= -lenet -lz - endif - SERVER_OBJS= \ - shared/crypto-standalone.o \ -@@ -202,13 +202,13 @@ - $(STRIP) $(WINBIN)/$(APPSERVER).exe - endif - else --client: libenet $(CLIENT_OBJS) -+client: $(CLIENT_OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS) - ifneq (,$(STRIP)) - $(STRIP) $(APPCLIENT) - endif +@@ -209,10 +209,10 @@ $(APPSERVER)_windows$(BIN_SUFFIX): $(SER + $(WINDRES) -i $(APPNAME).rc -J rc -o $(APPNAME).res -O coff + $(CXX) $(CXXFLAGS) -o $@ $(APPNAME).res $(SERVER_OBJS) $(SERVER_LIBS) + +-$(APPCLIENT)$(BIN_SUFFIX): $(LIBENET) $(CLIENT_OBJS) ++$(APPCLIENT)$(BIN_SUFFIX): $(CLIENT_OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(CLIENT_OBJS) $(CLIENT_LIBS) + +-$(APPSERVER)$(BIN_SUFFIX): $(LIBENET) $(SERVER_OBJS) ++$(APPSERVER)$(BIN_SUFFIX): $(SERVER_OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS) --server: libenet $(SERVER_OBJS) -+server: $(SERVER_OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS) - ifneq (,$(STRIP)) - $(STRIP) $(APPSERVER) + client: $(APPCLIENT)$(APPMODIFIER)$(BIN_SUFFIX) diff --git a/patches/don-t-check-for-keymap-when-using-standalone.patch b/patches/don-t-check-for-keymap-when-using-standalone.patch deleted file mode 100644 index a27ef43..0000000 --- a/patches/don-t-check-for-keymap-when-using-standalone.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: don't check for keymap when using standalone - This allows server to start without data content -Author: Quinton Reeves <qree...@gmail.com> -Origin: upstream, http://redeclipse.net/svn/5504 -Last-Update: 2013-03-26 - ---- a/src/engine/server.cpp -+++ b/src/engine/server.cpp -@@ -1407,11 +1407,13 @@ - chdir(dir); - } - #endif -+#ifndef STANDALONE - loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r")) -- { -+ { // standalone solution to this is: pebkac - if(i != 2) chdir(".."); - else fatal("could not find data directory"); - } -+#endif - addpackagedir("data"); - defformatstring(gamedata)("game/%s", server::gameid()); - addpackagedir(gamedata); diff --git a/patches/gnu-link-rt.patch b/patches/gnu-link-rt.patch deleted file mode 100644 index 40ed566..0000000 --- a/patches/gnu-link-rt.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: - (paraphrased from http://bugs.debian.org/712894#5) - . - Redeclipse fails to compile on GNU/Hurd. - . - The problem is that, when libc provides the _POSIX_SHARED_MEMORY_OBJECTS - define, shm_* is used, which is implemented in librt (currently linked - only on Linux). - . - Easy fix, is to link to rt when the platform string contains "GNU" (i.e. - on GNU-based OSes, which are using GNU libc). -Author: Pino Toscano <p...@debian.org> -Applied-Upstream: http://redeclipse.net/svn/5621 -Debian-Bug: http://bugs.debian.org/712894 -Last-Update: 2013-12-17 - ---- a/src/core.mk -+++ b/src/core.mk -@@ -70,6 +70,10 @@ - endif - ifeq ($(PLATFORM),Linux) - CLIENT_LIBS+= -lrt -+else -+ifneq (,$(findstring GNU,$(PLATFORM))) -+CLIENT_LIBS+= -lrt -+endif - endif - CLIENT_OBJS= \ - shared/crypto.o \ diff --git a/patches/series b/patches/series index 98100be..f525da9 100644 --- a/patches/series +++ b/patches/series @@ -1,5 +1,2 @@ windowed-by-default.patch build-with-system-enet.patch -desktop-file-don-t-quote-icon-app-name.patch -don-t-check-for-keymap-when-using-standalone.patch -gnu-link-rt.patch diff --git a/patches/windowed-by-default.patch b/patches/windowed-by-default.patch index 7226670..1b0848d 100644 --- a/patches/windowed-by-default.patch +++ b/patches/windowed-by-default.patch @@ -7,14 +7,16 @@ Forwarded: not-needed Author: Martin Erik Werner <martinerikwer...@gmail.com> Last-Update: 2011-12-13 ---- a/src/engine/main.cpp -+++ b/src/engine/main.cpp -@@ -258,7 +258,7 @@ +Index: redeclipse-debian/src/engine/main.cpp +=================================================================== +--- redeclipse-debian.orig/src/engine/main.cpp ++++ redeclipse-debian/src/engine/main.cpp +@@ -247,7 +247,7 @@ void setfullscreen(bool enable, bool for #endif } --VARF(0, fullscreen, 0, 1, 1, setfullscreen(fullscreen!=0)); -+VARF(0, fullscreen, 0, 0, 1, setfullscreen(fullscreen!=0)); +-VARF(0, fullscreen, 0, 1, 1, if(!(identflags&IDF_WORLD)) setfullscreen(fullscreen!=0)); ++VARF(0, fullscreen, 0, 0, 1, if(!(identflags&IDF_WORLD)) setfullscreen(fullscreen!=0)); void screenres(int *w, int *h) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits