taterclient-ddnet: 10.3.0 -> 10.4.0 (#419310)
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp
|
||||
index ab70b3c..9e25353 100644
|
||||
--- a/src/engine/client/client.cpp.orig
|
||||
+++ b/src/engine/client/client.cpp
|
||||
@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv)
|
||||
{
|
||||
char aError[2048];
|
||||
snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath);
|
||||
- log_error("client", aError);
|
||||
+ log_error("client", "%s", aError);
|
||||
pClient->ShowMessageBox("Config File Error", aError);
|
||||
PerformAllCleanup();
|
||||
return -1;
|
||||
@@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "taterclient-ddnet";
|
||||
version = "10.3.0";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjrc6";
|
||||
repo = "taterclient-ddnet";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s=";
|
||||
hash = "sha256-SSf9W+1yl7ExHsifbVM5IN4OfZvMdz62xMfdb++38II=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -80,10 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
./client_log_format_security.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/engine/shared/storage.cpp \
|
||||
--replace-fail /usr/ $out/
|
||||
@@ -101,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Since we are not building the server executable, the `run_tests` Makefile target
|
||||
# will not be generated.
|
||||
#
|
||||
# See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072
|
||||
# See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.4.0/CMakeLists.txt#L3088
|
||||
doCheck = false;
|
||||
|
||||
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
Reference in New Issue
Block a user