[redeclipse] add patch for starting server without data
Martin Erik Werner
arand at fedoraproject.org
Wed Apr 3 19:47:39 UTC 2013
commit 70a546406ff1dd9de2277356bab51f75c3281135
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Mon Mar 25 22:17:17 2013 +0100
add patch for starting server without data
...-t-check-for-keymap-when-using-standalone.patch | 23 ++++++++++++++++++++
redeclipse.spec | 3 ++
2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/redeclipse-1.4-don-t-check-for-keymap-when-using-standalone.patch b/redeclipse-1.4-don-t-check-for-keymap-when-using-standalone.patch
new file mode 100644
index 0000000..a27ef43
--- /dev/null
+++ b/redeclipse-1.4-don-t-check-for-keymap-when-using-standalone.patch
@@ -0,0 +1,23 @@
+Description: don't check for keymap when using standalone
+ This allows server to start without data content
+Author: Quinton Reeves <qreeves at 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/redeclipse.spec b/redeclipse.spec
index 20024ef..fdbffa1 100644
--- a/redeclipse.spec
+++ b/redeclipse.spec
@@ -26,6 +26,7 @@ Patch0: %{name}-windowed-by-default.patch
Patch1: %{name}-build-with-system-enet.patch
Patch2: %{name}-1.4-desktop-file-don-t-quote-icon-app-name.patch
Patch3: %{name}-1.4-system-install-symlink-to-version.cfg-in-server-inst.patch
+Patch4: %{name}-1.4-don-t-check-for-keymap-when-using-standalone.patch
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
@@ -103,6 +104,7 @@ previous TTF2Font, supporting a much larger range of characters.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
@@ -181,6 +183,7 @@ fi
- Update generate-tarball script
- Add upstream desktop file fix patch
- Add upstream server install fix patch
+- Add upstream patch for starting server without data
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list