aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorKei Kebreau <kkebreau@posteo.net>2018-10-07 20:14:02 -0400
committerKei Kebreau <kkebreau@posteo.net>2018-10-07 21:23:09 -0400
commita0410663743eaa3bdbf3727baaa9fbc615db2549 (patch)
tree5a85d54b13a9b7652747d7532e95c3d48daa22fe /gnu/packages/patches
parenta18accba468beecf0200383f56d02894caf6f41a (diff)
downloadguix-a0410663743eaa3bdbf3727baaa9fbc615db2549.tar
guix-a0410663743eaa3bdbf3727baaa9fbc615db2549.tar.gz
gnu: crawl, crawl-tiles: Update to 0.22.1.
* gnu/packages/games.scm (crawl, crawl-tiles): Update to 0.22.1. * gnu/packages/patches/crawl-upgrade-saves.patch: Update accordingly.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/crawl-upgrade-saves.patch25
1 files changed, 13 insertions, 12 deletions
diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/packages/patches/crawl-upgrade-saves.patch
index 301942dc30..4c0b3a427b 100644
--- a/gnu/packages/patches/crawl-upgrade-saves.patch
+++ b/gnu/packages/patches/crawl-upgrade-saves.patch
@@ -5,8 +5,9 @@ By default crawl checks for a mtime difference on files in DATADIR to see if an
upgrade is required, but guix nulls all file dates,
and crawl would never upgrade saves.
---- a/source/database.cc 2016-05-31 09:56:08.000000000 +0200
-+++ a/source/database.cc 2017-06-05 03:00:19.270632107 +0200
+diff -ur a/source/database.cc b/source/database.cc
+--- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400
++++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400
@@ -25,6 +25,7 @@
#include "syscalls.h"
#include "threads.h"
@@ -23,16 +24,16 @@ and crawl would never upgrade saves.
TextDB *_parent;
const char* lang() { return _parent ? Options.lang_name : 0; }
public:
-@@ -165,7 +167,7 @@
+@@ -163,7 +165,7 @@
- TextDB::TextDB(const char* db_name, const char* dir, ...)
- : _db_name(db_name), _directory(dir),
+ TextDB::TextDB(const char* db_name, const char* dir, vector<string> files)
+ : _db_name(db_name), _directory(dir), _input_files(files),
- _db(nullptr), timestamp(""), _parent(0), translation(0)
+ _db(nullptr), timestamp(""), version(""), _parent(0), translation(0)
{
- va_list args;
- va_start(args, dir);
-@@ -187,7 +189,7 @@
+ }
+
+@@ -171,7 +173,7 @@
: _db_name(parent->_db_name),
_directory(parent->_directory + Options.lang_name + "/"),
_input_files(parent->_input_files), // FIXME: pointless copy
@@ -41,7 +42,7 @@ and crawl would never upgrade saves.
{
}
-@@ -202,6 +204,9 @@
+@@ -186,6 +188,9 @@
return false;
timestamp = _query_database(*this, "TIMESTAMP", false, false, true);
@@ -51,7 +52,7 @@ and crawl would never upgrade saves.
if (timestamp.empty())
return false;
-@@ -245,6 +250,9 @@
+@@ -229,6 +234,9 @@
string ts;
bool no_files = true;
@@ -61,7 +62,7 @@ and crawl would never upgrade saves.
for (const string &file : _input_files)
{
string full_input_path = _directory + file;
-@@ -261,7 +269,7 @@
+@@ -245,7 +253,7 @@
ts += buf;
}
@@ -70,7 +71,7 @@ and crawl would never upgrade saves.
{
// No point in empty databases, although for simplicity keep ones
// for disappeared translations for now.
-@@ -321,7 +329,10 @@
+@@ -313,7 +321,10 @@
_store_text_db(full_input_path, _db);
}
}