[redeclipse] 06/08: Drop use-system-sqlite.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository redeclipse.

commit d4bc2d5fe084aaeb645d4b567bf40866c43960a0
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jan 21 05:35:35 2017 +0100

    Drop use-system-sqlite.patch
---
 debian/patches/series                  |  1 -
 debian/patches/use-system-sqlite.patch | 73 ----------------------------------
 2 files changed, 74 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 64b9328..18371e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 windowed-by-default.patch
-use-system-sqlite.patch
diff --git a/debian/patches/use-system-sqlite.patch b/debian/patches/use-system-sqlite.patch
deleted file mode 100644
index 2ee5eed..0000000
--- a/debian/patches/use-system-sqlite.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sat, 27 Aug 2016 21:22:51 +0200
-Subject: use system sqlite
-
----
- src/Makefile | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 5f931b8..2335522 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,8 +203,8 @@ 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
-+#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))
-@@ -387,7 +385,6 @@ engine/master.o: shared/command.h shared/geom.h shared/ents.h shared/glexts.h
- engine/master.o: shared/glemu.h shared/iengine.h shared/igame.h engine/irc.h
- engine/master.o: engine/sound.h engine/world.h engine/octa.h
- engine/master.o: engine/lightmap.h engine/bih.h engine/texture.h
--engine/master.o: engine/model.h support/sqlite3.h
- engine/material.o: engine/engine.h engine/version.h shared/cube.h shared/tools.h
- engine/material.o: shared/command.h shared/geom.h shared/ents.h
- engine/material.o: shared/glexts.h shared/glemu.h shared/iengine.h
-@@ -682,7 +679,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

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