[redeclipse] 15/26: Add use-system-sqlite.patch

Markus Koschany apo at moszumanska.debian.org
Sun Aug 28 15:31:41 UTC 2016


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

apo pushed a commit to branch master
in repository redeclipse.

commit 59d95a926c0f8e48550cbd79f902bada8e712de1
Author: Markus Koschany <apo at debian.org>
Date:   Sat Aug 27 21:23:22 2016 +0200

    Add use-system-sqlite.patch
---
 debian/patches/series                  |  1 +
 debian/patches/use-system-sqlite.patch | 55 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

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..cc7dcf1
--- /dev/null
+++ b/debian/patches/use-system-sqlite.patch
@@ -0,0 +1,55 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 27 Aug 2016 21:22:51 +0200
+Subject: use system sqlite
+
+---
+ src/Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5f931b8..7316d5f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -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 \
+@@ -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



More information about the Pkg-games-commits mailing list