[trigger-rally] 12/14: Add a patch to define the path of the default config file.

Bertrand Marc bmarc at moszumanska.debian.org
Wed Aug 31 13:44:34 UTC 2016


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

bmarc pushed a commit to branch master
in repository trigger-rally.

commit 9068baaa097950965cffee13452a3b3d0da9b9f5
Author: Bertrand Marc <bmarc at debian.org>
Date:   Wed Aug 31 13:16:31 2016 +0200

    Add a patch to define the path of the default config file.
---
 debian/patches/fix_cfgdefaults.patch | 15 +++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/fix_cfgdefaults.patch b/debian/patches/fix_cfgdefaults.patch
new file mode 100644
index 0000000..dc8e735
--- /dev/null
+++ b/debian/patches/fix_cfgdefaults.patch
@@ -0,0 +1,15 @@
+Description: add the path to the default config file if necessary
+Author: Bertrand Marc <bmarc at debian.org>
+--- a/src/Trigger/main.cpp
++++ b/src/Trigger/main.cpp
+@@ -364,6 +364,10 @@
+     
+     PUtil::outLog() << "No user config file, copying over defaults" << std::endl;
+     
++    if (PHYSFS_addToSearchPath("/usr/share/games/trigger-rally/", 1) == 0) {
++      PUtil::outLog() << "Failed to add PhysFS search directory \"/usr/share/games/trigger-rally/\"" << std::endl
++          << "PhysFS: " << PHYSFS_getLastError() << std::endl;
++    }
+     std::string cfgdefaults = "trigger-rally.config.defs";
+     
+     if (!PUtil::copyFile(cfgdefaults, cfgfilename)) {
diff --git a/debian/patches/series b/debian/patches/series
index 59d2cc2..515de14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_build_gcc5.patch
 20_system_tinyxml.patch
+fix_cfgdefaults.patch

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



More information about the Pkg-games-commits mailing list