This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository redeclipse.
commit 6bb3bb3eb4276e728dbef5095137083fd8efc2bb Author: Markus Koschany <[email protected]> Date: Sat Jan 21 05:37:37 2017 +0100 Refresh use-system-sqlite.patch --- debian/patches/series | 1 + debian/patches/use-system-sqlite.patch | 72 ++++++++++++++++++++++++++++++++ debian/patches/windowed-by-default.patch | 2 +- 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 18371e9..64b9328 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ windowed-by-default.patch +use-system-sqlite.patch diff --git a/debian/patches/use-system-sqlite.patch b/debian/patches/use-system-sqlite.patch new file mode 100644 index 0000000..49b104c --- /dev/null +++ b/debian/patches/use-system-sqlite.patch @@ -0,0 +1,72 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 21 Jan 2017 05:37:25 +0100 +Subject: use system sqlite + +--- + src/Makefile | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 8df1a12..f51b7df 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -83,7 +83,7 @@ BIN_SUFFIX=_native + endif + endif + CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` +-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL ++CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL -lsqlite3 + endif + ifneq (,$(findstring linux,$(PLATFORM))) + CLIENT_LIBS+= -lrt +@@ -99,7 +99,6 @@ CLIENT_OBJS= \ + shared/stream.o \ + shared/tools.o \ + shared/zip.o \ +- support/sqlite3.o \ + engine/bih.o \ + engine/blend.o \ + engine/blob.o \ +@@ -161,7 +160,7 @@ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINDLL) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm + else + SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) +-SERVER_LIBS= -Lenet -lenet -lz ++SERVER_LIBS= -Lenet -lenet -lz -lsqlite3 + endif + SERVER_OBJS= \ + shared/crypto-standalone.o \ +@@ -169,7 +168,6 @@ SERVER_OBJS= \ + shared/stream-standalone.o \ + shared/tools-standalone.o \ + shared/zip-standalone.o \ +- support/sqlite3.o \ + engine/command-standalone.o \ + engine/irc-standalone.o \ + engine/master-standalone.o \ +@@ -205,9 +203,6 @@ clean: clean-enet clean-client clean-server clean-genkey + %-standalone.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@) + +-support/sqlite3.o: support/sqlite3.c +- $(CC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -c -o support/sqlite3.o support/sqlite3.c +- + $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES) + $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH)) + $(filter engine/%,$(CLIENT_OBJS)): $(filter engine/%,$(CLIENT_PCH)) +@@ -389,7 +384,6 @@ engine/master.o: shared/tools.h shared/command.h shared/geom.h shared/ents.h + engine/master.o: shared/glexts.h shared/glemu.h shared/iengine.h + engine/master.o: shared/igame.h engine/irc.h engine/sound.h engine/world.h + engine/master.o: engine/octa.h engine/lightmap.h engine/bih.h +-engine/master.o: engine/texture.h engine/model.h support/sqlite3.h + engine/material.o: engine/engine.h engine/version.h shared/cube.h + engine/material.o: shared/tools.h shared/command.h shared/geom.h + engine/material.o: shared/ents.h shared/glexts.h shared/glemu.h +@@ -693,7 +687,6 @@ engine/irc-standalone.o: engine/irc.h engine/sound.h + engine/master-standalone.o: engine/engine.h engine/version.h shared/cube.h + engine/master-standalone.o: shared/tools.h shared/command.h shared/geom.h + engine/master-standalone.o: shared/ents.h shared/iengine.h shared/igame.h +-engine/master-standalone.o: engine/irc.h engine/sound.h support/sqlite3.h + engine/server-standalone.o: engine/engine.h engine/version.h shared/cube.h + engine/server-standalone.o: shared/tools.h shared/command.h shared/geom.h + engine/server-standalone.o: shared/ents.h shared/iengine.h shared/igame.h diff --git a/debian/patches/windowed-by-default.patch b/debian/patches/windowed-by-default.patch index 0040c08..3f697ed 100644 --- a/debian/patches/windowed-by-default.patch +++ b/debian/patches/windowed-by-default.patch @@ -13,7 +13,7 @@ Forwarded: not-needed 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/main.cpp b/src/engine/main.cpp -index c3ec1d0..7fa42a1 100644 +index f2ef690..d18f2b5 100644 --- a/src/engine/main.cpp +++ b/src/engine/main.cpp @@ -235,7 +235,7 @@ void setfullscreen(bool enable) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
