ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: crawl: Update to 0.28.0.

Browse source 
* gnu/packages/games.scm (crawl): Update to 0.28.0.
[inputs]: Add BASH-MINIMAL.
* gnu/packages/patches/crawl-upgrade-saves.patch: Update for 0.28.
This commit is contained in:
Nicolas Goaziou 2022-02-11 21:02:57 +01:00
parent eccb1e0964
commit 59adc621af
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/games.scm
View file

@ -6390,14 +6390,14 @@ (define-public fillets-ng
(define-public crawl (define-public crawl
(package (package
(name "crawl") (name "crawl")
(version "0.27.1") (version "0.28.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/crawl/crawl/releases/download/" (uri (string-append "https://github.com/crawl/crawl/releases/download/"
version "/stone_soup-" version "-nodeps.tar.xz")) version "/stone_soup-" version "-nodeps.tar.xz"))
(sha256 (sha256
(base32 "0nkhyhrrma8gmwxp15j84cn1k2yvyq7ar9rd0j2qjjlv2kdis5z2")) (base32 "0irg5w4m127fxcj037kyp9vnyqyq1fi4q64rn6yq92w8z1lf2sss"))
(patches (search-patches "crawl-upgrade-saves.patch")))) (patches (search-patches "crawl-upgrade-saves.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -6406,7 +6406,8 @@ (define-public crawl
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bash" ,bash-minimal)
("bison" ,bison)
("flex" ,flex) ("flex" ,flex)
("perl" ,perl) ("perl" ,perl)
("python" ,python-wrapper) ("python" ,python-wrapper)

14
gnu/packages/patches/crawl-upgrade-saves.patch
View file

@ -8,15 +8,15 @@ and crawl would never upgrade saves.
diff -ur a/source/database.cc b/source/database.cc diff -ur a/source/database.cc b/source/database.cc
--- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400 --- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400
+++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400 +++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400
@@ -25,6 +25,7 @@ @@ -24,6 +24,7 @@
#include "stringutil.h"
#include "syscalls.h" #include "syscalls.h"
#include "threads.h"
#include "unicode.h" #include "unicode.h"
+#include "version.h" +#include "version.h"
// TextDB handles dependency checking the db vs text files, creating the // TextDB handles dependency checking the db vs text files, creating the
// db, loading, and destroying the DB. // db, loading, and destroying the DB.
@@ -55,6 +56,7 @@ @@ -54,6 +55,7 @@
vector<string> _input_files; vector<string> _input_files;
DBM* _db; DBM* _db;
string timestamp; string timestamp;
@ -62,16 +62,16 @@ diff -ur a/source/database.cc b/source/database.cc
for (const string &file : _input_files) for (const string &file : _input_files)
{ {
string full_input_path = _directory + file; string full_input_path = _directory + file;
@@ -245,7 +253,7 @@ @@ -246,7 +254,7 @@
ts += buf; ts += buf;
} }
- if (no_files && timestamp.empty()) - if (no_files)
+ if (no_files && timestamp.empty() && version.empty()) + if (no_files && version.empty())
{ {
// No point in empty databases, although for simplicity keep ones // No point in empty databases, although for simplicity keep ones
// for disappeared translations for now. // for disappeared translations for now.
@@ -313,7 +321,10 @@ @@ -312,7 +320,10 @@
_store_text_db(full_input_path, _db); _store_text_db(full_input_path, _db);
} }
} }